Refactor the tuscany-core module to move private classes out of the SPI packages

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@723218 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 26 insertions, 39 deletions

diff --git a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
index c9ee4e485f..06d742e014 100644
--- a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
+++ b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
@@ -24,13 +24,10 @@ import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 import org.apache.tuscany.sca.core.ModuleActivator;
 import org.apache.tuscany.sca.core.databinding.processor.DataBindingJavaInterfaceProcessor;
 import org.apache.tuscany.sca.core.databinding.transformers.Array2ArrayTransformer;
-import org.apache.tuscany.sca.core.databinding.transformers.CallableReference2XMLStreamReader;
-import org.apache.tuscany.sca.core.databinding.transformers.CallableReferenceDataBinding;
 import org.apache.tuscany.sca.core.databinding.transformers.CallableReferenceXMLAdapter;
 import org.apache.tuscany.sca.core.databinding.transformers.Exception2ExceptionTransformer;
 import org.apache.tuscany.sca.core.databinding.transformers.Input2InputTransformer;
 import org.apache.tuscany.sca.core.databinding.transformers.Output2OutputTransformer;
-import org.apache.tuscany.sca.core.databinding.transformers.XMLStreamReader2CallableReference;
 import org.apache.tuscany.sca.core.databinding.wire.DataBindingRuntimeWireProcessor;
 import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
 import org.apache.tuscany.sca.databinding.TransformerExtensionPoint;
