Start cleaning up the databinding framework to remove obsolete code

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

12 files changed, 19 insertions, 89 deletions

diff --git a/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java b/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
index 547f9d9f4f..7c4ed35eb3 100644
--- a/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
+++ b/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
@@ -47,13 +47,6 @@ public interface DataBinding {
      * @return The name of the databinding
      */
     String getName();
-    
-    /**
-     * Get the aliases for the databinding
-     * 
-     * @return An array of aliases
-     */
-    String[] getAliases();
 
     /**
      * Introspect and populate information to a DataType model
@@ -90,12 +83,6 @@ public interface DataBinding {
     Object copy(Object object, DataType dataType, Operation operation);
     
     /**
-     * Get the type mapper for simple types
-     * @return The databinding-specific simple type mapper
-     */
-    SimpleTypeMapper getSimpleTypeMapper();
-    
-    /**
      * Get the XML type helper for Java types
      * @return The databinding-specific XML type helper class
      */
diff --git a/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java b/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
index b2da024a72..e0860ff395 100644
--- a/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
+++ b/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
@@ -71,17 +71,11 @@ public class DefaultDataBindingExtensionPoint implements DataBindingExtensionPoi
                 className = ((LazyDataBinding)dataBinding).dataBindingDeclaration.getClassName();
                 lazy = true;
             }
-            logger.fine("Adding databinding: " + className + ";type=" + dataBinding.getName() + ",lazy=" + lazy);
+            logger.fine("Adding databinding: " + className + ";name=" + dataBinding.getName() + ",lazy=" + lazy);
         }
         databindings.add(dataBinding);
         bindings.put(dataBinding.getName().toLowerCase(), dataBinding);
 
-        String[] aliases = dataBinding.getAliases();
-        if (aliases != null) {
-            for (String alias : aliases) {
-                bindings.put(alias.toLowerCase(), dataBinding);
-            }
-        }
     }
 
     public DataBinding removeDataBinding(String id) {
@@ -91,12 +85,6 @@ public class DefaultDataBindingExtensionPoint implements DataBindingExtensionPoi
         DataBinding dataBinding = bindings.remove(id.toLowerCase());
         if (dataBinding != null) {
             databindings.remove(dataBinding);
-            String[] aliases = dataBinding.getAliases();
-            if (aliases != null) {
-                for (String alias : aliases) {
-                    bindings.remove(alias.toLowerCase());
-                }
-            }
         }
         return dataBinding;
     }
@@ -119,11 +107,10 @@ public class DefaultDataBindingExtensionPoint implements DataBindingExtensionPoi
         // Load data bindings
         for (ServiceDeclaration dataBindingDeclaration : dataBindingDeclarations) {
             Map<String, String> attributes = dataBindingDeclaration.getAttributes();
-            String type = attributes.get("type");
             String name = attributes.get("name");
 
             // Create a data binding wrapper and register it
-            DataBinding dataBinding = new LazyDataBinding(type, name, dataBindingDeclaration);
+            DataBinding dataBinding = new LazyDataBinding(name, dataBindingDeclaration);
             addDataBinding(dataBinding);
         }
 
