diff --git a/changelog.txt b/changelog.txt index 1f597370..941bc7f4 100644 --- a/changelog.txt +++ b/changelog.txt @@ -32,6 +32,9 @@ Package org.springframework.ws.transport.http Package org.springframework.ws.wsdl.wsdl11.builder * fixed #SWS-101: XsdBasedSoap11Wsdl4jDefinitionBuilder parsing error +Package org.springframework.xml.stream +* prefixed all abstract classes with Abstract + Changes in version 1.0-M3 ------------------------- Package org.springframework.oxm.castor diff --git a/xml/src/main/java/org/springframework/xml/stream/StaxContentHandler.java b/xml/src/main/java/org/springframework/xml/stream/AbstractStaxContentHandler.java similarity index 97% rename from xml/src/main/java/org/springframework/xml/stream/StaxContentHandler.java rename to xml/src/main/java/org/springframework/xml/stream/AbstractStaxContentHandler.java index e1bd73d1..3cbdefd1 100644 --- a/xml/src/main/java/org/springframework/xml/stream/StaxContentHandler.java +++ b/xml/src/main/java/org/springframework/xml/stream/AbstractStaxContentHandler.java @@ -19,13 +19,12 @@ package org.springframework.xml.stream; import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; +import org.springframework.xml.namespace.QNameUtils; +import org.springframework.xml.namespace.SimpleNamespaceContext; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; -import org.springframework.xml.namespace.QNameUtils; -import org.springframework.xml.namespace.SimpleNamespaceContext; - /** * Abstract base class for SAX ContentHandler implementations that use StAX as a basis. All methods * delegate to internal template methods, capable of throwing a XMLStreamException. Additionally, an @@ -33,7 +32,7 @@ import org.springframework.xml.namespace.SimpleNamespaceContext; * * @author Arjen Poutsma */ -public abstract class StaxContentHandler implements ContentHandler { +public abstract class AbstractStaxContentHandler implements ContentHandler { private SimpleNamespaceContext namespaceContext = new SimpleNamespaceContext(); @@ -67,7 +66,7 @@ public abstract class StaxContentHandler implements ContentHandler { /** * Binds the given prefix to the given namespaces. * - * @see SimpleNamespaceContext#bindNamespaceUri(String, String) + * @see SimpleNamespaceContext#bindNamespaceUri(String,String) */ public final void startPrefixMapping(String prefix, String uri) { namespaceContext.bindNamespaceUri(prefix, uri); diff --git a/xml/src/main/java/org/springframework/xml/stream/StaxXmlReader.java b/xml/src/main/java/org/springframework/xml/stream/AbstractStaxXmlReader.java similarity index 98% rename from xml/src/main/java/org/springframework/xml/stream/StaxXmlReader.java rename to xml/src/main/java/org/springframework/xml/stream/AbstractStaxXmlReader.java index 955558fd..dee6b15e 100644 --- a/xml/src/main/java/org/springframework/xml/stream/StaxXmlReader.java +++ b/xml/src/main/java/org/springframework/xml/stream/AbstractStaxXmlReader.java @@ -35,7 +35,7 @@ import org.xml.sax.SAXParseException; * @see #setEntityResolver(org.xml.sax.EntityResolver) * @see #setErrorHandler(org.xml.sax.ErrorHandler) */ -public abstract class StaxXmlReader extends AbstractXmlReader { +public abstract class AbstractStaxXmlReader extends AbstractXmlReader { /** * Parses the StAX XML reader passed at construction-time. diff --git a/xml/src/main/java/org/springframework/xml/stream/StaxEventContentHandler.java b/xml/src/main/java/org/springframework/xml/stream/StaxEventContentHandler.java index e8f0a301..f32454ab 100644 --- a/xml/src/main/java/org/springframework/xml/stream/StaxEventContentHandler.java +++ b/xml/src/main/java/org/springframework/xml/stream/StaxEventContentHandler.java @@ -41,7 +41,7 @@ import org.xml.sax.Locator; * @see XMLEvent * @see XMLEventConsumer */ -public class StaxEventContentHandler extends StaxContentHandler { +public class StaxEventContentHandler extends AbstractStaxContentHandler { private final XMLEventFactory eventFactory; @@ -115,9 +115,7 @@ public class StaxEventContentHandler extends StaxContentHandler { eventConsumer.add(event); } - /** - * Creates and returns a list of NameSpace objects from the NamespaceContext. - */ + /** Creates and returns a list of NameSpace objects from the NamespaceContext. */ private List createNamespaces(SimpleNamespaceContext namespaceContext) { List namespaces = new ArrayList(); String defaultNamespaceUri = namespaceContext.getNamespaceURI(XMLConstants.DEFAULT_NS_PREFIX); diff --git a/xml/src/main/java/org/springframework/xml/stream/StaxEventXmlReader.java b/xml/src/main/java/org/springframework/xml/stream/StaxEventXmlReader.java index 51a7d2c7..ef42b31e 100644 --- a/xml/src/main/java/org/springframework/xml/stream/StaxEventXmlReader.java +++ b/xml/src/main/java/org/springframework/xml/stream/StaxEventXmlReader.java @@ -45,7 +45,7 @@ import org.xml.sax.helpers.AttributesImpl; * @see #setEntityResolver(org.xml.sax.EntityResolver) * @see #setErrorHandler(org.xml.sax.ErrorHandler) */ -public class StaxEventXmlReader extends StaxXmlReader { +public class StaxEventXmlReader extends AbstractStaxXmlReader { private final XMLEventReader reader; diff --git a/xml/src/main/java/org/springframework/xml/stream/StaxStreamContentHandler.java b/xml/src/main/java/org/springframework/xml/stream/StaxStreamContentHandler.java index 0af53728..09bc9375 100644 --- a/xml/src/main/java/org/springframework/xml/stream/StaxStreamContentHandler.java +++ b/xml/src/main/java/org/springframework/xml/stream/StaxStreamContentHandler.java @@ -33,7 +33,7 @@ import org.xml.sax.Locator; * @author Arjen Poutsma * @see XMLStreamWriter */ -public class StaxStreamContentHandler extends StaxContentHandler { +public class StaxStreamContentHandler extends AbstractStaxContentHandler { private final XMLStreamWriter streamWriter; diff --git a/xml/src/main/java/org/springframework/xml/stream/StaxStreamXmlReader.java b/xml/src/main/java/org/springframework/xml/stream/StaxStreamXmlReader.java index da8390f2..a4f3220f 100644 --- a/xml/src/main/java/org/springframework/xml/stream/StaxStreamXmlReader.java +++ b/xml/src/main/java/org/springframework/xml/stream/StaxStreamXmlReader.java @@ -37,7 +37,7 @@ import org.xml.sax.helpers.AttributesImpl; * @see #setEntityResolver(org.xml.sax.EntityResolver) * @see #setErrorHandler(org.xml.sax.ErrorHandler) */ -public class StaxStreamXmlReader extends StaxXmlReader { +public class StaxStreamXmlReader extends AbstractStaxXmlReader { private final XMLStreamReader reader; @@ -154,10 +154,8 @@ public class StaxStreamXmlReader extends StaxXmlReader { } QName qName = reader.getName(); - getContentHandler().startElement(qName.getNamespaceURI(), - qName.getLocalPart(), - QNameUtils.toQualifiedName(qName), - getAttributes()); + getContentHandler().startElement(qName.getNamespaceURI(), qName.getLocalPart(), + QNameUtils.toQualifiedName(qName), getAttributes()); } } @@ -173,11 +171,8 @@ public class StaxStreamXmlReader extends StaxXmlReader { if (type == null) { type = ""; } - attributes.addAttribute(namespace, - reader.getAttributeLocalName(i), - QNameUtils.toQualifiedName(reader.getAttributeName(i)), - type, - reader.getAttributeValue(i)); + attributes.addAttribute(namespace, reader.getAttributeLocalName(i), + QNameUtils.toQualifiedName(reader.getAttributeName(i)), type, reader.getAttributeValue(i)); } return attributes; diff --git a/xml/src/test/java/org/springframework/xml/stream/AbstractStaxContentHandlerTestCase.java b/xml/src/test/java/org/springframework/xml/stream/AbstractStaxContentHandlerTestCase.java index 37f4f1e4..364ab77a 100644 --- a/xml/src/test/java/org/springframework/xml/stream/AbstractStaxContentHandlerTestCase.java +++ b/xml/src/test/java/org/springframework/xml/stream/AbstractStaxContentHandlerTestCase.java @@ -19,7 +19,6 @@ package org.springframework.xml.stream; import java.io.StringReader; import java.io.StringWriter; import java.io.Writer; - import javax.xml.stream.XMLStreamException; import org.custommonkey.xmlunit.XMLTestCase; @@ -40,7 +39,7 @@ public abstract class AbstractStaxContentHandlerTestCase extends XMLTestCase { public void testContentHandler() throws Exception { StringWriter stringWriter = new StringWriter(); - StaxContentHandler handler = createStaxContentHandler(stringWriter); + AbstractStaxContentHandler handler = createStaxContentHandler(stringWriter); xmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", false); xmlReader.setContentHandler(handler); xmlReader.parse(new InputSource(new StringReader(XML_CONTENT_HANDLER))); @@ -49,14 +48,14 @@ public abstract class AbstractStaxContentHandlerTestCase extends XMLTestCase { public void testContentHandlerNamespacePrefixes() throws Exception { StringWriter stringWriter = new StringWriter(); - StaxContentHandler handler = createStaxContentHandler(stringWriter); + AbstractStaxContentHandler handler = createStaxContentHandler(stringWriter); xmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true); xmlReader.setContentHandler(handler); xmlReader.parse(new InputSource(new StringReader(XML_CONTENT_HANDLER))); assertXMLEqual("Invalid result", XML_CONTENT_HANDLER, stringWriter.toString()); } - protected abstract StaxContentHandler createStaxContentHandler(Writer writer) throws XMLStreamException; + protected abstract AbstractStaxContentHandler createStaxContentHandler(Writer writer) throws XMLStreamException; } diff --git a/xml/src/test/java/org/springframework/xml/stream/AbstractStaxXmlReaderTestCase.java b/xml/src/test/java/org/springframework/xml/stream/AbstractStaxXmlReaderTestCase.java index 82e20089..47eff787 100644 --- a/xml/src/test/java/org/springframework/xml/stream/AbstractStaxXmlReaderTestCase.java +++ b/xml/src/test/java/org/springframework/xml/stream/AbstractStaxXmlReaderTestCase.java @@ -20,7 +20,6 @@ import java.io.IOException; import java.io.Reader; import java.io.StringReader; import java.util.Arrays; - import javax.xml.stream.XMLStreamException; import junit.framework.TestCase; @@ -61,7 +60,7 @@ public abstract class AbstractStaxXmlReaderTestCase extends TestCase { reader.setContentHandler(mock); reader.parse(new InputSource(new StringReader(XML_CONTENT_HANDLER))); control.replay(); - StaxXmlReader staxXmlReader = createStaxXmlReader(new StringReader(XML_CONTENT_HANDLER)); + AbstractStaxXmlReader staxXmlReader = createStaxXmlReader(new StringReader(XML_CONTENT_HANDLER)); staxXmlReader.setContentHandler(mock); staxXmlReader.parse(new InputSource()); control.verify(); @@ -74,7 +73,7 @@ public abstract class AbstractStaxXmlReaderTestCase extends TestCase { reader.setContentHandler(mock); reader.parse(new InputSource(new StringReader(XML_CONTENT_HANDLER_ATTS))); control.replay(); - StaxXmlReader staxXmlReader = createStaxXmlReader(new StringReader(XML_CONTENT_HANDLER_ATTS)); + AbstractStaxXmlReader staxXmlReader = createStaxXmlReader(new StringReader(XML_CONTENT_HANDLER_ATTS)); staxXmlReader.setContentHandler(mock); staxXmlReader.parse(new InputSource()); control.verify(); @@ -88,17 +87,15 @@ public abstract class AbstractStaxXmlReaderTestCase extends TestCase { reader.setDTDHandler(mock); reader.parse(new InputSource(new StringReader(XML_DTD_HANDLER))); control.replay(); - StaxXmlReader staxXmlReader = createStaxXmlReader(new StringReader(XML_DTD_HANDLER)); + AbstractStaxXmlReader staxXmlReader = createStaxXmlReader(new StringReader(XML_DTD_HANDLER)); staxXmlReader.setDTDHandler(mock); staxXmlReader.parse(new InputSource()); control.verify(); } - protected abstract StaxXmlReader createStaxXmlReader(Reader reader) throws XMLStreamException; + protected abstract AbstractStaxXmlReader createStaxXmlReader(Reader reader) throws XMLStreamException; - /** - * Easymock ArgumentMatcher implementation that matches SAX arguments. - */ + /** Easymock ArgumentMatcher implementation that matches SAX arguments. */ private static class SaxArgumentMatcher extends AbstractMatcher { public boolean matches(Object[] expected, Object[] actual) { diff --git a/xml/src/test/java/org/springframework/xml/stream/StaxEventContentHandlerTest.java b/xml/src/test/java/org/springframework/xml/stream/StaxEventContentHandlerTest.java index 3b5fa65b..4590ed82 100644 --- a/xml/src/test/java/org/springframework/xml/stream/StaxEventContentHandlerTest.java +++ b/xml/src/test/java/org/springframework/xml/stream/StaxEventContentHandlerTest.java @@ -17,13 +17,12 @@ package org.springframework.xml.stream; import java.io.Writer; - import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; public class StaxEventContentHandlerTest extends AbstractStaxContentHandlerTestCase { - protected StaxContentHandler createStaxContentHandler(Writer writer) throws XMLStreamException { + protected AbstractStaxContentHandler createStaxContentHandler(Writer writer) throws XMLStreamException { XMLOutputFactory outputFactory = XMLOutputFactory.newInstance(); return new StaxEventContentHandler(outputFactory.createXMLEventWriter(writer)); } diff --git a/xml/src/test/java/org/springframework/xml/stream/StaxEventXmlReaderTest.java b/xml/src/test/java/org/springframework/xml/stream/StaxEventXmlReaderTest.java index b1e3b033..d26196f0 100644 --- a/xml/src/test/java/org/springframework/xml/stream/StaxEventXmlReaderTest.java +++ b/xml/src/test/java/org/springframework/xml/stream/StaxEventXmlReaderTest.java @@ -17,13 +17,12 @@ package org.springframework.xml.stream; import java.io.Reader; - import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; public class StaxEventXmlReaderTest extends AbstractStaxXmlReaderTestCase { - protected StaxXmlReader createStaxXmlReader(Reader reader) throws XMLStreamException { + protected AbstractStaxXmlReader createStaxXmlReader(Reader reader) throws XMLStreamException { XMLInputFactory inputFactory = XMLInputFactory.newInstance(); return new StaxEventXmlReader(inputFactory.createXMLEventReader(reader)); } diff --git a/xml/src/test/java/org/springframework/xml/stream/StaxStreamContentHandlerTest.java b/xml/src/test/java/org/springframework/xml/stream/StaxStreamContentHandlerTest.java index b5141b0f..8241613e 100644 --- a/xml/src/test/java/org/springframework/xml/stream/StaxStreamContentHandlerTest.java +++ b/xml/src/test/java/org/springframework/xml/stream/StaxStreamContentHandlerTest.java @@ -17,13 +17,12 @@ package org.springframework.xml.stream; import java.io.Writer; - import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; public class StaxStreamContentHandlerTest extends AbstractStaxContentHandlerTestCase { - protected StaxContentHandler createStaxContentHandler(Writer writer) throws XMLStreamException { + protected AbstractStaxContentHandler createStaxContentHandler(Writer writer) throws XMLStreamException { XMLOutputFactory outputFactory = XMLOutputFactory.newInstance(); return new StaxStreamContentHandler(outputFactory.createXMLStreamWriter(writer)); } diff --git a/xml/src/test/java/org/springframework/xml/stream/StaxStreamXmlReaderTest.java b/xml/src/test/java/org/springframework/xml/stream/StaxStreamXmlReaderTest.java index 5bfa18ca..ce265827 100644 --- a/xml/src/test/java/org/springframework/xml/stream/StaxStreamXmlReaderTest.java +++ b/xml/src/test/java/org/springframework/xml/stream/StaxStreamXmlReaderTest.java @@ -17,13 +17,12 @@ package org.springframework.xml.stream; import java.io.Reader; - import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; public class StaxStreamXmlReaderTest extends AbstractStaxXmlReaderTestCase { - protected StaxXmlReader createStaxXmlReader(Reader reader) throws XMLStreamException { + protected AbstractStaxXmlReader createStaxXmlReader(Reader reader) throws XMLStreamException { XMLInputFactory inputFactory = XMLInputFactory.newInstance(); return new StaxStreamXmlReader(inputFactory.createXMLStreamReader(reader)); }