@@ -77,9 +74,9 @@ public class DataBindingModuleActivator implements ModuleActivator {
         group2GroupTransformer.setMediator(mediator);
         transformers.addTransformer(group2GroupTransformer, true);
         
-        dataBindings.addDataBinding(new CallableReferenceDataBinding());
-        transformers.addTransformer(new CallableReference2XMLStreamReader(), true);
-        transformers.addTransformer(new XMLStreamReader2CallableReference(), false);
+//        dataBindings.addDataBinding(new CallableReferenceDataBinding());
+//        transformers.addTransformer(new CallableReference2XMLStreamReader(), true);
+//        transformers.addTransformer(new XMLStreamReader2CallableReference(), false);
 
         FactoryExtensionPoint modelFactories = registry.getExtensionPoint(FactoryExtensionPoint.class);
         JavaInterfaceFactory javaFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
diff --git a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java
index 124928db24..76272f53dc 100644
--- a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java
+++ b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java
@@ -20,7 +20,7 @@ package org.apache.tuscany.sca.core.databinding.transformers;
 

 import javax.xml.stream.XMLStreamReader;

 

-import org.apache.tuscany.sca.core.context.CallableReferenceImpl;

+import org.apache.tuscany.sca.core.context.CallableReferenceExt;

 import org.apache.tuscany.sca.databinding.PullTransformer;

 import org.apache.tuscany.sca.databinding.TransformationContext;

 import org.apache.tuscany.sca.databinding.TransformationException;

@@ -44,12 +44,12 @@ public class CallableReference2XMLStreamReader extends BaseTransformer<CallableR
     public XMLStreamReader transform(CallableReference source, TransformationContext context) {

         try {

             if (source != null) {

-                if (source instanceof CallableReferenceImpl) {

-                    XMLStreamReader xmlReader = ((CallableReferenceImpl)source).getXMLReader();

+                if (source instanceof CallableReferenceExt) {

+                    XMLStreamReader xmlReader = ((CallableReferenceExt)source).getXMLReader();

                     if (xmlReader != null) {

                         return xmlReader;

                     } else {

-                        String xmlString = ((CallableReferenceImpl)source).toXMLString();

+                        String xmlString = ((CallableReferenceExt)source).toXMLString();

 

                         // remove "<?xml...?>" processing instruction and wrap with a top-level element

                         return StAXHelper.createXMLStreamReader("<reference xmlns=\"http://callable\">"

diff --git a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java
index ff6e444dcd..09b2b53306 100644
--- a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java
+++ b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java
@@ -19,43 +19,32 @@
 
 package org.apache.tuscany.sca.core.databinding.transformers;
 
-import java.io.StringReader;
-import java.io.StringWriter;
-
 import javax.xml.bind.annotation.adapters.XmlAdapter;
-import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
-import javax.xml.transform.Source;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
 
-import org.apache.tuscany.sca.databinding.xml.XMLStreamReader2String;
+import org.apache.tuscany.sca.databinding.xml.Node2XMLStreamReader;
+import org.apache.tuscany.sca.databinding.xml.XMLStreamReader2Node;
 import org.osoa.sca.CallableReference;
+import org.w3c.dom.Element;
 
 /**
  * @version $Rev$ $Date$
  */
-public class CallableReferenceXMLAdapter extends XmlAdapter<Source, CallableReference> {
-    private TransformerFactory transformerFactory = TransformerFactory.newInstance();
-    private XMLInputFactory inputFactory = XMLInputFactory.newInstance();
+public class CallableReferenceXMLAdapter extends XmlAdapter<Element, CallableReference> {
 
     @Override
-    public CallableReference unmarshal(Source v) throws Exception {
-        StringWriter sw = new StringWriter();
-        StreamResult result = new StreamResult(sw);
-        transformerFactory.newTransformer().transform(v, result);
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(sw.toString()));
+    public CallableReference unmarshal(Element v) throws Exception {
+        Node2XMLStreamReader tf = new Node2XMLStreamReader();
+        XMLStreamReader reader = tf.transform(v, null);
         XMLStreamReader2CallableReference t2 = new XMLStreamReader2CallableReference();
         return t2.transform(reader, null);
     }
 
     @Override
-    public Source marshal(CallableReference v) throws Exception {
+    public Element marshal(CallableReference v) throws Exception {
         CallableReference2XMLStreamReader t = new CallableReference2XMLStreamReader();
         XMLStreamReader reader = t.transform(v, null);
-        XMLStreamReader2String t2 = new XMLStreamReader2String();
-        String xml = t2.transform(reader, null);
-        return new StreamSource(new StringReader(xml));
+        XMLStreamReader2Node t2 = new XMLStreamReader2Node();
+        return (Element) t2.transform(reader, null);
     }
 }
diff --git a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
index 841efa9398..3e8ada594c 100644
--- a/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
+++ b/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
@@ -26,8 +26,8 @@ import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;

 import javax.xml.stream.XMLStreamReader;

 

-import org.apache.tuscany.sca.core.context.CallableReferenceImpl;

-import org.apache.tuscany.sca.core.context.ServiceReferenceImpl;

+import org.apache.tuscany.sca.core.context.CallableReferenceExt;

+import org.apache.tuscany.sca.core.context.ServiceReferenceExt;

 import org.apache.tuscany.sca.databinding.PullTransformer;

 import org.apache.tuscany.sca.databinding.TransformationContext;

 import org.apache.tuscany.sca.databinding.TransformationException;

@@ -40,18 +40,19 @@ public class XMLStreamReader2CallableReference extends BaseTransformer<XMLStream
 

     private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";

     private static final String COMPOSITE = "composite";

-    public static final QName COMPOSITE_QNAME = new QName(SCA10_NS, COMPOSITE);

+    private static final QName COMPOSITE_QNAME = new QName(SCA10_NS, COMPOSITE);

     

     public CallableReference transform(XMLStreamReader source, TransformationContext context) {

         try {

             if (source != null) {

                 skipTopLevelElement(source);

-                Class refType = context.getTargetDataType().getPhysical();

+                Class refType =

+                    context == null ? CallableReferenceExt.class : context.getTargetDataType().getPhysical();

                 Class implType;

-                if (refType.isAssignableFrom(CallableReferenceImpl.class)) {

-                    implType = CallableReferenceImpl.class;

-                } else if (refType.isAssignableFrom(ServiceReferenceImpl.class)) {

-                    implType = ServiceReferenceImpl.class;

+                if (refType.isAssignableFrom(CallableReferenceExt.class)) {

+                    implType = CallableReferenceExt.class;

+                } else if (refType.isAssignableFrom(ServiceReferenceExt.class)) {

+                    implType = ServiceReferenceExt.class;

                 } else {   

                     throw new TransformationException("Unrecognized transformation target type");

                 }