Refactor the databinding introspection to tuscany-implementation-java-runtime to avoid deployment time dependency

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

7 files changed, 126 insertions, 68 deletions

diff --git a/sca-java-2.x/trunk/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java b/sca-java-2.x/trunk/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java
index d821d62f28..6be72d79b8 100644
--- a/sca-java-2.x/trunk/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java
+++ b/sca-java-2.x/trunk/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java
@@ -44,16 +44,13 @@ import org.junit.Test;
  * tuscany-common-java-2.0-SNAPSHOT.jar

  * tuscany-common-xml-2.0-SNAPSHOT.jar

  * tuscany-contribution-2.0-SNAPSHOT.jar

- * tuscany-databinding-2.0-SNAPSHOT.jar

  * tuscany-deployment-2.0-SNAPSHOT.jar

  * tuscany-extensibility-2.0-SNAPSHOT.jar

  * tuscany-implementation-java-2.0-SNAPSHOT.jar

  * tuscany-interface-java-2.0-SNAPSHOT.jar

  * tuscany-monitor-2.0-SNAPSHOT.jar

  * tuscany-sca-api-2.0-SNAPSHOT.jar

- * tuscany-xsd-2.0-SNAPSHOT.jar

  * wstx-asl-3.2.4.jar

- * XmlSchema-1.4.2.jar

  * 

  * TODO: WS binding drags in all runtime

  */

@@ -66,6 +63,6 @@ public class ValidateDependenciesTestCase {
         Assert.assertTrue(dependenciesDir.exists());

         

         File[] dependencyFiles = dependenciesDir.listFiles();

-        Assert.assertEquals(23, dependencyFiles.length);

+        Assert.assertEquals(20, dependencyFiles.length);

     }

 }

diff --git a/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/databinding/PropertyDataTypeProcessor.java b/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/databinding/PropertyDataTypeProcessor.java
new file mode 100644
index 0000000000..99a8b6d3d7
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/databinding/PropertyDataTypeProcessor.java
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.implementation.java.databinding;
+
+import org.apache.tuscany.sca.assembly.Property;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.UtilityExtensionPoint;
+import org.apache.tuscany.sca.databinding.Mediator;
+import org.apache.tuscany.sca.implementation.java.IntrospectionException;
+import org.apache.tuscany.sca.implementation.java.JavaElementImpl;
+import org.apache.tuscany.sca.implementation.java.JavaImplementation;
+import org.apache.tuscany.sca.implementation.java.introspect.BaseJavaClassVisitor;
+import org.apache.tuscany.sca.implementation.java.introspect.JavaIntrospectionHelper;
+import org.apache.tuscany.sca.interfacedef.DataType;
+import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
+import org.apache.tuscany.sca.interfacedef.util.JavaXMLMapper;
+import org.apache.tuscany.sca.interfacedef.util.XMLType;
+
+/**
+ * 
+ */
+public class PropertyDataTypeProcessor extends BaseJavaClassVisitor {
+    private Mediator mediator;
+
+    /**
+     * @param registry
+     */
+    public PropertyDataTypeProcessor(ExtensionPointRegistry registry) {
+        super(registry);
+        UtilityExtensionPoint utilityExtensionPoint = registry.getExtensionPoint(UtilityExtensionPoint.class);
+        this.mediator = utilityExtensionPoint.getUtility(Mediator.class);
+    }
+
+    /**
+     * Introspect the property 
+     * @param javaElement
+     * @return
+     */
+    private DataType<?> introspect(Property property, JavaElementImpl javaElement) {
+        XMLType xmlType = new XMLType(property.getXSDElement(), property.getXSDType());
+        DataType<XMLType> dt =
+            new DataTypeImpl<XMLType>(null, javaElement.getType(), javaElement.getGenericType(), xmlType);
+        mediator.getDataBindings().introspectType(dt, null);
+        return dt;
+    }
+
+    @Override
+    public <T> void visitEnd(Class<T> clazz, JavaImplementation type) throws IntrospectionException {
+        for (Property property : type.getProperties()) {
+            String name = property.getName();
+            JavaElementImpl element = type.getPropertyMembers().get(name);
+            DataType dt = introspect(property, element);
+            property.setDataType(dt);
+            if (dt.getLogical() instanceof XMLType) {
+                XMLType xmlType = (XMLType)dt.getLogical();
+                property.setXSDType(xmlType.getTypeName());
+                property.setXSDElement(xmlType.getElementName());
+            } else {
+                Class<?> baseType = JavaIntrospectionHelper.getBaseType(element.getType(), element.getGenericType());
+                property.setXSDType(JavaXMLMapper.getXMLType(baseType));
+            }
+        }
+        super.visitEnd(clazz, type);
+    }
+
+}
diff --git a/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor b/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor
new file mode 100644
index 0000000000..e649b68466
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation 

+# or more contributor license agreements.  See the NOTICE file

+# distributed with this work for additional information

