Author: rfeng
Date: Mon Sep 11 23:24:01 2006
New Revision: 442473
URL: http://svn.apache.org/viewvc?view=rev&rev=442473
Log:
Fix some checkstyle and PMD issues
Modified:
incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/DOMXMLStreamReader.java
incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/StAX2SAXAdapter.java
incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/StAXHelper.java
incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/String2XMLStreamReader.java
incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/XMLStreamReader2Node.java
incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/XMLStreamReader2String.java
incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/impl/DataBindingInterceptorTestCase.java
incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/impl/DataBindingJavaInterfaceProcessorTestCase.java
incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/impl/MediatorImplTestCase.java
incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/impl/TransformerRegistryImplTestCase.java
incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/util/PropertyMediatorTestCase.java
incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/xml/PushTransformationTestCase.java
Modified:
incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/DOMXMLStreamReader.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/DOMXMLStreamReader.java?view=diff&rev=442473&r1=442472&r2=442473
==============================================================================
---
incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/DOMXMLStreamReader.java
(original)
+++
incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/DOMXMLStreamReader.java
Mon Sep 11 23:24:01 2006
@@ -104,7 +104,7 @@
}
- public void populateProperties() {
+ public final void populateProperties() {
if (properties != null)
return;
if (elementQName == null)
Modified:
incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/StAX2SAXAdapter.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/StAX2SAXAdapter.java?view=diff&rev=442473&r1=442472&r2=442473
==============================================================================
---
incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/StAX2SAXAdapter.java
(original)
+++
incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/StAX2SAXAdapter.java
Mon Sep 11 23:24:01 2006
@@ -46,29 +46,17 @@
* <li>NOTATION_DECLARATION</li>
* <li>SPACE</li>
* </ul>
- * StAX ATTRIBUTE events are ignored but the equivalent attributes (derived
from the START_ELEMENT event) are supplied in the SAX startElement event's
- * Attributes parameter. If the adaptor is configured to pass namespace
prefixes then namespace information will also be included in the Attributes;
- * StAX NAMESPACE events are ignored.
- * <p/>
- * Another issue is namespace processing. If the reader is positioned at a
sub-node, we cannot capture all the in-scope namespace bindings. Therefore
- * we cannot re-create a proper SAX event stream from a StAX parser.
- * <p/>
- * For example
- * <p/>
- * <a:root xmlns:a="foo"
xmlns:b="bar"><b:sub>a:foo</b:sub></a:root>
- * <p/>
- * And if you are handed a parser at <b:sub>, then your SAX events
should look like:
- * <p/>
- * <b:sub xmlns:a="foo" xmlns:b="bar">a:foo</b:sub>
- * <p/>
- * not:
- * <p/>
- * <b:sub>a:foo</b:sub>
- * <p/>
- * <p/>
- * Proposal: we change the receiver of SAX events (SDOXMLResourceImpl) so that
it uses NamespaceContext to resolve prefix (as opposed to record
- * start/endPrefixMappings and use it for resolution.)
- *
+ * StAX ATTRIBUTE events are ignored but the equivalent attributes (derived
from the START_ELEMENT event) are supplied
+ * in the SAX startElement event's Attributes parameter. If the adaptor is
configured to pass namespace prefixes then
+ * namespace information will also be included in the Attributes; StAX
NAMESPACE events are ignored. <p/> Another issue
+ * is namespace processing. If the reader is positioned at a sub-node, we
cannot capture all the in-scope namespace
+ * bindings. Therefore we cannot re-create a proper SAX event stream from a
StAX parser. <p/> For example <p/>
+ * <a:root xmlns:a="foo"
xmlns:b="bar"><b:sub>a:foo</b:sub></a:root> <p/> And if
you are handed
+ * a parser at <b:sub>, then your SAX events should look like: <p/>
<b:sub xmlns:a="foo"
+ * xmlns:b="bar">a:foo</b:sub> <p/> not: <p/>
<b:sub>a:foo</b:sub> <p/> <p/> Proposal: we change
+ * the receiver of SAX events (SDOXMLResourceImpl) so that it uses
NamespaceContext to resolve prefix (as opposed to
+ * record start/endPrefixMappings and use it for resolution.)
+ *
* @version $Rev$ $Date$
*/
public class StAX2SAXAdapter {
@@ -76,7 +64,7 @@
/**
* Construct a new StAX to SAX adapter that will convert a StAX event
stream into a SAX event stream.
- *
+ *
* @param namespacePrefixes whether xmlns attributes should be included in
startElement events;
*/
public StAX2SAXAdapter(boolean namespacePrefixes) {
@@ -84,14 +72,14 @@
}
/**
- * Pull events from the StAX stream and dispatch to the SAX
ContentHandler. The StAX stream would typically be located on a START_DOCUMENT
or
- * START_ELEMENT event and when this method returns it will be located on
the associated END_DOCUMENT or END_ELEMENT event. Behaviour with other
- * start events is undefined.
- *
- * @param reader StAX event source to read
+ * Pull events from the StAX stream and dispatch to the SAX
ContentHandler. The StAX stream would typically be
+ * located on a START_DOCUMENT or START_ELEMENT event and when this method
returns it will be located on the
+ * associated END_DOCUMENT or END_ELEMENT event. Behaviour with other
start events is undefined.
+ *
+ * @param reader StAX event source to read
* @param handler SAX ContentHandler for processing events
* @throws XMLStreamException if there was a problem reading the stream
- * @throws SAXException passed through from the ContentHandler
+ * @throws SAXException passed through from the ContentHandler
*/
public void parse(XMLStreamReader reader, ContentHandler handler) throws
XMLStreamException, SAXException {
handler.setDocumentLocator(new LocatorAdaptor(reader.getLocation()));
@@ -126,12 +114,13 @@
handler.endDocument();
return;
/*
- * uncomment to handle all events rather than just mapped ones
// StAX events that are not mapped to SAX case XMLStreamConstants.COMMENT:
- * case XMLStreamConstants.SPACE: case
XMLStreamConstants.ENTITY_REFERENCE: case XMLStreamConstants.DTD: case
XMLStreamConstants.CDATA:
- * case XMLStreamConstants.NOTATION_DECLARATION: case
XMLStreamConstants.ENTITY_DECLARATION: break; // StAX events handled in
- * START_ELEMENT case XMLStreamConstants.ATTRIBUTE: case
XMLStreamConstants.NAMESPACE: break; default: throw new AssertionError("Unknown
- * StAX event: " + event);
- */
+ * uncomment to handle all events rather than just mapped ones
// StAX events that are not mapped to SAX
+ * case XMLStreamConstants.COMMENT: case
XMLStreamConstants.SPACE: case
+ * XMLStreamConstants.ENTITY_REFERENCE: case
XMLStreamConstants.DTD: case XMLStreamConstants.CDATA: case
+ * XMLStreamConstants.NOTATION_DECLARATION: case
XMLStreamConstants.ENTITY_DECLARATION: break; // StAX
+ * events handled in START_ELEMENT case
XMLStreamConstants.ATTRIBUTE: case XMLStreamConstants.NAMESPACE:
+ * break; default: throw new AssertionError("Unknown StAX
event: " + event);
+ */
}
event = reader.next();
}
@@ -180,7 +169,7 @@
/**
* Get the attributes associated with the current START_ELEMENT event.
- *
+ *
* @return the StAX attributes converted to org.xml.sax.Attributes
*/
private Attributes getAttributes(XMLStreamReader reader) {
Modified:
incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/StAXHelper.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/StAXHelper.java?view=diff&rev=442473&r1=442472&r2=442473
==============================================================================
---
incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/StAXHelper.java
(original)
+++
incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/StAXHelper.java
Mon Sep 11 23:24:01 2006
@@ -44,14 +44,14 @@
public static class XMLStreamSerializer implements XMLStreamConstants {
private static int namespaceSuffix = 0;
+
public static final String NAMESPACE_PREFIX = "ns";
/*
- * The behavior of the serializer is such that it returns when it
encounters the
- * starting element for the second time. The depth variable tracks the
depth of the
- * serilizer and tells it when to return.
- * Note that it is assumed that this serialization starts on an Element.
- */
+ * The behavior of the serializer is such that it returns when it
encounters the starting element for the second
+ * time. The depth variable tracks the depth of the serilizer and
tells it when to return. Note that it is
+ * assumed that this serialization starts on an Element.
+ */
/**
* Field depth
@@ -60,27 +60,27 @@
/**
* Method serialize.
- *
+ *
* @param node
* @param writer
* @throws XMLStreamException
*/
- public void serialize(XMLStreamReader node, XMLStreamWriter writer)
- throws XMLStreamException {
+ public void serialize(XMLStreamReader node, XMLStreamWriter writer)
throws XMLStreamException {
serializeNode(node, writer);
}
/**
* Method serializeNode.
- *
+ *
* @param reader
* @param writer
* @throws XMLStreamException
*/
- protected void serializeNode(XMLStreamReader reader, XMLStreamWriter
writer)
- throws XMLStreamException {
- //TODO We get the StAXWriter at this point and uses it hereafter
assuming that this is the only entry point to this class.
- // If there can be other classes calling methodes of this we might
need to change methode signatures to OMOutputer
+ protected void serializeNode(XMLStreamReader reader, XMLStreamWriter
writer) throws XMLStreamException {
+ // TODO We get the StAXWriter at this point and uses it hereafter
assuming that this is the only entry point
+ // to this class.
+ // If there can be other classes calling methodes of this we might
need to change methode signatures to
+ // OMOutputer
while (reader.hasNext()) {
int event = reader.next();
if (event == START_ELEMENT) {
@@ -97,14 +97,15 @@
} else if (event == END_ELEMENT) {
serializeEndElement(writer);
depth--;
- }else if (event == START_DOCUMENT) {
- depth++; //if a start document is found then increment the
depth
+ } else if (event == START_DOCUMENT) {
+ depth++; // if a start document is found then increment
the depth
} else if (event == END_DOCUMENT) {
- if (depth!=0) depth--; //for the end document - reduce
the depth
+ if (depth != 0)
+ depth--; // for the end document - reduce the depth
try {
serializeEndElement(writer);
} catch (Exception e) {
- //TODO: log exceptions
+ // TODO: log exceptions
}
}
if (depth == 0) {
@@ -118,9 +119,7 @@
* @param writer
* @throws XMLStreamException
*/
- protected void serializeElement(XMLStreamReader reader,
- XMLStreamWriter writer)
- throws XMLStreamException {
+ protected void serializeElement(XMLStreamReader reader,
XMLStreamWriter writer) throws XMLStreamException {
String prefix = reader.getPrefix();
String nameSpaceName = reader.getNamespaceURI();
if (nameSpaceName != null) {
@@ -129,13 +128,11 @@
writer.writeStartElement(nameSpaceName,
reader.getLocalName());
} else {
if (prefix != null) {
- writer.writeStartElement(prefix, reader.getLocalName(),
- nameSpaceName);
+ writer.writeStartElement(prefix,
reader.getLocalName(), nameSpaceName);
writer.writeNamespace(prefix, nameSpaceName);
writer.setPrefix(prefix, nameSpaceName);
} else {
- writer.writeStartElement(nameSpaceName,
- reader.getLocalName());
+ writer.writeStartElement(nameSpaceName,
reader.getLocalName());
writer.writeDefaultNamespace(nameSpaceName);
writer.setDefaultNamespace(nameSpaceName);
}
@@ -144,17 +141,15 @@
writer.writeStartElement(reader.getLocalName());
}
-
// add the namespaces
int count = reader.getNamespaceCount();
String namespacePrefix;
for (int i = 0; i < count; i++) {
namespacePrefix = reader.getNamespacePrefix(i);
- if(namespacePrefix != null && namespacePrefix.length()==0)
+ if (namespacePrefix != null && namespacePrefix.length() == 0)
continue;
- serializeNamespace(namespacePrefix,
- reader.getNamespaceURI(i), writer);
+ serializeNamespace(namespacePrefix, reader.getNamespaceURI(i),
writer);
}
// add attributes
@@ -164,12 +159,11 @@
/**
* Method serializeEndElement.
- *
+ *
* @param writer
* @throws XMLStreamException
*/
- protected void serializeEndElement(XMLStreamWriter writer)
- throws XMLStreamException {
+ protected void serializeEndElement(XMLStreamWriter writer) throws
XMLStreamException {
writer.writeEndElement();
}
@@ -178,35 +172,29 @@
* @param writer
* @throws XMLStreamException
*/
- protected void serializeText(XMLStreamReader reader,
- XMLStreamWriter writer)
- throws XMLStreamException {
+ protected void serializeText(XMLStreamReader reader, XMLStreamWriter
writer) throws XMLStreamException {
writer.writeCharacters(reader.getText());
}
/**
* Method serializeCData.
- *
+ *
* @param reader
* @param writer
* @throws XMLStreamException
*/
- protected void serializeCData(XMLStreamReader reader,
- XMLStreamWriter writer)
- throws XMLStreamException {
+ protected void serializeCData(XMLStreamReader reader, XMLStreamWriter
writer) throws XMLStreamException {
writer.writeCData(reader.getText());
}
/**
* Method serializeComment.
- *
+ *
* @param reader
* @param writer
* @throws XMLStreamException
*/
- protected void serializeComment(XMLStreamReader reader,
- XMLStreamWriter writer)
- throws XMLStreamException {
+ protected void serializeComment(XMLStreamReader reader,
XMLStreamWriter writer) throws XMLStreamException {
writer.writeComment(reader.getText());
}
@@ -215,89 +203,81 @@
* @param writer
* @throws XMLStreamException
*/
- protected void serializeAttributes(XMLStreamReader reader,
- XMLStreamWriter writer)
- throws XMLStreamException {
+ protected void serializeAttributes(XMLStreamReader reader,
XMLStreamWriter writer) throws XMLStreamException {
int count = reader.getAttributeCount();
String prefix = null;
String namespaceName = null;
- String writerPrefix=null;
+ String writerPrefix = null;
for (int i = 0; i < count; i++) {
prefix = reader.getAttributePrefix(i);
namespaceName = reader.getAttributeNamespace(i);
/*
- Due to parser implementations returning null as the
namespace URI
- (for the empty namespace) we need to make sure that we deal
with
- a namespace name that is not null. The best way to work
around this
- issue is to set the namespace uri to "" if it is null
- */
- if (namespaceName==null) namespaceName="";
-
- writerPrefix
=writer.getNamespaceContext().getPrefix(namespaceName);
-
- if (!"".equals(namespaceName)){
- //prefix has already being declared but this particular
attrib has a
- //no prefix attached. So use the prefix provided by the
writer
- if (writerPrefix!=null && (prefix==null ||
prefix.equals(""))){
- writer.writeAttribute(writerPrefix, namespaceName,
- reader.getAttributeLocalName(i),
- reader.getAttributeValue(i));
-
- //writer prefix is available but different from the
current
- //prefix of the attrib. We should be decalring the new
prefix
- //as a namespace declaration
- }else if (prefix!=null && !"".equals(prefix)&&
!prefix.equals(writerPrefix)){
- writer.writeNamespace(prefix,namespaceName);
- writer.writeAttribute(prefix, namespaceName,
- reader.getAttributeLocalName(i),
- reader.getAttributeValue(i));
-
- //prefix is null (or empty), but the namespace name is
valid! it has not
- //being written previously also. So we need to
generate a prefix
- //here
- }else{
+ * Due to parser implementations returning null as the
namespace URI (for the empty namespace) we need
+ * to make sure that we deal with a namespace name that is not
null. The best way to work around this
+ * issue is to set the namespace uri to "" if it is null
+ */
+ if (namespaceName == null)
+ namespaceName = "";
+
+ writerPrefix =
writer.getNamespaceContext().getPrefix(namespaceName);
+
+ if (!"".equals(namespaceName)) {
+ // prefix has already being declared but this particular
attrib has a
+ // no prefix attached. So use the prefix provided by the
writer
+ if (writerPrefix != null && (prefix == null ||
prefix.equals(""))) {
+ writer.writeAttribute(writerPrefix, namespaceName,
reader.getAttributeLocalName(i), reader
+ .getAttributeValue(i));
+
+ // writer prefix is available but different from the
current
+ // prefix of the attrib. We should be decalring the
new prefix
+ // as a namespace declaration
+ } else if (prefix != null && !"".equals(prefix) &&
!prefix.equals(writerPrefix)) {
+ writer.writeNamespace(prefix, namespaceName);
+ writer.writeAttribute(prefix, namespaceName,
reader.getAttributeLocalName(i), reader
+ .getAttributeValue(i));
+
+ // prefix is null (or empty), but the namespace name
is valid! it has not
+ // being written previously also. So we need to
generate a prefix
+ // here
+ } else {
prefix =
generateUniquePrefix(writer.getNamespaceContext());
- writer.writeNamespace(prefix,namespaceName);
- writer.writeAttribute(prefix, namespaceName,
- reader.getAttributeLocalName(i),
- reader.getAttributeValue(i));
+ writer.writeNamespace(prefix, namespaceName);
+ writer.writeAttribute(prefix, namespaceName,
reader.getAttributeLocalName(i), reader
+ .getAttributeValue(i));
}
- }else{
- //empty namespace is equal to no namespace!
- writer.writeAttribute(reader.getAttributeLocalName(i),
- reader.getAttributeValue(i));
+ } else {
+ // empty namespace is equal to no namespace!
+ writer.writeAttribute(reader.getAttributeLocalName(i),
reader.getAttributeValue(i));
}
-
}
}
/**
- * Generates a unique namespace prefix that is not in the
- * scope of the NamespaceContext
+ * Generates a unique namespace prefix that is not in the scope of the
NamespaceContext
+ *
* @param nsCtxt
* @return string
*/
- private String generateUniquePrefix(NamespaceContext nsCtxt){
+ private String generateUniquePrefix(NamespaceContext nsCtxt) {
String prefix = NAMESPACE_PREFIX + namespaceSuffix++;
- //null should be returned if the prefix is not bound!
- while(nsCtxt.getNamespaceURI(prefix)!=null){
+ // null should be returned if the prefix is not bound!
+ while (nsCtxt.getNamespaceURI(prefix) != null) {
prefix = NAMESPACE_PREFIX + namespaceSuffix++;
}
return prefix;
}
+
/**
* Method serializeNamespace.
+ *
* @param prefix
* @param URI
* @param writer
* @throws XMLStreamException
*/
- private void serializeNamespace(String prefix,
- String URI,
- XMLStreamWriter writer)
- throws XMLStreamException {
+ private void serializeNamespace(String prefix, String URI,
XMLStreamWriter writer) throws XMLStreamException {
String prefix1 = writer.getPrefix(URI);
if (prefix1 == null) {
writer.writeNamespace(prefix, URI);
@@ -352,13 +332,13 @@
serializer.serialize(reader, writer);
writer.flush();
}
-
+
public static String save(XMLStreamReader reader) throws
XMLStreamException {
StringWriter writer = new StringWriter();
save(reader, writer);
return writer.toString();
}
-
+
public static interface XMLFragmentStreamReader extends XMLStreamReader {
// this will help to handle Text within the current element.
@@ -369,28 +349,28 @@
/**
* Extra method to query the state of the pullparser
+ *
* @return
*/
- boolean isEndOfFragment();
+ boolean isEndOfFragment();
/**
* add the parent namespace context to this parser
*/
- void setParentNamespaceContext(NamespaceContext nsContext);
+ void setParentNamespaceContext(NamespaceContext nsContext);
/**
- * Initiate the parser - this will do whatever the needed
- * tasks to initiate the parser and must be called before
+ * Initiate the parser - this will do whatever the needed tasks to
initiate the parser and must be called before
* attempting any specific parsing using this parser
*/
- void init();
+ void init();
}
-
+
/**
* This class is derived from Apache Axis2 class <a
*
href="http://svn.apache.org/repos/asf/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/StreamWrapper.java";>
- * org.apache.axis2.util.StreamWrapper</a>. It's used wrap a
XMLStreamReader to create a XMLStreamReader representing a document and it will
produce
- * START_DOCUMENT, END_DOCUMENT events.
+ * org.apache.axis2.util.StreamWrapper</a>. It's used wrap a
XMLStreamReader to create a XMLStreamReader
+ * representing a document and it will produce START_DOCUMENT,
END_DOCUMENT events.
*
*/
public static class XMLDocumentStreamReader implements XMLStreamReader {
@@ -798,7 +778,6 @@
return false;
}
}
- }
-
+ }
}
Modified:
incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/String2XMLStreamReader.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/String2XMLStreamReader.java?view=diff&rev=442473&r1=442472&r2=442473
==============================================================================
---
incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/String2XMLStreamReader.java
(original)
+++
incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/String2XMLStreamReader.java
Mon Sep 11 23:24:01 2006
@@ -26,7 +26,8 @@
import org.apache.tuscany.databinding.PullTransformer;
import org.apache.tuscany.databinding.extension.TransformerExtension;
-public class String2XMLStreamReader extends TransformerExtension<String,
XMLStreamReader> implements PullTransformer<String, XMLStreamReader> {
+public class String2XMLStreamReader extends TransformerExtension<String,
XMLStreamReader> implements
+ PullTransformer<String, XMLStreamReader> {
public XMLStreamReader transform(String source, TransformationContext
context) {
try {
Modified:
incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/XMLStreamReader2Node.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/XMLStreamReader2Node.java?view=diff&rev=442473&r1=442472&r2=442473
==============================================================================
---
incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/XMLStreamReader2Node.java
(original)
+++
incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/XMLStreamReader2Node.java
Mon Sep 11 23:24:01 2006
@@ -30,10 +30,12 @@
* Transform DOM Node to XML XMLStreamReader
*
*/
-public class XMLStreamReader2Node extends
TransformerExtension<XMLStreamReader, Node> implements
PullTransformer<XMLStreamReader, Node> {
+public class XMLStreamReader2Node extends
TransformerExtension<XMLStreamReader, Node> implements
+ PullTransformer<XMLStreamReader, Node> {
private SAX2DOMPipe pipe = new SAX2DOMPipe();
+
private XMLStreamReader2SAX stax2sax = new XMLStreamReader2SAX();
-
+
public Node transform(XMLStreamReader source, TransformationContext
context) {
try {
stax2sax.transform(source, pipe.getSink(), context);
Modified:
incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/XMLStreamReader2String.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/XMLStreamReader2String.java?view=diff&rev=442473&r1=442472&r2=442473
==============================================================================
---
incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/XMLStreamReader2String.java
(original)
+++
incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/xml/XMLStreamReader2String.java
Mon Sep 11 23:24:01 2006
@@ -26,7 +26,8 @@
import org.apache.tuscany.databinding.PullTransformer;
import org.apache.tuscany.databinding.extension.TransformerExtension;
-public class XMLStreamReader2String extends
TransformerExtension<XMLStreamReader, String> implements
PullTransformer<XMLStreamReader, String> {
+public class XMLStreamReader2String extends
TransformerExtension<XMLStreamReader, String> implements
+ PullTransformer<XMLStreamReader, String> {
public String transform(XMLStreamReader source, TransformationContext
context) {
try {
Modified:
incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/impl/DataBindingInterceptorTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/impl/DataBindingInterceptorTestCase.java?view=diff&rev=442473&r1=442472&r2=442473
==============================================================================
---
incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/impl/DataBindingInterceptorTestCase.java
(original)
+++
incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/impl/DataBindingInterceptorTestCase.java
Mon Sep 11 23:24:01 2006
@@ -64,7 +64,8 @@
DataType<Class> type2 = new DataType<Class>("foo", Foo.class,
Foo.class);
List<DataType<Class>> types2 = new ArrayList<DataType<Class>>();
types2.add(type2);
- DataType<List<DataType<Class>>> inputType2 = new
DataType<List<DataType<Class>>>("foo", Object[].class, types2);
+ DataType<List<DataType<Class>>> inputType2
+ = new DataType<List<DataType<Class>>>("foo", Object[].class,
types2);
Operation<Class> operation1 = new Operation<Class>("call", inputType1,
type1, null, false, "xml:string");
Operation<Class> operation2 = new Operation<Class>("call", inputType2,
type2, null, false, "org.w3c.dom.Node");
Modified:
incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/impl/DataBindingJavaInterfaceProcessorTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/impl/DataBindingJavaInterfaceProcessorTestCase.java?view=diff&rev=442473&r1=442472&r2=442473
==============================================================================
---
incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/impl/DataBindingJavaInterfaceProcessorTestCase.java
(original)
+++
incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/impl/DataBindingJavaInterfaceProcessorTestCase.java
Mon Sep 11 23:24:01 2006
@@ -61,12 +61,12 @@
contract.setOperations(operations);
processor.visitInterface(MockInterface.class, contract);
Assert.assertEquals("org.w3c.dom.Node", contract.getDataBinding());
- Assert.assertEquals("element", (String)
contract.getMetaData().get("nodeType"));
+ Assert.assertEquals("element", (String)
contract.getMetaData().get("nodeType"));
Assert.assertEquals("org.w3c.dom.Node",
contract.getOperations().get("call").getDataBinding());
Assert.assertEquals("xml:string",
contract.getOperations().get("call1").getDataBinding());
}
- @DataType(name = "org.w3c.dom.Node", [EMAIL PROTECTED](key="nodeType",
value="element")})
+ @DataType(name = "org.w3c.dom.Node", context = { @DataContext(key =
"nodeType", value = "element") })
@Remotable
public static interface MockInterface {
Node call(Node msg);
Modified:
incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/impl/MediatorImplTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/impl/MediatorImplTestCase.java?view=diff&rev=442473&r1=442472&r2=442473
==============================================================================
---
incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/impl/MediatorImplTestCase.java
(original)
+++
incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/impl/MediatorImplTestCase.java
Mon Sep 11 23:24:01 2006
@@ -40,22 +40,25 @@
* Test case for MediatorImpl
*/
public class MediatorImplTestCase extends TestCase {
- private static final String IPO_XML = "<?xml version=\"1.0\"?>" +
"<ipo:purchaseOrder"
- + " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""; + "
xmlns:ipo=\"http://www.example.com/IPO\"";
- + " xsi:schemaLocation=\"http://www.example.com/IPO ipo.xsd\"" +
" orderDate=\"1999-12-01\">"
- + " <shipTo exportCode=\"1\" xsi:type=\"ipo:UKAddress\">" + "
<name>Helen Zoe</name>" + " <street>47 Eden Street</street>"
- + " <city>Cambridge</city>" + " <postcode>CB1
1JR</postcode>" + " </shipTo>" + " <billTo xsi:type=\"ipo:USAddress\">"
- + " <name>Robert Smith</name>" + " <street>8 Oak
Avenue</street>" + " <city>Old Town</city>" + " <state>PA</state>"
- + " <zip>95819</zip>" + " </billTo>" + " <items>" + "
<item partNum=\"833-AA\">"
- + " <productName>Lapis necklace</productName>" + "
<quantity>1</quantity>" + " <USPrice>99.95</USPrice>"
- + " <ipo:comment>Want this for the holidays</ipo:comment>" +
" <shipDate>1999-12-05</shipDate>" + " </item>" + " </items>"
- + "</ipo:purchaseOrder>";
+ private static final String IPO_XML =
+ "<?xml version=\"1.0\"?>" + "<ipo:purchaseOrder"
+ + "
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"";
+ + " xmlns:ipo=\"http://www.example.com/IPO\"";
+ + " xsi:schemaLocation=\"http://www.example.com/IPO
ipo.xsd\"" + " orderDate=\"1999-12-01\">"
+ + " <shipTo exportCode=\"1\" xsi:type=\"ipo:UKAddress\">"
+ " <name>Helen Zoe</name>"
+ + " <street>47 Eden Street</street>" + "
<city>Cambridge</city>" + " <postcode>CB1 1JR</postcode>"
+ + " </shipTo>" + " <billTo xsi:type=\"ipo:USAddress\">"
+ " <name>Robert Smith</name>"
+ + " <street>8 Oak Avenue</street>" + " <city>Old
Town</city>" + "<state>PA</state>"
+ + " <zip>95819</zip>" + " </billTo>" + " <items>" + "
<item partNum=\"833-AA\">"
+ + " <productName>Lapis necklace</productName>" + "
<quantity>1</quantity>"
+ + "<USPrice>99.95</USPrice>" + " <ipo:comment>Want this
for the holidays</ipo:comment>"
+ + " <shipDate>1999-12-05</shipDate>" + " </item>" + "
</items>" + "</ipo:purchaseOrder>";
private MediatorImpl mediator;
protected void setUp() throws Exception {
super.setUp();
-
+
TransformerRegistry registry = new TransformerRegistryImpl();
registry.registerTransformer(new String2SAX());
registry.registerTransformer(new SAX2DOMPipe());
@@ -64,7 +67,7 @@
mediator = new MediatorImpl();
mediator.setTransformerRegistry(registry);
-
+
DataBindingRegistry dataBindingRegistry = new
DataBindingRegistryImpl();
mediator.setDataBindingRegistry(dataBindingRegistry);
}
Modified:
incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/impl/TransformerRegistryImplTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/impl/TransformerRegistryImplTestCase.java?view=diff&rev=442473&r1=442472&r2=442473
==============================================================================
---
incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/impl/TransformerRegistryImplTestCase.java
(original)
+++
incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/impl/TransformerRegistryImplTestCase.java
Mon Sep 11 23:24:01 2006
@@ -45,10 +45,6 @@
registry = new TransformerRegistryImpl();
}
- /**
- * Test method for
- * [EMAIL PROTECTED]
org.apache.tuscany.databinding.impl.TransformerRegistryImpl#registerTransformer(java.lang.String,
java.lang.String, int, org.apache.tuscany.databinding.Transformer)}.
- */
public void testRegisterTransformer1() {
Transformer transformer = createMock(Transformer.class);
registry.registerTransformer("a", "b", 10, transformer);
@@ -56,10 +52,6 @@
Assert.assertSame(t, transformer);
}
- /**
- * Test method for
- * [EMAIL PROTECTED]
org.apache.tuscany.databinding.impl.TransformerRegistryImpl#registerTransformer(org.apache.tuscany.databinding.Transformer)}.
- */
public void testRegisterTransformerTransformer() {
Transformer transformer = createMock(Transformer.class);
expect(transformer.getSourceBinding()).andReturn("a");
@@ -71,9 +63,6 @@
Assert.assertSame(t, transformer);
}
- /**
- * Test method for [EMAIL PROTECTED]
org.apache.tuscany.databinding.impl.TransformerRegistryImpl#unregisterTransformer(java.lang.String,
java.lang.String)}.
- */
public void testUnregisterTransformer() {
Transformer transformer = createMock(Transformer.class);
registry.registerTransformer("a", "b", 10, transformer);
@@ -83,9 +72,6 @@
Assert.assertNull(t);
}
- /**
- * Test method for [EMAIL PROTECTED]
org.apache.tuscany.databinding.impl.TransformerRegistryImpl#getTransformerChain(java.lang.String,
java.lang.String)}.
- */
public void testGetTransformerChain() {
Transformer t1 = createMock(Transformer.class);
expect(t1.getSourceBinding()).andReturn("a");
Modified:
incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/util/PropertyMediatorTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/util/PropertyMediatorTestCase.java?view=diff&rev=442473&r1=442472&r2=442473
==============================================================================
---
incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/util/PropertyMediatorTestCase.java
(original)
+++
incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/util/PropertyMediatorTestCase.java
Mon Sep 11 23:24:01 2006
@@ -36,11 +36,12 @@
*
*/
public class PropertyMediatorTestCase extends TestCase {
- private static final String xml = "<?xml version=\"1.0\"
encoding=\"ASCII\"?>" +
-
- "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\";
xmlns:foo=\"http://foo.com\"; name=\"AccountServices\">"
- + "<property name=\"complexFoo\"
type=\"foo:MyComplexType\"><foo:a>AValue</foo:a><foo:b>InterestingURI</foo:b>"
- + "</property></composite>";
+ private static final String XML_STR =
+ "<?xml version=\"1.0\" encoding=\"ASCII\"?>"
+ + "<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\";
xmlns:foo=\"http://foo.com\"; "
+ + "name=\"AccountServices\">"
+ + "<property name=\"complexFoo\"
type=\"foo:MyComplexType\"><foo:a>AValue</foo:a>"
+ + "<foo:b>InterestingURI</foo:b>" +
"</property></composite>";
private QName name = new QName("http://www.osoa.org/xmlns/sca/1.0";,
"property");
@@ -53,20 +54,22 @@
public void testProperty() throws FactoryConfigurationError,
XMLStreamException {
XMLInputFactory factory = XMLInputFactory.newInstance();
- XMLStreamReader reader = factory.createXMLStreamReader(new
StringReader(xml));
-
+ XMLStreamReader reader = factory.createXMLStreamReader(new
StringReader(XML_STR));
+
boolean fragmentOnly = false;
-
+
while (fragmentOnly) {
int event = reader.getEventType();
if (event == XMLStreamConstants.START_ELEMENT) {
- if (reader.getName().equals(name))
+ if (reader.getName().equals(name)) {
break;
+ }
}
- if (reader.hasNext())
+ if (reader.hasNext()) {
reader.next();
- else
+ } else {
return;
+ }
}
XMLStreamReader2Node t1 = new XMLStreamReader2Node();
Modified:
incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/xml/PushTransformationTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/xml/PushTransformationTestCase.java?view=diff&rev=442473&r1=442472&r2=442473
==============================================================================
---
incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/xml/PushTransformationTestCase.java
(original)
+++
incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/xml/PushTransformationTestCase.java
Mon Sep 11 23:24:01 2006
@@ -29,16 +29,20 @@
import junit.framework.TestCase;
public class PushTransformationTestCase extends TestCase {
- private static final String IPO_XML = "<?xml version=\"1.0\"?>" +
"<ipo:purchaseOrder"
- + " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""; + "
xmlns:ipo=\"http://www.example.com/IPO\"";
- + " xsi:schemaLocation=\"http://www.example.com/IPO ipo.xsd\"" +
" orderDate=\"1999-12-01\">"
- + " <shipTo exportCode=\"1\" xsi:type=\"ipo:UKAddress\">" + "
<name>Helen Zoe</name>" + " <street>47 Eden Street</street>"
- + " <city>Cambridge</city>" + " <postcode>CB1
1JR</postcode>" + " </shipTo>" + " <billTo xsi:type=\"ipo:USAddress\">"
- + " <name>Robert Smith</name>" + " <street>8 Oak
Avenue</street>" + " <city>Old Town</city>" + " <state>PA</state>"
- + " <zip>95819</zip>" + " </billTo>" + " <items>" + "
<item partNum=\"833-AA\">"
- + " <productName>Lapis necklace</productName>" + "
<quantity>1</quantity>" + " <USPrice>99.95</USPrice>"
- + " <ipo:comment>Want this for the holidays</ipo:comment>" +
" <shipDate>1999-12-05</shipDate>" + " </item>" + " </items>"
- + "</ipo:purchaseOrder>";
+ private static final String IPO_XML =
+ "<?xml version=\"1.0\"?>" + "<ipo:purchaseOrder"
+ + "
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"";
+ + " xmlns:ipo=\"http://www.example.com/IPO\"";
+ + " xsi:schemaLocation=\"http://www.example.com/IPO
ipo.xsd\"" + " orderDate=\"1999-12-01\">"
+ + " <shipTo exportCode=\"1\" xsi:type=\"ipo:UKAddress\">"
+ " <name>Helen Zoe</name>"
+ + " <street>47 Eden Street</street>" + "
<city>Cambridge</city>"
+ + " <postcode>CB1 1JR</postcode>" + " </shipTo>" + "
<billTo xsi:type=\"ipo:USAddress\">"
+ + " <name>Robert Smith</name>" + " <street>8 Oak
Avenue</street>"
+ + " <city>Old Town</city>" + " <state>PA</state>" +
" <zip>95819</zip>" + " </billTo>"
+ + " <items>" + " <item partNum=\"833-AA\">" + "
<productName>Lapis necklace</productName>"
+ + " <quantity>1</quantity>" + "
<USPrice>99.95</USPrice>"
+ + " <ipo:comment>Want this for the
holidays</ipo:comment>"
+ + " <shipDate>1999-12-05</shipDate>" + " </item>"
+ " </items>" + "</ipo:purchaseOrder>";
/**
* @see junit.framework.TestCase#setUp()
@@ -51,13 +55,13 @@
String2XMLStreamReader t1 = new String2XMLStreamReader();
XMLStreamReader reader = t1.transform(IPO_XML, null);
XMLStreamReader2SAX t2 = new XMLStreamReader2SAX();
- PipedTransformer<XMLStreamReader, ContentHandler, Node> t3 = new
PipedTransformer<XMLStreamReader, ContentHandler, Node>(t2,
- new SAX2DOMPipe());
+ PipedTransformer<XMLStreamReader, ContentHandler, Node> t3 =
+ new PipedTransformer<XMLStreamReader, ContentHandler,
Node>(t2, new SAX2DOMPipe());
Node node = t3.transform(reader, null);
Assert.assertNotNull(node);
- Node2String t4= new Node2String();
+ Node2String t4 = new Node2String();
String xml = t4.transform(node, null);
- Assert.assertTrue(xml!=null &&
xml.indexOf("<shipDate>1999-12-05</shipDate>")!=-1);
+ Assert.assertTrue(xml != null &&
xml.indexOf("<shipDate>1999-12-05</shipDate>") != -1);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