@@ -137,15 +124,11 @@ public class DefaultDataBindingExtensionPoint implements DataBindingExtensionPoi
     private static class LazyDataBinding implements DataBinding {
 
         private String name;
-        private String[] aliases;
         private ServiceDeclaration dataBindingDeclaration;
         private DataBinding dataBinding;
 
-        private LazyDataBinding(String type, String name, ServiceDeclaration dataBindingDeclaration) {
+        private LazyDataBinding(String type, ServiceDeclaration dataBindingDeclaration) {
             this.name = type;
-            if (name != null) {
-                this.aliases = new String[] {name};
-            }
             this.dataBindingDeclaration = dataBindingDeclaration;
         }
 
@@ -172,18 +155,10 @@ public class DefaultDataBindingExtensionPoint implements DataBindingExtensionPoi
             return getDataBinding().copy(object, dataType, operation);
         }
 
-        public String[] getAliases() {
-            return aliases;
-        }
-
         public String getName() {
             return name;
         }
 
-        public SimpleTypeMapper getSimpleTypeMapper() {
-            return getDataBinding().getSimpleTypeMapper();
-        }
-
         public XMLTypeHelper getXMLTypeHelper() {
             return getDataBinding().getXMLTypeHelper();
         }
diff --git a/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java b/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
index 640a43f55d..6f3456fdf0 100644
--- a/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
+++ b/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
@@ -29,10 +29,9 @@ import org.apache.tuscany.sca.databinding.impl.BaseDataBinding;
 public class ExternalizableDataBinding extends BaseDataBinding {

     

     public static final String NAME = java.io.Externalizable.class.getName();

-    public static final String[] ALIASES = new String[] {"externalizable"};

 

     public ExternalizableDataBinding() {

-        super(NAME, ALIASES, java.io.Externalizable.class);

+        super(NAME, java.io.Externalizable.class);

     }

 

     

diff --git a/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java b/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
index 4bbcf7ddef..04c2f0e0c9 100644
--- a/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
+++ b/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
@@ -38,7 +38,6 @@ public abstract class BaseDataBinding implements DataBinding {
     private Class<?> baseType;
 
     private String name;
-    private String[] aliases;
 
     /**
      * Create a databinding with the base java type whose name will be used as
@@ -48,7 +47,7 @@ public abstract class BaseDataBinding implements DataBinding {
      *            databinding, for example, org.w3c.dom.Node
      */
     protected BaseDataBinding(Class<?> baseType) {
-        this(baseType.getName(), null, baseType);
+        this(baseType.getName(), baseType);
     }
 
     /**
@@ -59,21 +58,8 @@ public abstract class BaseDataBinding implements DataBinding {
      *            databinding, for example, org.w3c.dom.Node
      */
     protected BaseDataBinding(String name, Class<?> baseType) {
-        this(name, null, baseType);
-    }
-
-    /**
-     * Create a databinding with the name and base java type
-     * 
-     * @param name The name of the databinding
-     * @param aliases The aliases of the databinding
-     * @param baseType The base java class or interface representing the
-     *            databinding, for example, org.w3c.dom.Node
-     */
-    protected BaseDataBinding(String name, String[] aliases, Class<?> baseType) {
         this.name = name;
         this.baseType = baseType;
-        this.aliases = aliases;
     }
 
     @SuppressWarnings("unchecked")
@@ -118,16 +104,8 @@ public abstract class BaseDataBinding implements DataBinding {
         return object;
     }
 
-    public SimpleTypeMapper getSimpleTypeMapper() {
-        return new SimpleTypeMapperImpl();
-    }
-
     public XMLTypeHelper getXMLTypeHelper() {
         return null;
     }
 
-    public String[] getAliases() {
-        return aliases;
-    }
-
 }
diff --git a/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java b/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
index 4a918488c5..70efd6a5c5 100644
--- a/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
+++ b/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
@@ -40,7 +40,7 @@ public abstract class GroupDataBinding extends BaseDataBinding {
     protected Class[] markerTypes;
 
     public GroupDataBinding(Class[] types) {
-        super(NAME, null, GroupDataBinding.class);
+        super(NAME, GroupDataBinding.class);
         this.markerTypes = types;
     }
 
diff --git a/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java b/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
index 11c82e062c..61a2189c72 100644
--- a/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
+++ b/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
@@ -58,7 +58,7 @@ public class SimpleJavaDataBinding extends BaseDataBinding {
         }
         // HACK: [rfeng] By pass the one know to XMLString
         String db = type.getDataBinding();
-        if (db != null && (XMLStringDataBinding.NAME.equals(db) || XMLStringDataBinding.ALIASES[0].equals(db))) {
+        if (db != null && (XMLStringDataBinding.NAME.equals(db))) {
             return false;
         }
         if (SimpleTypeMapperImpl.JAVA2XML.keySet().contains(cls)) {
diff --git a/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java b/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
index 92058d769f..e029604722 100644
--- a/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
+++ b/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
@@ -35,13 +35,12 @@ import org.w3c.dom.Node;
  */
 public class DOMDataBinding extends BaseDataBinding {
     public static final String NAME = Node.class.getName();
-    public static final String[] ALIASES = new String[] {"dom"};
 
     public static final String ROOT_NAMESPACE = "http://tuscany.apache.org/xmlns/sca/databinding/dom/1.0";
     public static final QName ROOT_ELEMENT = new QName(ROOT_NAMESPACE, "root");
 
     public DOMDataBinding() {
-        super(NAME, ALIASES, Node.class);
+        super(NAME, Node.class);
     }
 
     @Override
diff --git a/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java b/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
index 52a1d02631..ed57992910 100644
--- a/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
+++ b/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
@@ -34,10 +34,9 @@ import org.apache.tuscany.sca.interfacedef.util.XMLType;
  */
 public class StAXDataBinding extends BaseDataBinding {
     public static final String NAME = XMLStreamReader.class.getName();
-    public static final String[] ALIASES = new String[] {"stax"};
 
     public StAXDataBinding() {
-        super(NAME, ALIASES, XMLStreamReader.class);
+        super(NAME, XMLStreamReader.class);
     }
 
     @Override
diff --git a/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java b/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
index cd33e64176..a7088eada3 100644
--- a/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
+++ b/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
@@ -50,7 +50,7 @@ public class XMLDocumentStreamReader implements XMLStreamReader {
 
     private XMLStreamReader realReader;
     private boolean fragment;
-    private int level = 0;
+    private int level = 1;
 
     private int state = STATE_INIT;
 
diff --git a/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java b/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
index 36cf5e9c9b..22b173dce5 100644
--- a/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
+++ b/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
@@ -32,15 +32,14 @@ import org.apache.tuscany.sca.interfacedef.util.XMLType;
  */
 public class XMLStringDataBinding extends BaseDataBinding {
     public static final String NAME = String.class.getName();
-    public static final String[] ALIASES = new String[] {"xml.string"};
 
     public XMLStringDataBinding() {
-        super(NAME, ALIASES, String.class);
+        super(NAME, String.class);
     }
 
     @Override
     public boolean introspect(DataType type, Operation operation) {
-        if (type.getPhysical() == String.class && NAME.equals(type.getDataBinding()) || ALIASES[0].equals(type.getDataBinding())) {
+        if (type.getPhysical() == String.class && NAME.equals(type.getDataBinding())) {
             type.setDataBinding(NAME);
             type.setLogical(XMLType.UNKNOWN);
             return true;
diff --git a/java/sca/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/java/sca/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 10e6082b34..afb00c91ee 100644
--- a/java/sca/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/java/sca/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
@@ -16,10 +16,10 @@
 # under the License.

 

 # implementation classes for the databindings

-org.apache.tuscany.sca.databinding.xml.DOMDataBinding;type=org.w3c.dom.Node,name=dom

-org.apache.tuscany.sca.databinding.xml.XMLStringDataBinding;type=java.lang.String,name=xml.string

-org.apache.tuscany.sca.databinding.xml.XMLGroupDataBinding;type=databinding:group

-org.apache.tuscany.sca.databinding.javabeans.JavaBeansDataBinding;type=java:complexType

-org.apache.tuscany.sca.databinding.javabeans.SimpleJavaDataBinding;type=java:simpleType

-org.apache.tuscany.sca.databinding.javabeans.JavaExceptionDataBinding;type=java:exception

-org.apache.tuscany.sca.databinding.externalizable.ExternalizableDataBinding;type=java.io.Externalizable,name=externalizable

+org.apache.tuscany.sca.databinding.xml.DOMDataBinding;name=org.w3c.dom.Node

+org.apache.tuscany.sca.databinding.xml.XMLStringDataBinding;name=java.lang.String

+org.apache.tuscany.sca.databinding.xml.XMLGroupDataBinding;name=databinding:group

+org.apache.tuscany.sca.databinding.javabeans.JavaBeansDataBinding;name=java:complexType

+org.apache.tuscany.sca.databinding.javabeans.SimpleJavaDataBinding;name=java:simpleType

+org.apache.tuscany.sca.databinding.javabeans.JavaExceptionDataBinding;name=java:exception

+org.apache.tuscany.sca.databinding.externalizable.ExternalizableDataBinding;name=java.io.Externalizable

diff --git a/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java b/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
index db210683dd..15b9242340 100644
--- a/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
+++ b/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
@@ -54,7 +54,6 @@ public class DataBindingRegistryImplTestCase extends TestCase {
     @SuppressWarnings("unchecked")
     public void testRegistry() {
         DataBinding db1 = createMock(DataBinding.class);
-        expect(db1.getAliases()).andReturn(new String[] {"db1"}).anyTimes();
         expect(db1.getName()).andReturn(ContentHandler.class.getName()).anyTimes();
         DataType<Class> dataType1 = new DataTypeImpl<Class>(ContentHandler.class, ContentHandler.class);
         expect(db1.introspect(dataType1, null)).andReturn(true);
@@ -65,7 +64,6 @@ public class DataBindingRegistryImplTestCase extends TestCase {
         registry.addDataBinding(db1);
 
         DataBinding db2 = createMock(DataBinding.class);
-        expect(db2.getAliases()).andReturn(new String[] {"db2"}).anyTimes();
         expect(db2.getName()).andReturn(XMLStreamReader.class.getName()).anyTimes();
         DataType<Class> dataType2 = new DataTypeImpl<Class>(XMLStreamReader.class, XMLStreamReader.class);
         expect(db2.introspect(dataType2, null)).andReturn(true);
@@ -80,10 +78,6 @@ public class DataBindingRegistryImplTestCase extends TestCase {
         DataBinding db3 = registry.getDataBinding(name);
         assertSame(db1, db3);
 
-        // Look up by alias
-        DataBinding db5 = registry.getDataBinding("db1");
-        assertSame(db1, db5);
-        
         DataType dt = new DataTypeImpl<Class>(ContentHandler.class, null);
         registry.introspectType(dt, null);
         assertEquals(dataType1.getLogical(), ContentHandler.class);