+# regarding copyright ownership.  The ASF licenses this file

+# to you under the Apache License, Version 2.0 

+# "License"); you may not use this file except in compliance

+# with the License.  You may obtain a copy of the License at

+# 

+#   http://www.apache.org/licenses/LICENSE-2.0

+# 

+# Unless required by applicable law or agreed to in writing,

+# software distributed under the License is distributed on an

+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+# KIND, either express or implied.  See the License for the

+# specific language governing permissions and limitations

+# under the License.

+# 

+# NOTE: The ranking attribute is important for the JavaClassVistors 

+# Some visitors need to be called after the others 

+org.apache.tuscany.sca.implementation.java.databinding.PropertyDataTypeProcessor;ranking=750

diff --git a/sca-java-2.x/trunk/modules/implementation-java/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/implementation-java/META-INF/MANIFEST.MF
index 2e78c254e4..44f27a2c5f 100644
--- a/sca-java-2.x/trunk/modules/implementation-java/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/modules/implementation-java/META-INF/MANIFEST.MF
@@ -27,15 +27,11 @@ Import-Package: javax.jws,
  org.apache.tuscany.sca.contribution.processor;version="2.0.0",

  org.apache.tuscany.sca.contribution.resolver;version="2.0.0",

  org.apache.tuscany.sca.core;version="2.0.0",

- org.apache.tuscany.sca.databinding;version="2.0.0",

- org.apache.tuscany.sca.databinding.impl;version="2.0.0",

- org.apache.tuscany.sca.databinding.util;version="2.0.0",

  org.apache.tuscany.sca.definitions;version="2.0.0";resolution:=optional,

  org.apache.tuscany.sca.extensibility;version="2.0.0",

  org.apache.tuscany.sca.implementation.java;version="2.0.0",

  org.apache.tuscany.sca.implementation.java.introspect;version="2.0.0",

  org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.interfacedef.impl;version="2.0.0",

  org.apache.tuscany.sca.interfacedef.java;version="2.0.0",

  org.apache.tuscany.sca.interfacedef.java.impl;version="2.0.0";resolution:=optional,

  org.apache.tuscany.sca.interfacedef.util;version="2.0.0",

diff --git a/sca-java-2.x/trunk/modules/implementation-java/pom.xml b/sca-java-2.x/trunk/modules/implementation-java/pom.xml
index f6aaf07ca0..5ea97da3b4 100644
--- a/sca-java-2.x/trunk/modules/implementation-java/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-java/pom.xml
@@ -40,13 +40,7 @@
             <artifactId>tuscany-interface-java</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>        
-
+ 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
diff --git a/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java b/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
index 13c677ac1d..635375a4ed 100644
--- a/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
+++ b/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
@@ -29,18 +29,12 @@ import java.util.Map;
 
 import org.apache.tuscany.sca.assembly.Property;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.databinding.Mediator;
 import org.apache.tuscany.sca.implementation.java.IntrospectionException;
 import org.apache.tuscany.sca.implementation.java.JavaElementImpl;
 import org.apache.tuscany.sca.implementation.java.JavaImplementation;
 import org.apache.tuscany.sca.implementation.java.JavaParameterImpl;
 import org.apache.tuscany.sca.implementation.java.introspect.BaseJavaClassVisitor;
 import org.apache.tuscany.sca.implementation.java.introspect.JavaIntrospectionHelper;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
-import org.apache.tuscany.sca.interfacedef.util.JavaXMLMapper;
-import org.apache.tuscany.sca.interfacedef.util.XMLType;
 
 /**
  * Base class for ImplementationProcessors that handle annotations that add
@@ -50,26 +44,10 @@ import org.apache.tuscany.sca.interfacedef.util.XMLType;
  */
 public abstract class AbstractPropertyProcessor<A extends Annotation> extends BaseJavaClassVisitor {
     private final Class<A> annotationClass;
-    private Mediator mediator;
 
     protected AbstractPropertyProcessor(ExtensionPointRegistry registry, Class<A> annotationClass) {
         super(registry);
         this.annotationClass = annotationClass;
-        UtilityExtensionPoint utilityExtensionPoint = registry.getExtensionPoint(UtilityExtensionPoint.class);
-        this.mediator = utilityExtensionPoint.getUtility(Mediator.class);
-    }
-    
-    /**
-     * Introspect the property 
-     * @param javaElement
-     * @return
-     */
-    private DataType<?> introspect(Property property, JavaElementImpl javaElement) {
-        XMLType xmlType = new XMLType(property.getXSDElement(), property.getXSDType());
-        DataType<XMLType> dt =
-            new DataTypeImpl<XMLType>(null, javaElement.getType(), javaElement.getGenericType(), xmlType);
-        mediator.getDataBindings().introspectType(dt, null);
-        return dt;
     }
     
     private static boolean removeProperty(JavaElementImpl prop, JavaImplementation type) {
@@ -219,28 +197,12 @@ public abstract class AbstractPropertyProcessor<A extends Annotation> extends Ba
             properties.put(name, parameter);
         }
     }
