Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prefixed all abstract classes with Abstract

Browse Source
This commit is contained in:
Arjen Poutsma
2007-04-02 09:45:04 +00:00
parent e2292b0dc3
commit b07ba24160
13 changed files with 29 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changelog.txt
View File

@@ -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

9
xml/src/main/java/org/springframework/xml/stream/StaxContentHandler.java → xml/src/main/java/org/springframework/xml/stream/AbstractStaxContentHandler.java
View File

@@ -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 <code>ContentHandler</code> implementations that use StAX as a basis. All methods
* delegate to internal template methods, capable of throwing a <code>XMLStreamException</code>. 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);

2
xml/src/main/java/org/springframework/xml/stream/StaxXmlReader.java → xml/src/main/java/org/springframework/xml/stream/AbstractStaxXmlReader.java
View File

@@ -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.

6
xml/src/main/java/org/springframework/xml/stream/StaxEventContentHandler.java
View File

@@ -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 <code>NameSpace</code> objects from the <code>NamespaceContext</code>.
*/
/** Creates and returns a list of <code>NameSpace</code> objects from the <code>NamespaceContext</code>. */
private List createNamespaces(SimpleNamespaceContext namespaceContext) {
List namespaces = new ArrayList();
String defaultNamespaceUri = namespaceContext.getNamespaceURI(XMLConstants.DEFAULT_NS_PREFIX);

2
xml/src/main/java/org/springframework/xml/stream/StaxEventXmlReader.java
View File

@@ -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;

2
xml/src/main/java/org/springframework/xml/stream/StaxStreamContentHandler.java
View File

@@ -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;

15
xml/src/main/java/org/springframework/xml/stream/StaxStreamXmlReader.java
View File

@@ -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;

7
xml/src/test/java/org/springframework/xml/stream/AbstractStaxContentHandlerTestCase.java
View File

@@ -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;
}

13
xml/src/test/java/org/springframework/xml/stream/AbstractStaxXmlReaderTestCase.java
View File

@@ -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 <code>ArgumentMatcher</code> implementation that matches SAX arguments.
*/
/** Easymock <code>ArgumentMatcher</code> implementation that matches SAX arguments. */
private static class SaxArgumentMatcher extends AbstractMatcher {
public boolean matches(Object[] expected, Object[] actual) {

3
xml/src/test/java/org/springframework/xml/stream/StaxEventContentHandlerTest.java
View File

@@ -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));
}

3
xml/src/test/java/org/springframework/xml/stream/StaxEventXmlReaderTest.java
View File

@@ -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));
}

3
xml/src/test/java/org/springframework/xml/stream/StaxStreamContentHandlerTest.java
View File

@@ -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));
}

3
xml/src/test/java/org/springframework/xml/stream/StaxStreamXmlReaderTest.java
View File

@@ -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));
}