From 45c51c44a7530b18f7f0e087eec82459fcaf527e Mon Sep 17 00:00:00 2001 From: rfeng Date: Wed, 27 Jan 2010 17:01:01 +0000 Subject: 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 --- .../implementation-java/META-INF/MANIFEST.MF | 4 -- .../trunk/modules/implementation-java/pom.xml | 8 +--- .../introspect/impl/AbstractPropertyProcessor.java | 46 ++++------------------ ...implementation.java.introspect.JavaClassVisitor | 28 ++++++------- 4 files changed, 22 insertions(+), 64 deletions(-) (limited to 'sca-java-2.x/trunk/modules/implementation-java') 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 @@ tuscany-interface-java 2.0-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-databinding - 2.0-SNAPSHOT - - + org.apache.tuscany.sca tuscany-sca-api 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 extends BaseJavaClassVisitor { private final Class annotationClass; - private Mediator mediator; protected AbstractPropertyProcessor(ExtensionPointRegistry registry, Class 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 dt = - new DataTypeImpl(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 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 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 -- cgit v1.2.3