You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2007/02/11 08:35:53 UTC
svn commit: r505861 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/builder/physical/
core/src/main/java/org/apache/tuscany/core/component/
core/src/main/java/org/apache/tuscany/core/databinding/javabeans/
core/src/m...
Author: jmarino
Date: Sat Feb 10 23:35:52 2007
New Revision: 505861
URL: http://svn.apache.org/viewvc?view=rev&rev=505861
Log:
checkstyle and pmd cleanup
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/physical/DefaultPhysicalComponentBuilderRegistry.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/JavaPhysicalComponentDefinition.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/javabeans/XML2JavaMapperException.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentBuilder.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/InstanceWrapperBaseTestClass.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/javabeans/DOMNode2JavaBeanTransformerTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/javabeans/JavaBean2DOMNodeTransformerTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalComponentDefinitionMarshallerTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/physical/PhysicalComponentBuilderRegistry.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/databinding/extension/SimpleType2JavaTransformer.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentContext.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/WireDefinition.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/util/stax/StaxUtil.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/physical/DefaultPhysicalComponentBuilderRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/physical/DefaultPhysicalComponentBuilderRegistry.java?view=diff&rev=505861&r1=505860&r2=505861
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/physical/DefaultPhysicalComponentBuilderRegistry.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/physical/DefaultPhysicalComponentBuilderRegistry.java Sat Feb 10 23:35:52 2007
@@ -27,40 +27,43 @@
import org.apache.tuscany.spi.model.physical.PhysicalComponentDefinition;
/**
- * Default map-based implementation of the physical component builder registry.
- *
+ * Default map-based implementation of the physical component builder registry.
+ * <p/>
* TODO may be we can factor out all the registries into a parameterized one.
- *
+ *
* @version $Rev$ $Date$
*/
public class DefaultPhysicalComponentBuilderRegistry implements PhysicalComponentBuilderRegistry {
// Internal cache
- private Map<Class<? extends PhysicalComponentDefinition>, PhysicalComponentBuilder<? extends PhysicalComponentDefinition, ? extends Component>> registry =
- new ConcurrentHashMap<Class<? extends PhysicalComponentDefinition>, PhysicalComponentBuilder<? extends PhysicalComponentDefinition, ? extends Component>>();
+ private Map<Class<? extends PhysicalComponentDefinition>,
+ PhysicalComponentBuilder<? extends PhysicalComponentDefinition, ? extends Component>> registry =
+ new ConcurrentHashMap<Class<? extends PhysicalComponentDefinition>,
+ PhysicalComponentBuilder<? extends PhysicalComponentDefinition, ? extends Component>>();
/**
* Registers a physical component builder.
- *
- * @param <PCD> Type of the physical component definition.
+ *
+ * @param <PCD> Type of the physical component definition.
* @param definitionClass Class of the physical component definition.
- * @param builder Builder for the physical component definition.
+ * @param builder Builder for the physical component definition.
*/
- public <PCD extends PhysicalComponentDefinition, C extends Component> void register(Class<PCD> definitionClass,
- PhysicalComponentBuilder<PCD, C> builder) {
+ public <PCD extends PhysicalComponentDefinition,
+ C extends Component> void register(Class<PCD> definitionClass, PhysicalComponentBuilder<PCD, C> builder) {
registry.put(definitionClass, builder);
}
/**
* Gets a builder for the specified physical component builder.
- *
- * @param <PCD> Type of the physical component definition.
+ *
+ * @param <PCD> Type of the physical component definition.
* @param definitionClass Class of the physical component definition.
* @return Builder for the physical component definition.
*/
@SuppressWarnings("unchecked")
- public <PCD extends PhysicalComponentDefinition, C extends Component> PhysicalComponentBuilder<PCD, C> getBuilder(Class<PCD> definitionClass) {
- return (PhysicalComponentBuilder<PCD, C>)registry.get(definitionClass);
+ public <PCD extends PhysicalComponentDefinition, C extends Component> PhysicalComponentBuilder<PCD, C> getBuilder(
+ Class<PCD> definitionClass) {
+ return (PhysicalComponentBuilder<PCD, C>) registry.get(definitionClass);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/JavaPhysicalComponentDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/JavaPhysicalComponentDefinition.java?view=diff&rev=505861&r1=505860&r2=505861
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/JavaPhysicalComponentDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/JavaPhysicalComponentDefinition.java Sat Feb 10 23:35:52 2007
@@ -24,17 +24,17 @@
/**
* Represents the physical component definition for a Java implementation.
- *
- * @version $Rev$ $Date$
*
+ * @version $Rev$ $Date$
*/
public class JavaPhysicalComponentDefinition extends PhysicalComponentDefinition {
// The byte code for the instance factory
private byte[] instanceFactoryByteCode;
-
+
/**
* Initializes the component id.
+ *
* @param componentId The component id.
*/
public JavaPhysicalComponentDefinition(final URI componentId) {
@@ -43,6 +43,7 @@
/**
* Gets the byte code for the instance factory.
+ *
* @return Byte code for the instance factory.
*/
public byte[] getInstanceFactoryByteCode() {
@@ -51,15 +52,16 @@
/**
* Sets the byte code for the instance factory.
+ *
* @param instanceFactoryByteCode Byte code for the instance factory.
*/
public void setInstanceFactoryByteCode(byte[] instanceFactoryByteCode) {
-
- if(instanceFactoryByteCode == null) {
+
+ if (instanceFactoryByteCode == null) {
throw new IllegalArgumentException("Instance factory byte code is null");
}
this.instanceFactoryByteCode = instanceFactoryByteCode;
-
+
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/javabeans/XML2JavaMapperException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/javabeans/XML2JavaMapperException.java?view=diff&rev=505861&r1=505860&r2=505861
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/javabeans/XML2JavaMapperException.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/javabeans/XML2JavaMapperException.java Sat Feb 10 23:35:52 2007
@@ -24,12 +24,13 @@
import org.apache.tuscany.api.TuscanyRuntimeException;
/**
- * This exception is used to encapsulate and rethrow exceptions that arise out
- * of converting XML Data to Java Objects.
+ * This exception is used to encapsulate and rethrow exceptions that arise out of converting XML Data to Java Objects.
+ *
+ * @version $Rev$ $Date$
*/
public class XML2JavaMapperException extends TuscanyRuntimeException {
private static final long serialVersionUID = 6596530102591630642L;
-
+
private QName xmlElementName;
private String javaFieldName;
private Class javaType;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentBuilder.java?view=diff&rev=505861&r1=505860&r2=505861
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentBuilder.java Sat Feb 10 23:35:52 2007
@@ -41,11 +41,12 @@
*/
public JavaAtomicComponent build(JavaPhysicalComponentDefinition componentDefinition) throws BuilderException {
- byte[] instanceFactoryByteCode = componentDefinition.getInstanceFactoryByteCode();
+ //byte[] instanceFactoryByteCode = componentDefinition.getInstanceFactoryByteCode();
// TODO I am sure this is not the right classloader.
- InstanceFactoryLoader cl = new InstanceFactoryLoader();
- Class instanceFactoryClass = cl.loadClass(instanceFactoryByteCode);
+ // commented out for PMD
+ //InstanceFactoryLoader cl = new InstanceFactoryLoader();
+ //Class instanceFactoryClass = cl.loadClass(instanceFactoryByteCode);
// TODO Do the rest
@@ -57,10 +58,11 @@
*
* TODO Is there a better way to do this?
*/
- private class InstanceFactoryLoader extends ClassLoader {
- public Class loadClass(byte[] byteCode) {
- return defineClass(null, byteCode, 0, byteCode.length);
- }
- }
+// commented out for PMD
+// private class InstanceFactoryLoader extends ClassLoader {
+// public Class loadClass(byte[] byteCode) {
+// return defineClass(null, byteCode, 0, byteCode.length);
+// }
+// }
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/InstanceWrapperBaseTestClass.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/InstanceWrapperBaseTestClass.java?view=diff&rev=505861&r1=505860&r2=505861
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/InstanceWrapperBaseTestClass.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/InstanceWrapperBaseTestClass.java Sat Feb 10 23:35:52 2007
@@ -20,8 +20,6 @@
import junit.framework.TestCase;
-import org.apache.tuscany.spi.component.TargetInitializationException;
-
/**
* @version $Rev$ $Date$
*/
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/javabeans/DOMNode2JavaBeanTransformerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/javabeans/DOMNode2JavaBeanTransformerTestCase.java?view=diff&rev=505861&r1=505860&r2=505861
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/javabeans/DOMNode2JavaBeanTransformerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/javabeans/DOMNode2JavaBeanTransformerTestCase.java Sat Feb 10 23:35:52 2007
@@ -21,31 +21,33 @@
import java.io.StringReader;
import java.io.StringWriter;
-
import javax.xml.parsers.DocumentBuilder;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import junit.framework.TestCase;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.xml.sax.InputSource;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.databinding.extension.DOMHelper;
import org.apache.tuscany.spi.idl.ElementInfo;
import org.apache.tuscany.spi.idl.TypeInfo;
import org.apache.tuscany.spi.model.DataType;
+
+import junit.framework.TestCase;
import org.easymock.EasyMock;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.xml.sax.InputSource;
/**
- * Testcase to test the XMLTypeMapperExtension which is the back bone for all transformations
- * supported by the JavaBeans Databinding.
+ * Testcase to test the XMLTypeMapperExtension which is the back bone for all transformations supported by the JavaBeans
+ * Databinding.
+ *
+ * @version $Rev$ $Date$
*/
public class DOMNode2JavaBeanTransformerTestCase extends TestCase {
- DOMNode2JavaBeanTransformer dom2JavaTransformer = new DOMNode2JavaBeanTransformer();
+ private DOMNode2JavaBeanTransformer dom2JavaTransformer = new DOMNode2JavaBeanTransformer();
/**
* @see junit.framework.TestCase#setUp()
@@ -56,14 +58,14 @@
public void testFieldSettings() throws Exception {
String samplePropertyXML =
- "<property name=\"prop2\" >" + "<integerNumber>27</integerNumber>"
- + "<floatNumber>79.34</floatNumber>"
- + "<doubleNumber>184.52</doubleNumber>" + "<innerProperty>"
- + "<integerNumber>54</integerNumber>" + "<floatNumber>158.68</floatNumber>"
- + "<doubleNumber>369.04</doubleNumber>" + "</innerProperty>"
- + "<stringArray>TestString_1</stringArray>"
- + "<stringArray>TestString_2</stringArray>" + "<boolArray>true</boolArray>"
- + "<boolArray>false</boolArray>" + "</property>";
+ "<property name=\"prop2\" >" + "<integerNumber>27</integerNumber>"
+ + "<floatNumber>79.34</floatNumber>"
+ + "<doubleNumber>184.52</doubleNumber>" + "<innerProperty>"
+ + "<integerNumber>54</integerNumber>" + "<floatNumber>158.68</floatNumber>"
+ + "<doubleNumber>369.04</doubleNumber>" + "</innerProperty>"
+ + "<stringArray>TestString_1</stringArray>"
+ + "<stringArray>TestString_2</stringArray>" + "<boolArray>true</boolArray>"
+ + "<boolArray>false</boolArray>" + "</property>";
DocumentBuilder builder = DOMHelper.newDocumentBuilder();
InputSource inputSource = new InputSource(new StringReader(samplePropertyXML));
@@ -73,27 +75,28 @@
TransformationContext context = EasyMock.createMock(TransformationContext.class);
DataType<Class> targetDataType = new DataType<Class>(null, SamplePropertyBean.class);
EasyMock.expect(context.getTargetDataType()).andReturn(targetDataType).anyTimes();
-
+
DataType<Class> sourceDataType = new DataType<Class>(null, null);
ElementInfo eleInfo = new ElementInfo(null, typeInfo);
sourceDataType.setMetadata(ElementInfo.class.getName(), eleInfo);
EasyMock.expect(context.getSourceDataType()).andReturn(sourceDataType).anyTimes();
EasyMock.replay(context);
- Object javaObject = dom2JavaTransformer.transform(((Document)samplePropertyNode).getDocumentElement(), context);
+ Object javaObject =
+ dom2JavaTransformer.transform(((Document) samplePropertyNode).getDocumentElement(), context);
assertTrue(javaObject instanceof SamplePropertyBean);
SamplePropertyBean samplePropBean = (SamplePropertyBean) javaObject;
assertEquals(samplePropBean.getIntegerNumber(), 27);
- assertEquals((float) 79.34, (float) samplePropBean.getFloatNumber());
- assertEquals((double) samplePropBean.getInnerProperty().getDoubleNumber(), (double) 369.04);
+ assertEquals((float) 79.34, samplePropBean.getFloatNumber());
+ assertEquals(samplePropBean.getInnerProperty().getDoubleNumber(), 369.04);
assertEquals(samplePropBean.getStringArray()[0], "TestString_1");
assertEquals(samplePropBean.boolArray[0], true);
/** testing for object to node * */
- javax.xml.transform.Transformer transformer =
- TransformerFactory.newInstance().newTransformer();
+ javax.xml.transform.Transformer transformer =
+ TransformerFactory.newInstance().newTransformer();
JavaBean2DOMNodeTransformer java2DomTransformer = new JavaBean2DOMNodeTransformer();
Node aNode = java2DomTransformer.transform(javaObject, context);
StringWriter sw = new StringWriter();
@@ -105,7 +108,7 @@
assertTrue(nodeString.indexOf("<doubleNumber>184.52</doubleNumber>") == -1);
// test the case for fields that are of array type
assertTrue(nodeString.indexOf("<stringArray>TestString_1</stringArray>"
- + "<stringArray>TestString_2</stringArray>") != -1);
+ + "<stringArray>TestString_2</stringArray>") != -1);
// testing the case for non-public field with public getter method
assertTrue(nodeString.indexOf("<integerNumber>27</integerNumber>") != -1);
// test the case for public field that is a another java bean .i.e. embeded javabean
@@ -118,12 +121,11 @@
}
-
public static class SamplePropertyBean {
- public float floatNumber = 50;
- public SamplePropertyBean innerProperty;
+ private float floatNumber = 50;
+ private SamplePropertyBean innerProperty;
public boolean[] boolArray;
private double doubleNumber = 75;
private int integerNumber = 25;
@@ -167,7 +169,7 @@
public String toString() {
return Double.toString(integerNumber + floatNumber + doubleNumber) + " & "
- + ((innerProperty == null) ? "" : innerProperty.toString());
+ + ((innerProperty == null) ? "" : innerProperty.toString());
}
public String[] getStringArray() {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/javabeans/JavaBean2DOMNodeTransformerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/javabeans/JavaBean2DOMNodeTransformerTestCase.java?view=diff&rev=505861&r1=505860&r2=505861
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/javabeans/JavaBean2DOMNodeTransformerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/databinding/javabeans/JavaBean2DOMNodeTransformerTestCase.java Sat Feb 10 23:35:52 2007
@@ -20,25 +20,26 @@
package org.apache.tuscany.core.databinding.javabeans;
import java.io.StringWriter;
-
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import junit.framework.TestCase;
+import org.w3c.dom.Node;
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.model.DataType;
+
+import junit.framework.TestCase;
import org.easymock.EasyMock;
-import org.w3c.dom.Node;
/**
- * Testcase to test the XMLTypeMapperExtension which is the back bone for all transformations
- * supported by the JavaBeans Databinding.
+ * Testcase to test the XMLTypeMapperExtension which is the back bone for all transformations supported by the JavaBeans
+ * Databinding.
+ *
+ * @version $Rev$ $Date$
*/
public class JavaBean2DOMNodeTransformerTestCase extends TestCase {
-
- JavaBean2DOMNodeTransformer aTransformer = new JavaBean2DOMNodeTransformer();
+ private JavaBean2DOMNodeTransformer aTransformer = new JavaBean2DOMNodeTransformer();
/**
* @see junit.framework.TestCase#setUp()
@@ -54,23 +55,21 @@
EasyMock.replay(context);
javax.xml.transform.Transformer transformer =
- TransformerFactory.newInstance().newTransformer();
- Object data = new int[] {10, 20, 30, 40};
+ TransformerFactory.newInstance().newTransformer();
+ Object data = new int[]{10, 20, 30, 40};
Node aNode = aTransformer.transform(data, context);
StringWriter sw = new StringWriter();
transformer.transform(new DOMSource(aNode), new StreamResult(sw));
System.out.println(sw.toString());
assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?><int_collection><int>10</int><int>20</int>"
- + "<int>30</int><int>40</int></int_collection>",
- sw.toString());
+ + "<int>30</int><int>40</int></int_collection>",
+ sw.toString());
}
public static class SamplePropertyBean {
-
- public float floatNumber = 50;
- public SamplePropertyBean innerProperty;
- public boolean[] boolArray;
+ private float floatNumber = 50;
+ private SamplePropertyBean innerProperty;
private double doubleNumber = 75;
private int integerNumber = 25;
private String[] stringArray;
@@ -113,7 +112,7 @@
public String toString() {
return Double.toString(integerNumber + floatNumber + doubleNumber) + " & "
- + ((innerProperty == null) ? "" : innerProperty.toString());
+ + ((innerProperty == null) ? "" : innerProperty.toString());
}
public String[] getStringArray() {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalComponentDefinitionMarshallerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalComponentDefinitionMarshallerTestCase.java?view=diff&rev=505861&r1=505860&r2=505861
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalComponentDefinitionMarshallerTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/marshaller/JavaPhysicalComponentDefinitionMarshallerTestCase.java Sat Feb 10 23:35:52 2007
@@ -20,17 +20,16 @@
import java.io.ByteArrayOutputStream;
import java.net.URI;
-
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.tuscany.core.component.JavaPhysicalComponentDefinition;
import org.apache.tuscany.spi.marshaller.ModelMarshaller;
import org.apache.tuscany.spi.util.stax.StaxUtil;
import junit.framework.TestCase;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.tuscany.core.component.JavaPhysicalComponentDefinition;
public class JavaPhysicalComponentDefinitionMarshallerTestCase extends TestCase {
@@ -47,45 +46,45 @@
}
public void testUnmarshall() throws Exception {
-
+
byte[] test = "TEST".getBytes();
String encodedBytes = new String(Base64.encodeBase64(test));
-
- String xml =
- "<componentJava componentId=\"uri\" xmlns=\"http://tuscany.apache.org/xmlns/1.0-SNAPSHOT\">" +
- " <instanceFactoryByteCode>" + encodedBytes + "</instanceFactoryByteCode>" +
- "</componentJava>";
+
+ String xml =
+ "<componentJava componentId=\"uri\" xmlns=\"http://tuscany.apache.org/xmlns/1.0-SNAPSHOT\">"
+ + " <instanceFactoryByteCode>" + encodedBytes + "</instanceFactoryByteCode>"
+ + "</componentJava>";
XMLStreamReader reader = StaxUtil.createReader(xml);
-
+
ModelMarshaller<JavaPhysicalComponentDefinition> marshaller = new JavaPhysicalComponentDefinitionMarshaller();
JavaPhysicalComponentDefinition definition = marshaller.unmarshall(reader);
-
+
assertEquals(new URI("uri"), definition.getComponentId());
assertEquals("TEST", new String(definition.getInstanceFactoryByteCode()));
-
+
}
public void testMarshall() throws Exception {
-
+
ByteArrayOutputStream out = new ByteArrayOutputStream();
-
+
JavaPhysicalComponentDefinition definition = new JavaPhysicalComponentDefinition(new URI("uri"));
definition.setInstanceFactoryByteCode("TEST".getBytes());
-
+
XMLStreamWriter writer = XMLOutputFactory.newInstance().createXMLStreamWriter(out, "UTF-8");
-
-
+
+
ModelMarshaller<JavaPhysicalComponentDefinition> marshaller = new JavaPhysicalComponentDefinitionMarshaller();
marshaller.marshall(definition, writer);
-
+
String xml = new String(out.toByteArray());
- XMLStreamReader reader = StaxUtil.createReader(xml);
+ XMLStreamReader reader = StaxUtil.createReader(xml);
definition = marshaller.unmarshall(reader);
-
+
assertEquals(new URI("uri"), definition.getComponentId());
assertEquals("TEST", new String(definition.getInstanceFactoryByteCode()));
-
-
+
+
}
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/physical/PhysicalComponentBuilderRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/physical/PhysicalComponentBuilderRegistry.java?view=diff&rev=505861&r1=505860&r2=505861
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/physical/PhysicalComponentBuilderRegistry.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/builder/physical/PhysicalComponentBuilderRegistry.java Sat Feb 10 23:35:52 2007
@@ -23,28 +23,30 @@
/**
* A registry of physical component builders.
- *
+ *
* @version $Rev$ $Date$
*/
public interface PhysicalComponentBuilderRegistry {
/**
* Registers a physical component builder.
- *
- * @param <PCD> Type of the physical component definition.
+ *
+ * @param <PCD> Type of the physical component definition.
* @param definitionClass Class of the physical component definition.
- * @param builder Builder for the physical component definition.
+ * @param builder Builder for the physical component definition.
*/
<PCD extends PhysicalComponentDefinition, C extends Component> void register(Class<PCD> definitionClass,
- PhysicalComponentBuilder<PCD, C> builder);
+ PhysicalComponentBuilder<PCD,
+ C> builder);
/**
* Gets a builder for the specified physical component builder.
- *
- * @param <PCD> Type of the physical component definition.
+ *
+ * @param <PCD> Type of the physical component definition.
* @param definitionClass Class of the physical component definition.
* @return Builder for the physical component definition.
*/
- <PCD extends PhysicalComponentDefinition, C extends Component> PhysicalComponentBuilder<PCD, C> getBuilder(Class<PCD> definitionClass);
+ <PCD extends PhysicalComponentDefinition, C extends Component> PhysicalComponentBuilder<PCD, C> getBuilder(
+ Class<PCD> definitionClass);
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/databinding/extension/SimpleType2JavaTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/databinding/extension/SimpleType2JavaTransformer.java?view=diff&rev=505861&r1=505860&r2=505861
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/databinding/extension/SimpleType2JavaTransformer.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/databinding/extension/SimpleType2JavaTransformer.java Sat Feb 10 23:35:52 2007
@@ -23,11 +23,11 @@
import org.apache.tuscany.spi.databinding.TransformationContext;
import org.apache.tuscany.spi.idl.ElementInfo;
import org.apache.tuscany.spi.idl.TypeInfo;
-import org.w3c.dom.Node;
/**
- * Transformer to convert data from a databinding's representation of simple
- * types to Java Objects
+ * Transformer to convert data from a databinding's representation of simple types to Java Objects
+ *
+ * @version $Rev$ $Date$
*/
public abstract class SimpleType2JavaTransformer<T> extends TransformerExtension<T, Object> implements
PullTransformer<T, Object> {
@@ -43,13 +43,13 @@
}
public Object transform(T source, TransformationContext context) {
- TypeInfo simpleType = (TypeInfo)context.getSourceDataType().getMetadata(TypeInfo.class.getName());
+ TypeInfo simpleType = (TypeInfo) context.getSourceDataType().getMetadata(TypeInfo.class.getName());
if (simpleType == null) {
ElementInfo element =
- (ElementInfo)context.getSourceDataType().getMetadata(ElementInfo.class.getName());
- simpleType = (TypeInfo)element.getType();
+ (ElementInfo) context.getSourceDataType().getMetadata(ElementInfo.class.getName());
+ simpleType = element.getType();
}
-
+
return mapper.toJavaObject(simpleType, getText(source), context);
}
@@ -64,7 +64,8 @@
/**
* Get the string value from the source
- * @param source
+ *
+ * @param source the source to return the string from
* @return A string
*/
protected abstract String getText(T source);
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentContext.java?view=diff&rev=505861&r1=505860&r2=505861
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentContext.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentContext.java Sat Feb 10 23:35:52 2007
@@ -88,6 +88,6 @@
*
* @return the ordered list of path names representing the current component hierarchy
*/
- public List<String> getPathNames();
+ List<String> getPathNames();
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java?view=diff&rev=505861&r1=505860&r2=505861
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/PhysicalComponentDefinition.java Sat Feb 10 23:35:52 2007
@@ -27,82 +27,87 @@
/**
* Represents a physical component model.
- *
- * @version $Rev$ $Date$
*
+ * @version $Rev$ $Date$
*/
public abstract class PhysicalComponentDefinition extends ModelObject {
-
+
// Component Id.
private final URI componentId;
-
+
// Inbound wires
private final Set<WireDefinition> inboundWires = new HashSet<WireDefinition>();
-
+
// Outbound wires
private final Set<WireDefinition> outboundWires = new HashSet<WireDefinition>();
/**
* Initializes the component id.
+ *
* @param componentId The component id.
*/
public PhysicalComponentDefinition(final URI componentId) {
-
- if(componentId == null) {
+
+ if (componentId == null) {
throw new IllegalArgumentException("Component id is null");
}
this.componentId = componentId;
-
+
}
/**
* Returns the absolute id for the phyiscal component.
+ *
* @return the absolute id for the phyiscal component
*/
public URI getComponentId() {
return componentId;
}
-
+
/**
* Returns a read-only view of the inbound wires.
+ *
* @return List of inbound wires available on the component.
*/
public Set<WireDefinition> getInboundWires() {
return Collections.unmodifiableSet(inboundWires);
}
-
+
/**
* Adds an inbound wire.
+ *
* @param inboundWire Inbound wire to add to the component.
*/
public void addInboundWire(WireDefinition inboundWire) {
-
- if(inboundWire == null) {
+
+ if (inboundWire == null) {
throw new IllegalArgumentException("Inbound wire is null");
}
inboundWires.add(inboundWire);
-
+
}
-
+
/**
* Returns a read-only view of the outbound wires.
+ *
* @return List of outbound wires available on the component.
*/
public Set<WireDefinition> getOutboundWires() {
return Collections.unmodifiableSet(outboundWires);
}
-
+
/**
* Adds an outbound wire.
+ *
* @param outboundWire Outbound wire to add to the component.
*/
public void addOutboundWire(WireDefinition outboundWire) {
-
- if(outboundWire == null) {
+
+ if (outboundWire == null) {
throw new IllegalArgumentException("Outbound wire is null");
}
outboundWires.add(outboundWire);
-
+
}
-
+
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/WireDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/WireDefinition.java?view=diff&rev=505861&r1=505860&r2=505861
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/WireDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/physical/WireDefinition.java Sat Feb 10 23:35:52 2007
@@ -24,57 +24,59 @@
import java.util.Set;
/**
- * Model class representing the portable definition of a wire. This class
- * is used to describe the inbound and outbound wires on a physical
- * component definition.
- *
- * @version $Rev$ $Date$
+ * Model class representing the portable definition of a wire. This class is used to describe the inbound and outbound
+ * wires on a physical component definition.
*
+ * @version $Rev$ $Date$
*/
public class WireDefinition {
-
+
// The resolved URI of the wire
private final URI wireUri;
-
+
// Interceptors defined against the wire
private final Set<InterceptorDefinition> interceptors = new HashSet<InterceptorDefinition>();
/**
* Initializes the wire URI.
+ *
* @param wireUri The resolved URI of the wire.
*/
public WireDefinition(final URI wireUri) {
-
- if(wireUri == null) {
+
+ if (wireUri == null) {
throw new IllegalArgumentException("Wire uri is null");
}
this.wireUri = wireUri;
-
+
}
-
+
/**
* Returns a read-only view of the available interceptors.
+ *
* @return List of interceptors available on the wire.
*/
public Set<InterceptorDefinition> getInterceptors() {
return Collections.unmodifiableSet(interceptors);
}
-
+
/**
* Adds an interceptor definition.
+ *
* @param interceptorDefinition Interceptor definition to add to the wire.
*/
public void addInterceptor(InterceptorDefinition interceptorDefinition) {
-
- if(interceptorDefinition == null) {
+
+ if (interceptorDefinition == null) {
throw new IllegalArgumentException("Interceptor definition is null");
}
interceptors.add(interceptorDefinition);
-
+
}
/**
* Returns the wire URI.
+ *
* @return The resolved URI of the wire.
*/
public URI getWireUri() {
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/util/stax/StaxUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/util/stax/StaxUtil.java?view=diff&rev=505861&r1=505860&r2=505861
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/util/stax/StaxUtil.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/util/stax/StaxUtil.java Sat Feb 10 23:35:52 2007
@@ -48,7 +48,7 @@
/**
* XML input factory.
*/
- private static final XMLInputFactory xmlFactory =
+ private static final XMLInputFactory XML_FACTORY =
XMLInputFactory.newInstance("javax.xml.stream.XMLInputFactory", StaxUtil.class.getClassLoader());
private static final Map<String, Multiplicity> MULTIPLICITY = new HashMap<String, Multiplicity>(4);
@@ -223,7 +223,7 @@
public static XMLStreamReader createReader(String xml) throws XMLStreamException {
InputStream in = new ByteArrayInputStream(xml.getBytes());
- return xmlFactory.createXMLStreamReader(in);
+ return XML_FACTORY.createXMLStreamReader(in);
}
@@ -236,7 +236,7 @@
*/
public static XMLStreamReader createReader(InputStream xml) throws XMLStreamException {
- return xmlFactory.createXMLStreamReader(xml);
+ return XML_FACTORY.createXMLStreamReader(xml);
}
@@ -255,7 +255,9 @@
reader.next();
return reader.getName();
} finally {
- reader.close();
+ if (reader != null) {
+ reader.close();
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org