-
-    protected abstract String getName(A annotation);
-    protected abstract boolean getRequired(A annotation);
-
-    protected abstract void initProperty(Property property, A annotation) throws IntrospectionException;
-
+    
     protected Property createProperty(String name, JavaElementImpl element) throws IntrospectionException {
 
         Property property = assemblyFactory.createProperty();
         property.setName(name);
         
-        DataType dt = introspect(property, element);
-        property.setDataType(dt);
-        if(dt.getLogical() instanceof XMLType) {
-            XMLType xmlType = (XMLType) dt.getLogical();
-            property.setXSDType(xmlType.getTypeName());
-            property.setXSDElement(xmlType.getElementName());
-        } else {
-            Class<?> baseType = JavaIntrospectionHelper.getBaseType(element.getType(), element.getGenericType());
-            property.setXSDType(JavaXMLMapper.getXMLType(baseType));
-        }
-
         Class<?> javaType = element.getType();
         if (javaType.isArray() || Collection.class.isAssignableFrom(javaType)) {
             property.setMany(true);
@@ -249,4 +211,10 @@ public abstract class AbstractPropertyProcessor<A extends Annotation> extends Ba
 
     }
 
+    protected abstract String getName(A annotation);
+    protected abstract boolean getRequired(A annotation);
+
+    protected abstract void initProperty(Property property, A annotation) throws IntrospectionException;
+
+
 }
diff --git a/sca-java-2.x/trunk/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor b/sca-java-2.x/trunk/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor
index 2760b94e39..676dd272e1 100644
--- a/sca-java-2.x/trunk/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor
+++ b/sca-java-2.x/trunk/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor
@@ -17,17 +17,17 @@
 # 

 # NOTE: The ranking attribute is important for the JavaClassVistors 

 # Some visitors need to be called after the others 

-org.apache.tuscany.sca.implementation.java.introspect.impl.ConstructorProcessor;ranking=200

-org.apache.tuscany.sca.implementation.java.introspect.impl.AllowsPassByReferenceProcessor;ranking=190

-org.apache.tuscany.sca.implementation.java.introspect.impl.ComponentNameProcessor;ranking=180

-org.apache.tuscany.sca.implementation.java.introspect.impl.ContextProcessor;ranking=170

-org.apache.tuscany.sca.implementation.java.introspect.impl.DestroyProcessor;ranking=160

-org.apache.tuscany.sca.implementation.java.introspect.impl.EagerInitProcessor;ranking=150

-org.apache.tuscany.sca.implementation.java.introspect.impl.InitProcessor;ranking=140

-org.apache.tuscany.sca.implementation.java.introspect.impl.PropertyProcessor;ranking=130

-org.apache.tuscany.sca.implementation.java.introspect.impl.ReferenceProcessor;ranking=120

-org.apache.tuscany.sca.implementation.java.introspect.impl.ResourceProcessor;ranking=110

-org.apache.tuscany.sca.implementation.java.introspect.impl.ScopeProcessor;ranking=100

-org.apache.tuscany.sca.implementation.java.introspect.impl.ServiceProcessor;ranking=90

-org.apache.tuscany.sca.implementation.java.introspect.impl.HeuristicPojoProcessor;ranking=80

-org.apache.tuscany.sca.implementation.java.introspect.impl.PolicyProcessor;ranking=70

+org.apache.tuscany.sca.implementation.java.introspect.impl.ConstructorProcessor;ranking=2000

+org.apache.tuscany.sca.implementation.java.introspect.impl.AllowsPassByReferenceProcessor;ranking=1900

+org.apache.tuscany.sca.implementation.java.introspect.impl.ComponentNameProcessor;ranking=1800

+org.apache.tuscany.sca.implementation.java.introspect.impl.ContextProcessor;ranking=1700

+org.apache.tuscany.sca.implementation.java.introspect.impl.DestroyProcessor;ranking=1600

+org.apache.tuscany.sca.implementation.java.introspect.impl.EagerInitProcessor;ranking=1500

+org.apache.tuscany.sca.implementation.java.introspect.impl.InitProcessor;ranking=1400

+org.apache.tuscany.sca.implementation.java.introspect.impl.PropertyProcessor;ranking=1300

+org.apache.tuscany.sca.implementation.java.introspect.impl.ReferenceProcessor;ranking=1200

+org.apache.tuscany.sca.implementation.java.introspect.impl.ResourceProcessor;ranking=1100

+org.apache.tuscany.sca.implementation.java.introspect.impl.ScopeProcessor;ranking=1000

+org.apache.tuscany.sca.implementation.java.introspect.impl.ServiceProcessor;ranking=900

+org.apache.tuscany.sca.implementation.java.introspect.impl.HeuristicPojoProcessor;ranking=800

+org.apache.tuscany.sca.implementation.java.introspect.impl.PolicyProcessor;ranking=700