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 2006/04/25 21:59:10 UTC
svn commit: r396966 - in /incubator/tuscany/java/sca:
containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/
containers/container.java/src/main/java/org/apache/tuscany/container/java/config/
containers/container.js/src/main/...
Author: jmarino
Date: Tue Apr 25 12:59:03 2006
New Revision: 396966
URL: http://svn.apache.org/viewcvs?rev=396966&view=rev
Log:
fix for TUSCANY-218 and added support class for context extensions
Added:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ContextFactoryBuilderSupport.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/extension/
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/extension/GenericReflectionTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/extension/WireBuilderSupportTestCase.java
Modified:
incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java
incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/config/JavaContextFactory.java
incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/config/JavaScriptContextFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/EntryPointContextFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ExternalServiceContextFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/extension/WireBuilderSupport.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemContextFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemEntryPointContextFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceContextFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java
Modified: incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java?rev=396966&r1=396965&r2=396966&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/builder/JavaContextFactoryBuilder.java Tue Apr 25 12:59:03 2006
@@ -1,42 +1,26 @@
package org.apache.tuscany.container.java.builder;
-import commonj.sdo.DataObject;
import org.apache.tuscany.container.java.assembly.JavaImplementation;
import org.apache.tuscany.container.java.config.JavaContextFactory;
import org.apache.tuscany.core.builder.BuilderConfigException;
import org.apache.tuscany.core.builder.BuilderException;
-import org.apache.tuscany.core.builder.ContextFactoryBuilder;
-import org.apache.tuscany.core.builder.ContextFactoryBuilderRegistry;
-import org.apache.tuscany.core.builder.NoAccessorException;
-import org.apache.tuscany.core.builder.ObjectFactory;
-import org.apache.tuscany.core.builder.impl.ArrayMultiplicityObjectFactory;
-import org.apache.tuscany.core.builder.impl.ListMultiplicityObjectFactory;
-import org.apache.tuscany.core.builder.impl.ProxyObjectFactory;
+import org.apache.tuscany.core.builder.ContextFactory;
import org.apache.tuscany.core.config.JavaIntrospectionHelper;
+import org.apache.tuscany.core.extension.ContextFactoryBuilderSupport;
import org.apache.tuscany.core.injection.ContextObjectFactory;
import org.apache.tuscany.core.injection.EventInvoker;
import org.apache.tuscany.core.injection.FieldInjector;
import org.apache.tuscany.core.injection.Injector;
import org.apache.tuscany.core.injection.MethodEventInvoker;
import org.apache.tuscany.core.injection.MethodInjector;
-import org.apache.tuscany.databinding.sdo.SDOObjectFactory;
import org.apache.tuscany.core.injection.SingletonObjectFactory;
-import org.apache.tuscany.core.system.annotation.Autowire;
-import org.apache.tuscany.core.wire.SourceWireFactory;
-import org.apache.tuscany.core.wire.TargetWireFactory;
import org.apache.tuscany.core.wire.service.WireFactoryService;
-import org.apache.tuscany.model.assembly.AssemblyObject;
-import org.apache.tuscany.model.assembly.AtomicComponent;
-import org.apache.tuscany.model.assembly.ConfiguredProperty;
-import org.apache.tuscany.model.assembly.ConfiguredReference;
-import org.apache.tuscany.model.assembly.ConfiguredService;
-import org.apache.tuscany.model.assembly.Multiplicity;
import org.apache.tuscany.model.assembly.Scope;
-import org.apache.tuscany.model.assembly.Service;
import org.osoa.sca.annotations.ComponentName;
import org.osoa.sca.annotations.Context;
import org.osoa.sca.annotations.Destroy;
import org.osoa.sca.annotations.Init;
+import org.apache.tuscany.databinding.sdo.SDOObjectFactory;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -52,268 +36,94 @@
* @see org.apache.tuscany.core.builder.ContextFactory
*/
@org.osoa.sca.annotations.Scope("MODULE")
-public class JavaContextFactoryBuilder implements ContextFactoryBuilder {
-
- private ContextFactoryBuilderRegistry builderRegistry;
-
- private WireFactoryService wireFactoryService;
+public class JavaContextFactoryBuilder extends ContextFactoryBuilderSupport<JavaImplementation> {
/**
- * Constructs a new instance
- *
- * @param wireFactoryService the system service responsible for creating wire factories
+ * Default constructor
*/
- public JavaContextFactoryBuilder(WireFactoryService wireFactoryService) {
- this.wireFactoryService = wireFactoryService;
- }
-
public JavaContextFactoryBuilder() {
- }
-
- @Init(eager = true)
- public void init() {
- builderRegistry.register(this);
- }
-
- @Autowire
- public void setBuilderRegistry(ContextFactoryBuilderRegistry builderRegistry) {
- this.builderRegistry = builderRegistry;
+ super();
}
/**
- * Sets the system service used to construct wire factories
- */
- @Autowire
- public void setWireFactoryService(WireFactoryService wireFactoryService) {
- this.wireFactoryService = wireFactoryService;
- }
-
- public void build(AssemblyObject modelObject) throws BuilderException {
- if (!(modelObject instanceof AtomicComponent)) {
- return;
- }
- AtomicComponent component = (AtomicComponent) modelObject;
- if (component.getImplementation() instanceof JavaImplementation) {
- JavaImplementation javaImpl = (JavaImplementation) component.getImplementation();
- List<Service> services = component.getImplementation().getComponentInfo().getServices();
- Scope previous = null;
- Scope scope = Scope.INSTANCE;
- for (Service service : services) {
- // calculate and validate the scope of the component; ensure that all service scopes are the same unless stateless
- Scope current = service.getServiceContract().getScope();
- if (previous != null && current != null && current != previous
- && (current != Scope.INSTANCE && previous != Scope.INSTANCE)) {
- BuilderException e = new BuilderConfigException("Incompatible scopes specified for services on component");
- e.setIdentifier(component.getName());
- throw e;
- }
- if (scope != null && current != Scope.INSTANCE) {
- scope = current;
- }
- }
- Class implClass = null;
- Set<Field> fields;
- Set<Method> methods;
- JavaContextFactory contextFactory;
- try {
- implClass = javaImpl.getImplementationClass();
- fields = JavaIntrospectionHelper.getAllFields(implClass);
- methods = JavaIntrospectionHelper.getAllUniqueMethods(implClass);
- String name = component.getName();
- contextFactory = new JavaContextFactory(name, JavaIntrospectionHelper
- .getDefaultConstructor(implClass), scope);
-
- List<Injector> injectors = new ArrayList<Injector>();
-
- EventInvoker<Object> initInvoker = null;
- boolean eagerInit = false;
- EventInvoker<Object> destroyInvoker = null;
- ContextObjectFactory contextObjectFactory = new ContextObjectFactory(contextFactory);
- for (Field field : fields) {
- ComponentName compName = field.getAnnotation(ComponentName.class);
- if (compName != null) {
- Injector injector = new FieldInjector(field, new SingletonObjectFactory<Object>(name));
- injectors.add(injector);
- }
- Context context = field.getAnnotation(Context.class);
- if (context != null) {
- Injector injector = new FieldInjector(field, contextObjectFactory);
- injectors.add(injector);
- }
- }
- for (Method method : methods) {
- Init init = method.getAnnotation(Init.class);
- if (init != null && initInvoker == null) {
- initInvoker = new MethodEventInvoker<Object>(method);
- eagerInit = init.eager();
- continue;
- }
- // TODO spec - should we allow the same method to have @init and @destroy?
- Destroy destroy = method.getAnnotation(Destroy.class);
- if (destroy != null && destroyInvoker == null) {
- destroyInvoker = new MethodEventInvoker<Object>(method);
- continue;
- }
- ComponentName compName = method.getAnnotation(ComponentName.class);
- if (compName != null) {
- Injector injector = new MethodInjector(method, new SingletonObjectFactory<Object>(name));
- injectors.add(injector);
- }
- Context context = method.getAnnotation(Context.class);
- if (context != null) {
- Injector injector = new MethodInjector(method, contextObjectFactory);
- injectors.add(injector);
- }
- }
- // handle properties
- List<ConfiguredProperty> configuredProperties = component.getConfiguredProperties();
- if (configuredProperties != null) {
- for (ConfiguredProperty property : configuredProperties) {
- Injector injector = createPropertyInjector(property, fields, methods);
- injectors.add(injector);
- }
- }
- // create target-side wire chains for each service offered by the implementation
- for (ConfiguredService configuredService : component.getConfiguredServices()) {
- Service service = configuredService.getPort();
- TargetWireFactory wireFactory = wireFactoryService.createTargetFactory(configuredService);
- contextFactory.addTargetWireFactory(service.getName(), wireFactory);
- }
-
- // create injectors for references
- List<ConfiguredReference> configuredReferences = component.getConfiguredReferences();
- if (configuredReferences != null) {
- for (ConfiguredReference reference : configuredReferences) {
- Injector injector = createReferenceInjector(contextFactory, reference, fields, methods);
- injectors.add(injector);
- }
- }
- contextFactory.setSetters(injectors);
- contextFactory.setEagerInit(eagerInit);
- contextFactory.setInitInvoker(initInvoker);
- contextFactory.setDestroyInvoker(destroyInvoker);
- component.setContextFactory(contextFactory);
- } catch (BuilderException e) {
- e.addContextName(component.getName());
- throw e;
- } catch (NoSuchMethodException e) {
- BuilderConfigException ce = new BuilderConfigException("Class does not have a no-arg constructor", e);
- ce.setIdentifier(implClass.getName());
- ce.addContextName(component.getName());
- throw ce;
- }
- }
- }
-
- /**
- * Creates an <code>Injector</code> for component properties
+ * Constructs a new instance
+ *
+ * @param wireFactoryService the system service responsible for creating wire factories
*/
- private Injector createPropertyInjector(ConfiguredProperty property, Set<Field> fields, Set<Method> methods)
- throws NoAccessorException {
- Object value = property.getValue();
- String propName = property.getProperty().getName();
- Class type = value.getClass();
-
- // There is no efficient way to do this
- Method method = null;
- Field field = JavaIntrospectionHelper.findClosestMatchingField(propName, type, fields);
- if (field == null) {
- method = JavaIntrospectionHelper.findClosestMatchingMethod(propName, new Class[]{type}, methods);
- if (method == null) {
- throw new NoAccessorException(propName);
- }
- }
- Injector injector = null;
- if (value instanceof DataObject) {
- if (field != null) {
- injector = new FieldInjector(field, new SDOObjectFactory((DataObject) value));
- } else {
- injector = new MethodInjector(method, new SDOObjectFactory((DataObject) value));
- }
- } else if (JavaIntrospectionHelper.isImmutable(type)) {
- if (field != null) {
- injector = new FieldInjector(field, new SingletonObjectFactory<Object>(value));
- } else {
- injector = new MethodInjector(method, new SingletonObjectFactory<Object>(value));
- }
- }
- return injector;
-
+ public JavaContextFactoryBuilder(WireFactoryService wireFactoryService) {
+ super(wireFactoryService);
}
- /**
- * Creates proxy factories that represent target(s) of a reference and an <code>Injector</code> responsible for injecting them
- * into the reference
- */
- private Injector createReferenceInjector(JavaContextFactory config, ConfiguredReference reference,
- Set<Field> fields, Set<Method> methods) {
-
- String refName = reference.getPort().getName();
- Class refClass = reference.getPort().getServiceContract().getInterface();
- // iterate through the targets
- List<ObjectFactory> objectFactories = new ArrayList<ObjectFactory>();
- List<SourceWireFactory> wirefactories = wireFactoryService.createSourceFactory(reference);
- for (SourceWireFactory wireFactory : wirefactories) {
- config.addSourceWireFactory(refName, wireFactory);
- objectFactories.add(new ProxyObjectFactory(wireFactory));
+ @SuppressWarnings("unchecked")
+ protected ContextFactory createContextFactory(String name, JavaImplementation javaImpl, Scope scope) {
+ Class implClass = null;
+ Set<Field> fields;
+ Set<Method> methods;
+ JavaContextFactory contextFactory;
+ try {
+ implClass = javaImpl.getImplementationClass();
+ // TODO refactor fields and methods lookup since done in factory as well or elsewhere
+ fields = JavaIntrospectionHelper.getAllFields(implClass);
+ methods = JavaIntrospectionHelper.getAllUniqueMethods(implClass);
+ contextFactory = new JavaContextFactory(name, JavaIntrospectionHelper
+ .getDefaultConstructor(implClass), scope);
+
+ List<Injector> injectors = new ArrayList<Injector>();
+
+ EventInvoker<Object> initInvoker = null;
+ boolean eagerInit = false;
+ EventInvoker<Object> destroyInvoker = null;
+ ContextObjectFactory contextObjectFactory = new ContextObjectFactory(contextFactory);
+ for (Field field : fields) {
+ ComponentName compName = field.getAnnotation(ComponentName.class);
+ if (compName != null) {
+ Injector injector = new FieldInjector(field, new SingletonObjectFactory<Object>(name));
+ injectors.add(injector);
+ }
+ Context context = field.getAnnotation(Context.class);
+ if (context != null) {
+ Injector injector = new FieldInjector(field, contextObjectFactory);
+ injectors.add(injector);
+ }
+ }
+ for (Method method : methods) {
+ Init init = method.getAnnotation(Init.class);
+ if (init != null && initInvoker == null) {
+ initInvoker = new MethodEventInvoker<Object>(method);
+ eagerInit = init.eager();
+ continue;
+ }
+ // TODO spec - should we allow the same method to have @init and @destroy?
+ Destroy destroy = method.getAnnotation(Destroy.class);
+ if (destroy != null && destroyInvoker == null) {
+ destroyInvoker = new MethodEventInvoker<Object>(method);
+ continue;
+ }
+ ComponentName compName = method.getAnnotation(ComponentName.class);
+ if (compName != null) {
+ Injector injector = new MethodInjector(method, new SingletonObjectFactory<Object>(name));
+ injectors.add(injector);
+ }
+ Context context = method.getAnnotation(Context.class);
+ if (context != null) {
+ Injector injector = new MethodInjector(method, contextObjectFactory);
+ injectors.add(injector);
+ }
+ }
+ contextFactory.setSetters(injectors);
+ contextFactory.setEagerInit(eagerInit);
+ contextFactory.setInitInvoker(initInvoker);
+ contextFactory.setDestroyInvoker(destroyInvoker);
+ return contextFactory;
+ } catch (BuilderException e) {
+ e.addContextName(name);
+ throw e;
+ } catch (NoSuchMethodException e) {
+ BuilderConfigException ce = new BuilderConfigException("Class does not have a no-arg constructor", e);
+ ce.setIdentifier(implClass.getName());
+ ce.addContextName(name);
+ throw ce;
}
- boolean multiplicity = reference.getPort().getMultiplicity() == Multiplicity.ONE_N
- || reference.getPort().getMultiplicity() == Multiplicity.ZERO_N;
- return createInjector(refName, refClass, multiplicity, objectFactories, fields, methods);
-
}
- /**
- * Creates an <code>Injector</code> for a set of object factories associated with a reference.
- */
- private Injector createInjector(String refName, Class refClass, boolean multiplicity, List<ObjectFactory> objectFactories,
- Set<Field> fields, Set<Method> methods) throws NoAccessorException, BuilderConfigException {
- Field field;
- Method method = null;
- if (multiplicity) {
- // since this is a multiplicity, we cannot match on business interface type, so scan through the fields,
- // matching on name and List or Array
- field = JavaIntrospectionHelper.findMultiplicityFieldByName(refName, fields);
- if (field == null) {
- // No fields found. Again, since this is a multiplicity, we cannot match on business interface type, so
- // scan through the fields, matching on name and List or Array
- method = JavaIntrospectionHelper.findMultiplicityMethodByName(refName, methods);
- if (method == null) {
- throw new NoAccessorException(refName);
- }
- }
- Injector injector;
- // for multiplicities, we need to inject the reference proxy or proxies using an object factory
- // which first delegates to create the proxies and then returns them in the appropriate List or array type
- if (field != null) {
- if (field.getType().isArray()) {
- injector = new FieldInjector(field, new ArrayMultiplicityObjectFactory(refClass, objectFactories));
- } else {
- injector = new FieldInjector(field, new ListMultiplicityObjectFactory(objectFactories));
- }
- } else {
- if (method.getParameterTypes()[0].isArray()) {
- injector = new MethodInjector(method, new ArrayMultiplicityObjectFactory(refClass, objectFactories));
- } else {
- injector = new MethodInjector(method, new ListMultiplicityObjectFactory(objectFactories));
- }
- }
- return injector;
- } else {
- field = JavaIntrospectionHelper.findClosestMatchingField(refName, refClass, fields);
- if (field == null) {
- method = JavaIntrospectionHelper.findClosestMatchingMethod(refName, new Class[]{refClass}, methods);
- if (method == null) {
- throw new NoAccessorException(refName);
- }
- }
- Injector injector;
- if (field != null) {
- injector = new FieldInjector(field, objectFactories.get(0));
- } else {
- injector = new MethodInjector(method, objectFactories.get(0));
- }
- return injector;
- }
- }
}
Modified: incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/config/JavaContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/config/JavaContextFactory.java?rev=396966&r1=396965&r2=396966&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/config/JavaContextFactory.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/config/JavaContextFactory.java Tue Apr 25 12:59:03 2006
@@ -13,24 +13,39 @@
*/
package org.apache.tuscany.container.java.config;
-import java.lang.reflect.Constructor;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import commonj.sdo.DataObject;
import org.apache.tuscany.container.java.context.JavaAtomicContext;
+import org.apache.tuscany.core.builder.BuilderConfigException;
import org.apache.tuscany.core.builder.ContextCreationException;
-import org.apache.tuscany.core.builder.ContextResolver;
import org.apache.tuscany.core.builder.ContextFactory;
-import org.apache.tuscany.core.context.CompositeContext;
+import org.apache.tuscany.core.builder.ContextResolver;
+import org.apache.tuscany.core.builder.NoAccessorException;
+import org.apache.tuscany.core.builder.ObjectFactory;
+import org.apache.tuscany.core.builder.impl.ArrayMultiplicityObjectFactory;
+import org.apache.tuscany.core.builder.impl.ListMultiplicityObjectFactory;
+import org.apache.tuscany.core.builder.impl.ProxyObjectFactory;
+import org.apache.tuscany.core.config.JavaIntrospectionHelper;
import org.apache.tuscany.core.context.AtomicContext;
+import org.apache.tuscany.core.context.CompositeContext;
import org.apache.tuscany.core.injection.EventInvoker;
+import org.apache.tuscany.core.injection.FieldInjector;
import org.apache.tuscany.core.injection.Injector;
+import org.apache.tuscany.core.injection.MethodInjector;
import org.apache.tuscany.core.injection.PojoObjectFactory;
-import org.apache.tuscany.core.wire.TargetWireFactory;
+import org.apache.tuscany.core.injection.SingletonObjectFactory;
import org.apache.tuscany.core.wire.SourceWireFactory;
+import org.apache.tuscany.core.wire.TargetWireFactory;
import org.apache.tuscany.model.assembly.Scope;
+import org.apache.tuscany.databinding.sdo.SDOObjectFactory;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
* A ContextFactory that handles POJO component implementation types
@@ -45,9 +60,17 @@
// the parent context of the component
private CompositeContext parentContext;
+ private Map<String, TargetWireFactory> targetProxyFactories = new HashMap<String, TargetWireFactory>();
+
+ private List<SourceWireFactory> sourceProxyFactories = new ArrayList<SourceWireFactory>();
+
// the implementation type constructor
private Constructor<Object> ctr;
+ private Set<Field> fields;
+
+ private Set<Method> methods;
+
// injectors for properties, references and other metadata values such as
private List<Injector> setters;
@@ -68,9 +91,9 @@
/**
* Creates a new context factory
- *
- * @param name the SCDL name of the component the context refers to
- * @param ctr the implementation type constructor
+ *
+ * @param name the SCDL name of the component the context refers to
+ * @param ctr the implementation type constructor
* @param scope the scope of the component implementation type
*/
public JavaContextFactory(String name, Constructor<Object> ctr, Scope scope) {
@@ -80,6 +103,8 @@
this.ctr = ctr;
this.scope = scope;
stateless = (scope == Scope.INSTANCE);
+ fields = JavaIntrospectionHelper.getAllFields(ctr.getDeclaringClass());
+ methods = JavaIntrospectionHelper.getAllUniqueMethods(ctr.getDeclaringClass());
}
public String getName() {
@@ -95,8 +120,6 @@
return new JavaAtomicContext(name, objectFactory, eagerInit, init, destroy, stateless);
}
- private Map<String, TargetWireFactory> targetProxyFactories = new HashMap<String, TargetWireFactory>();
-
public void addTargetWireFactory(String serviceName, TargetWireFactory factory) {
targetProxyFactories.put(serviceName, factory);
}
@@ -109,10 +132,18 @@
return targetProxyFactories;
}
- private List<SourceWireFactory> sourceProxyFactories = new ArrayList<SourceWireFactory>();
+ public void addProperty(String propertyName, Object value) {
+ setters.add(createPropertyInjector(propertyName, value));
+ }
public void addSourceWireFactory(String referenceName, SourceWireFactory factory) {
sourceProxyFactories.add(factory);
+ setters.add(createReferenceInjector(referenceName, factory, false));
+ }
+
+ public void addSourceWireFactories(String referenceName, Class referenceInterface, List<SourceWireFactory> factories, boolean multiplicity) {
+ sourceProxyFactories.addAll(factories);
+ setters.add(createReferenceInjector(referenceName, factories, multiplicity));
}
public List<SourceWireFactory> getSourceWireFactories() {
@@ -142,5 +173,118 @@
public CompositeContext getCurrentContext() {
return parentContext;
}
+
+ /**
+ * Creates an <code>Injector</code> for component properties
+ */
+ private Injector createPropertyInjector(String propertyName, Object value)
+ throws NoAccessorException {
+ Class type = value.getClass();
+
+ // There is no efficient way to do this
+ Method method = null;
+ Field field = JavaIntrospectionHelper.findClosestMatchingField(propertyName, type, fields);
+ if (field == null) {
+ method = JavaIntrospectionHelper.findClosestMatchingMethod(propertyName, new Class[]{type}, methods);
+ if (method == null) {
+ throw new NoAccessorException(propertyName);
+ }
+ }
+ Injector injector = null;
+ if (value instanceof DataObject) {
+ if (field != null) {
+ injector = new FieldInjector(field, new SDOObjectFactory((DataObject) value));
+ } else {
+ injector = new MethodInjector(method, new SDOObjectFactory((DataObject) value));
+ }
+ } else if (JavaIntrospectionHelper.isImmutable(type)) {
+ if (field != null) {
+ injector = new FieldInjector(field, new SingletonObjectFactory<Object>(value));
+ } else {
+ injector = new MethodInjector(method, new SingletonObjectFactory<Object>(value));
+ }
+ }
+ return injector;
+
+ }
+
+ /**
+ * Creates proxy factories that represent target(s) of a reference and an <code>Injector</code> responsible for injecting them
+ * into the reference
+ */
+ private Injector createReferenceInjector(String refName, List<SourceWireFactory> wireFactories, boolean multiplicity) {
+ assert wireFactories.size() > 0;
+ Class refClass = wireFactories.get(0).getBusinessInterface(); //reference.getPort().getServiceContract().getInterface();
+ // iterate through the targets
+ List<ObjectFactory> objectFactories = new ArrayList<ObjectFactory>();
+ for (SourceWireFactory wireFactory : wireFactories) {
+ objectFactories.add(new ProxyObjectFactory(wireFactory));
+ }
+ return createInjector(refName, refClass, multiplicity, objectFactories, fields, methods);
+
+ }
+
+ private Injector createReferenceInjector(String refName, SourceWireFactory wireFactory, boolean multiplicity) {
+ Class refClass = wireFactory.getBusinessInterface();//reference.getPort().getServiceContract().getInterface();
+ List<ObjectFactory> objectFactories = new ArrayList<ObjectFactory>();
+ objectFactories.add(new ProxyObjectFactory(wireFactory));
+ return createInjector(refName, refClass, multiplicity, objectFactories, fields, methods);
+
+ }
+
+ /**
+ * Creates an <code>Injector</code> for a set of object factories associated with a reference.
+ */
+ private Injector createInjector(String refName, Class refClass, boolean multiplicity, List<ObjectFactory> objectFactories,
+ Set<Field> fields, Set<Method> methods) throws NoAccessorException, BuilderConfigException {
+ Field field;
+ Method method = null;
+ if (multiplicity) {
+ // since this is a multiplicity, we cannot match on business interface type, so scan through the fields,
+ // matching on name and List or Array
+ field = JavaIntrospectionHelper.findMultiplicityFieldByName(refName, fields);
+ if (field == null) {
+ // No fields found. Again, since this is a multiplicity, we cannot match on business interface type, so
+ // scan through the fields, matching on name and List or Array
+ method = JavaIntrospectionHelper.findMultiplicityMethodByName(refName, methods);
+ if (method == null) {
+ throw new NoAccessorException(refName);
+ }
+ }
+ Injector injector;
+ // for multiplicities, we need to inject the reference proxy or proxies using an object factory
+ // which first delegates to create the proxies and then returns them in the appropriate List or array type
+ if (field != null) {
+ if (field.getType().isArray()) {
+ injector = new FieldInjector(field, new ArrayMultiplicityObjectFactory(refClass, objectFactories));
+ } else {
+ injector = new FieldInjector(field, new ListMultiplicityObjectFactory(objectFactories));
+ }
+ } else {
+ if (method.getParameterTypes()[0].isArray()) {
+ injector = new MethodInjector(method, new ArrayMultiplicityObjectFactory(refClass, objectFactories));
+ } else {
+ injector = new MethodInjector(method, new ListMultiplicityObjectFactory(objectFactories));
+ }
+ }
+ return injector;
+ } else {
+ field = JavaIntrospectionHelper.findClosestMatchingField(refName, refClass, fields);
+ if (field == null) {
+ method = JavaIntrospectionHelper.findClosestMatchingMethod(refName, new Class[]{refClass}, methods);
+ if (method == null) {
+ throw new NoAccessorException(refName);
+ }
+ }
+ Injector injector;
+ if (field != null) {
+ injector = new FieldInjector(field, objectFactories.get(0));
+ } else {
+ injector = new MethodInjector(method, objectFactories.get(0));
+ }
+ return injector;
+ }
+ }
+
}
Modified: incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/config/JavaScriptContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/config/JavaScriptContextFactory.java?rev=396966&r1=396965&r2=396966&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/config/JavaScriptContextFactory.java (original)
+++ incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/config/JavaScriptContextFactory.java Tue Apr 25 12:59:03 2006
@@ -72,6 +72,10 @@
return name;
}
+ public void addProperty(String propertyName, Object value) {
+
+ }
+
private Map<String, TargetWireFactory> targetProxyFactories = new HashMap<String, TargetWireFactory>();
public void addTargetWireFactory(String serviceName, TargetWireFactory factory) {
@@ -90,6 +94,10 @@
public void addSourceWireFactory(String referenceName, SourceWireFactory factory) {
sourceProxyFactories.add(factory);
+ }
+
+ public void addSourceWireFactories(String referenceName, Class referenceInterface, List<SourceWireFactory> factory, boolean multiplicity) {
+ //TODO implement
}
public List<SourceWireFactory> getSourceWireFactories() {
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java?rev=396966&r1=396965&r2=396966&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/ContextFactory.java Tue Apr 25 12:59:03 2006
@@ -49,6 +49,11 @@
public String getName();
/**
+ * Adds a property to the context
+ */
+ public void addProperty(String propertyName, Object value);
+
+ /**
* Adds a target-side wire factory for the given service name. Target-side wire factories contain the invocation chains
* associated with the destination service of a wire and are responsible for generating proxies
*/
@@ -68,8 +73,23 @@
* Adds a source-side wire factory for the given reference. Source-side wire factories contain the invocation chains for a
* reference in the implementation associated with the instance context created by this configuration. Source-side wire
* factories also produce proxies that are injected on a reference in a component implementation.
+ *
+ * @param referenceName
+ * @param factory
*/
public void addSourceWireFactory(String referenceName, SourceWireFactory factory);
+
+ /**
+ * Adds a set of source-side wire factories for the given reference. Source-side wire factories contain the invocation chains
+ * for a reference in the implementation associated with the instance context created by this configuration. Source-side wire
+ * factories also produce proxies that are injected on a reference in a component implementation.
+ *
+ * @param referenceName
+ * @param referenceInterface
+ * @param factory
+ * @param multiplicity
+ */
+ public void addSourceWireFactories(String referenceName, Class referenceInterface, List<SourceWireFactory> factory, boolean multiplicity);
/**
* Returns a collection of source-side wire factories for references. There may 1..n wire factories per reference.
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/EntryPointContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/EntryPointContextFactory.java?rev=396966&r1=396965&r2=396966&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/EntryPointContextFactory.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/EntryPointContextFactory.java Tue Apr 25 12:59:03 2006
@@ -92,7 +92,20 @@
}
return sourceProxyFactories;
}
-
+
+ public void addProperty(String propertyName, Object value) {
+ throw new UnsupportedOperationException();
+ }
+
+ public void addSourceWireFactories(String referenceName, Class referenceInterface, List<SourceWireFactory> factories, boolean multiplicity) {
+ if (factories.size() >1){
+ throw new UnsupportedOperationException("Multiple wires for an entry point not allowed");
+ }else if(factories.size() <1){
+ throw new AssertionError("Empty wire factory list");
+ }
+ this.sourceWireFactory = factories.get(0);
+ }
+
public void prepare(CompositeContext parent) {
}
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ExternalServiceContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ExternalServiceContextFactory.java?rev=396966&r1=396965&r2=396966&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ExternalServiceContextFactory.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/ExternalServiceContextFactory.java Tue Apr 25 12:59:03 2006
@@ -99,13 +99,21 @@
}
public void addSourceWireFactory(String referenceName, SourceWireFactory factory) {
- // no wires inside a composite from an external service
+ throw new UnsupportedOperationException();
+ }
+
+ public void addSourceWireFactories(String referenceName, Class referenceInterface, List<SourceWireFactory> factory, boolean multiplicity) {
+
}
public List<SourceWireFactory> getSourceWireFactories() {
return Collections.emptyList();
}
-
+
+ public void addProperty(String propertyName, Object value) {
+ throw new UnsupportedOperationException();
+ }
+
public void prepare(CompositeContext parent) {
//parentContext = parent;
}
Added: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ContextFactoryBuilderSupport.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ContextFactoryBuilderSupport.java?rev=396966&view=auto
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ContextFactoryBuilderSupport.java (added)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/extension/ContextFactoryBuilderSupport.java Tue Apr 25 12:59:03 2006
@@ -0,0 +1,153 @@
+package org.apache.tuscany.core.extension;
+
+import org.apache.tuscany.core.builder.BuilderConfigException;
+import org.apache.tuscany.core.builder.BuilderException;
+import org.apache.tuscany.core.builder.ContextFactory;
+import org.apache.tuscany.core.builder.ContextFactoryBuilder;
+import org.apache.tuscany.core.builder.ContextFactoryBuilderRegistry;
+import org.apache.tuscany.core.system.annotation.Autowire;
+import org.apache.tuscany.core.wire.SourceWireFactory;
+import org.apache.tuscany.core.wire.TargetWireFactory;
+import org.apache.tuscany.core.wire.service.WireFactoryService;
+import org.apache.tuscany.model.assembly.AssemblyObject;
+import org.apache.tuscany.model.assembly.Component;
+import org.apache.tuscany.model.assembly.ConfiguredProperty;
+import org.apache.tuscany.model.assembly.ConfiguredReference;
+import org.apache.tuscany.model.assembly.ConfiguredService;
+import org.apache.tuscany.model.assembly.Implementation;
+import org.apache.tuscany.model.assembly.Multiplicity;
+import org.apache.tuscany.model.assembly.Scope;
+import org.apache.tuscany.model.assembly.Service;
+import org.osoa.sca.annotations.Init;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.List;
+
+/**
+ * A runtime extension point for component types. Subclasses must be genericized according to the model implementation type they
+ * handle, i.e. a subclass of {@link Implementation}, and implement {@link #createContextFactory}.
+ *
+ * @version $Rev: 368822 $ $Date: 2006-01-13 10:54:38 -0800 (Fri, 13 Jan 2006) $
+ * @see org.apache.tuscany.core.builder.ContextFactory
+ */
+@org.osoa.sca.annotations.Scope("MODULE")
+public abstract class ContextFactoryBuilderSupport<T extends Implementation> implements ContextFactoryBuilder {
+
+ protected ContextFactoryBuilderRegistry builderRegistry;
+
+ protected WireFactoryService wireFactoryService;
+
+ protected Class implementationClass;
+
+ /**
+ * Default constructor
+ */
+ public ContextFactoryBuilderSupport() {
+ // reflect the generic type of the subclass
+ Type type = this.getClass().getGenericSuperclass();
+ if (type instanceof ParameterizedType) {
+ implementationClass = (Class) ((ParameterizedType) type).getActualTypeArguments()[0];
+ } else {
+ throw new AssertionError("Subclasses of " + ContextFactoryBuilderSupport.class.getName() + " must be genericized");
+ }
+ }
+
+ /**
+ * Constructs a new instance
+ *
+ * @param wireFactoryService the system service responsible for creating wire factories
+ */
+ public ContextFactoryBuilderSupport(WireFactoryService wireFactoryService) {
+ this();
+ this.wireFactoryService = wireFactoryService;
+ }
+
+ @Init(eager = true)
+ public void init() {
+ builderRegistry.register(this);
+ }
+
+ @Autowire
+ public void setBuilderRegistry(ContextFactoryBuilderRegistry builderRegistry) {
+ this.builderRegistry = builderRegistry;
+ }
+
+ /**
+ * Sets the system service used to construct wire factories
+ */
+ @Autowire
+ public void setWireFactoryService(WireFactoryService wireFactoryService) {
+ this.wireFactoryService = wireFactoryService;
+ }
+
+ public void build(AssemblyObject modelObject) throws BuilderException {
+ if (!(modelObject instanceof Component)) {
+ return;
+ }
+ Component nonGenricComponent = (Component) modelObject;
+ if (!implementationClass.isAssignableFrom(nonGenricComponent.getImplementation().getClass())) {
+ return;
+ }
+ Component<T> component = (Component<T>) modelObject;
+ List<Service> services = component.getImplementation().getComponentInfo().getServices();
+ Scope previous = null;
+ Scope scope = Scope.INSTANCE;
+ for (Service service : services) {
+ // calculate and validate the scope of the component; ensure that all service scopes are the same unless stateless
+ Scope current = service.getServiceContract().getScope();
+ if (previous != null && current != null && current != previous
+ && (current != Scope.INSTANCE && previous != Scope.INSTANCE)) {
+ BuilderException e = new BuilderConfigException("Incompatible scopes specified for services on component");
+ e.setIdentifier(component.getName());
+ throw e;
+ }
+ if (scope != null && current != Scope.INSTANCE) {
+ scope = current;
+ }
+ }
+ ContextFactory contextFactory;
+ try {
+ contextFactory = createContextFactory(component.getName(), component.getImplementation(), scope);
+ // create target-side wire invocation chains for each service offered by the implementation
+ for (ConfiguredService configuredService : component.getConfiguredServices()) {
+ Service service = configuredService.getPort();
+ TargetWireFactory wireFactory = wireFactoryService.createTargetFactory(configuredService);
+ contextFactory.addTargetWireFactory(service.getName(), wireFactory);
+ }
+ // handle properties
+ List<ConfiguredProperty> configuredProperties = component.getConfiguredProperties();
+ if (configuredProperties != null) {
+ for (ConfiguredProperty property : configuredProperties) {
+ contextFactory.addProperty(property.getName(), property.getValue());
+ }
+ }
+ // handle references and source side reference chains
+ List<ConfiguredReference> configuredReferences = component.getConfiguredReferences();
+ if (configuredReferences != null) {
+ for (ConfiguredReference reference : configuredReferences) {
+ List<SourceWireFactory> wireFactories = wireFactoryService.createSourceFactory(reference);
+ String refName = reference.getPort().getName();
+ Class refClass = reference.getPort().getServiceContract().getInterface();
+ boolean multiplicity = reference.getPort().getMultiplicity() == Multiplicity.ONE_N
+ || reference.getPort().getMultiplicity() == Multiplicity.ZERO_N;
+ contextFactory.addSourceWireFactories(refName, refClass, wireFactories, multiplicity);
+ }
+ }
+ component.setContextFactory(contextFactory);
+ } catch (BuilderException e) {
+ e.addContextName(component.getName());
+ throw e;
+ }
+ }
+
+ /**
+ * Subclasses must implement, returning a context factory appropriate to the component implementation
+ *
+ * @param componentName the name of the component
+ * @param implementation the component implementation
+ * @param scope the component implementation scope
+ */
+ protected abstract ContextFactory createContextFactory(String componentName, T implementation, Scope scope);
+
+}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/extension/WireBuilderSupport.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/extension/WireBuilderSupport.java?rev=396966&r1=396965&r2=396966&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/extension/WireBuilderSupport.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/extension/WireBuilderSupport.java Tue Apr 25 12:59:03 2006
@@ -65,6 +65,10 @@
public void completeTargetChain(TargetWireFactory targetFactory, Class targetType, ScopeContext targetScopeContext)
throws BuilderConfigException {
+
+ if (!handlesTargetType(targetType)) {
+ return;
+ }
for (TargetInvocationConfiguration targetInvocationConfig : targetFactory.getConfiguration().getInvocationConfigurations()
.values()) {
Method method = targetInvocationConfig.getMethod();
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemContextFactory.java?rev=396966&r1=396965&r2=396966&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemContextFactory.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemContextFactory.java Tue Apr 25 12:59:03 2006
@@ -65,10 +65,6 @@
// if the component implementation is an composite context
private boolean isComposite;
- // ----------------------------------
- // Constructors
- // ----------------------------------
-
/**
* Creates the runtime configuration
*
@@ -104,14 +100,14 @@
}
}
- // ----------------------------------
- // Methods
- // ----------------------------------
-
public String getName() {
return name;
}
+ public void addProperty(String propertyName, Object value) {
+
+ }
+
public Scope getScope() {
return scope;
}
@@ -159,6 +155,10 @@
public void addSourceWireFactory(String referenceName, SourceWireFactory factory) {
throw new UnsupportedOperationException();
+ }
+
+ public void addSourceWireFactories(String referenceName, Class referenceInterface, List<SourceWireFactory> factory, boolean multiplicity) {
+
}
public List<SourceWireFactory> getSourceWireFactories() {
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemEntryPointContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemEntryPointContextFactory.java?rev=396966&r1=396965&r2=396966&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemEntryPointContextFactory.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemEntryPointContextFactory.java Tue Apr 25 12:59:03 2006
@@ -57,6 +57,7 @@
return name;
}
+
public void addTargetWireFactory(String serviceName, TargetWireFactory pFactory) {
throw new UnsupportedOperationException();
}
@@ -71,6 +72,13 @@
public void addSourceWireFactory(String referenceName, SourceWireFactory pFactory) {
throw new UnsupportedOperationException();
+ }
+
+ public void addSourceWireFactories(String referenceName, Class referenceInterface, List<SourceWireFactory> factory, boolean multiplicity) {
+ throw new UnsupportedOperationException();
+ }
+ public void addProperty(String propertyName, Object value) {
+
}
public List<SourceWireFactory> getSourceWireFactories() {
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceContextFactory.java?rev=396966&r1=396965&r2=396966&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceContextFactory.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemExternalServiceContextFactory.java Tue Apr 25 12:59:03 2006
@@ -62,6 +62,10 @@
return name;
}
+ public void addProperty(String propertyName, Object value) {
+ throw new UnsupportedOperationException();
+ }
+
public ExternalServiceContext createContext() throws ContextCreationException {
return new SystemExternalServiceContext(name, factory);
}
@@ -80,6 +84,10 @@
public void addSourceWireFactory(String referenceName, SourceWireFactory pFactory) {
throw new UnsupportedOperationException();
+ }
+
+ public void addSourceWireFactories(String referenceName, Class referenceInterface, List<SourceWireFactory> factory, boolean multiplicity) {
+
}
public List<SourceWireFactory> getSourceWireFactories() {
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java?rev=396966&r1=396965&r2=396966&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java Tue Apr 25 12:59:03 2006
@@ -66,6 +66,10 @@
return name;
}
+ public void addProperty(String propertyName, Object value) {
+
+ }
+
public void addTargetWireFactory(String serviceName, TargetWireFactory factory) {
throw new UnsupportedOperationException();
}
@@ -80,6 +84,10 @@
public void addSourceWireFactory(String referenceName, SourceWireFactory factory) {
throw new UnsupportedOperationException();
+ }
+
+ public void addSourceWireFactories(String referenceName, Class referenceInterface, List factory, boolean multiplicity) {
+
}
public List<WireFactory> getSourceWireFactories() {
Added: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/extension/GenericReflectionTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/extension/GenericReflectionTestCase.java?rev=396966&view=auto
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/extension/GenericReflectionTestCase.java (added)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/extension/GenericReflectionTestCase.java Tue Apr 25 12:59:03 2006
@@ -0,0 +1,64 @@
+package org.apache.tuscany.core.extension;
+
+import junit.framework.TestCase;
+import org.apache.tuscany.core.builder.ContextFactory;
+import org.apache.tuscany.model.assembly.Implementation;
+import org.apache.tuscany.model.assembly.Scope;
+import org.apache.tuscany.model.assembly.impl.AtomicImplementationImpl;
+
+/**
+ * @version $$Rev$$ $$Date$$
+ */
+public class GenericReflectionTestCase extends TestCase {
+
+ public void testGenericReflection() throws Exception {
+ TestFactoryBuilder b = new TestFactoryBuilder();
+ assertEquals(TestImplementation.class, b.getImplementationClass());
+ }
+
+ public void testNegativeGenericReflection() throws Exception {
+ try {
+ new NonGenericFactoryBuilder();
+ fail("AssertionError expected on non-genericized subclass of " + ContextFactoryBuilderSupport.class.getName());
+ } catch (AssertionError e) {
+ // indicates success
+ }
+ }
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+
+ private class TestFactoryBuilder extends ContextFactoryBuilderSupport<TestImplementation> {
+
+
+ public Class getImplementationClass() {
+ return implementationClass;
+ }
+
+ protected ContextFactory createContextFactory(String componentName, TestImplementation implementation, Scope scope) {
+ return null;
+ }
+ }
+
+ private class NonGenericFactoryBuilder extends ContextFactoryBuilderSupport {
+
+
+ public Class getImplementationClass() {
+ return implementationClass;
+ }
+
+ protected ContextFactory createContextFactory(String componentName, Implementation implementation, Scope scope) {
+ return null;
+ }
+ }
+
+ private class TestImplementation extends AtomicImplementationImpl {
+
+ }
+}
Added: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/extension/WireBuilderSupportTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/extension/WireBuilderSupportTestCase.java?rev=396966&view=auto
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/extension/WireBuilderSupportTestCase.java (added)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/extension/WireBuilderSupportTestCase.java Tue Apr 25 12:59:03 2006
@@ -0,0 +1,152 @@
+package org.apache.tuscany.core.extension;
+
+import junit.framework.TestCase;
+import org.apache.tuscany.core.builder.impl.DefaultWireBuilder;
+import org.apache.tuscany.core.context.QualifiedName;
+import org.apache.tuscany.core.context.ScopeContext;
+import org.apache.tuscany.core.message.Message;
+import org.apache.tuscany.core.wire.Interceptor;
+import org.apache.tuscany.core.wire.TargetInvocationConfiguration;
+import org.apache.tuscany.core.wire.TargetInvoker;
+import org.apache.tuscany.core.wire.TargetWireFactory;
+import org.apache.tuscany.core.wire.WireTargetConfiguration;
+import org.apache.tuscany.core.wire.jdk.JDKTargetWireFactory;
+import org.apache.tuscany.core.wire.mock.MockScopeContext;
+import org.apache.tuscany.model.assembly.Implementation;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @version $$Rev$$ $$Date$$
+ */
+public class WireBuilderSupportTestCase extends TestCase {
+ private Method m;
+
+ /**
+ * Tests that {@link WireBuilderSupport} only processes connect operations and sets target invokers for the correct target
+ * type.
+ * <p/>
+ * Verifies TUSCANY-218
+ *
+ * @throws Exception
+ */
+ public void testTargetInvokerSet() throws Exception {
+ FooWireBuilder fooBuilder = new FooWireBuilder();
+ BarWireBuilder barBuilder = new BarWireBuilder();
+ DefaultWireBuilder defaultBuilder = new DefaultWireBuilder();
+ defaultBuilder.addWireBuilder(fooBuilder);
+ defaultBuilder.addWireBuilder(barBuilder);
+ TargetWireFactory targetFooFactory = new JDKTargetWireFactory();
+ Map<Method, TargetInvocationConfiguration> fooConfigs = new HashMap<Method, TargetInvocationConfiguration>();
+ TargetInvocationConfiguration fooInvocation = new TargetInvocationConfiguration(m);
+ fooConfigs.put(m, fooInvocation);
+ Map<Method, TargetInvocationConfiguration> barConfigs = new HashMap<Method, TargetInvocationConfiguration>();
+ TargetInvocationConfiguration barInvocation = new TargetInvocationConfiguration(m);
+ barConfigs.put(m, barInvocation);
+ targetFooFactory.setConfiguration(new WireTargetConfiguration(null, fooConfigs, null, null));
+ TargetWireFactory targetBarFactory = new JDKTargetWireFactory();
+ targetBarFactory.setConfiguration(new WireTargetConfiguration(null, barConfigs, null, null));
+ ScopeContext ctx = new MockScopeContext();
+ defaultBuilder.completeTargetChain(targetFooFactory, Foo.class, ctx);
+ defaultBuilder.completeTargetChain(targetBarFactory, Bar.class, ctx);
+ assertEquals(FooInvoker.class, targetFooFactory.getConfiguration().getInvocationConfigurations().get(m).getTargetInvoker().getClass());
+ assertEquals(BarInvoker.class, targetBarFactory.getConfiguration().getInvocationConfigurations().get(m).getTargetInvoker().getClass());
+
+ }
+
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ m = SomeInterface.class.getMethod("test", (Class[]) null);
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ private interface SomeInterface {
+ void test();
+ }
+
+ private interface Foo extends Implementation {
+
+ }
+
+ private interface Bar extends Implementation {
+
+ }
+
+ private class FooWireBuilder extends WireBuilderSupport {
+
+ protected boolean handlesTargetType(Class targetType) {
+ return Foo.class.isAssignableFrom(targetType);
+ }
+
+ protected TargetInvoker createInvoker(QualifiedName targetName, Method operation, ScopeContext context, boolean downScope) {
+ return new FooInvoker();
+ }
+ }
+
+ private class BarWireBuilder extends WireBuilderSupport {
+
+ protected boolean handlesTargetType(Class targetType) {
+ return Bar.class.isAssignableFrom(targetType);
+ }
+
+ protected TargetInvoker createInvoker(QualifiedName targetName, Method operation, ScopeContext context, boolean downScope) {
+ return new BarInvoker();
+ }
+ }
+
+ private class FooInvoker implements TargetInvoker {
+
+ public Object invokeTarget(Object payload) throws InvocationTargetException {
+ return null;
+ }
+
+ public boolean isCacheable() {
+ return false;
+ }
+
+ public Object clone() throws CloneNotSupportedException {
+ return null;
+ }
+
+ public Message invoke(Message msg) {
+ return null;
+ }
+
+ public void setNext(Interceptor next) {
+
+ }
+ }
+
+
+ private class BarInvoker implements TargetInvoker {
+
+ public Object invokeTarget(Object payload) throws InvocationTargetException {
+ return null;
+ }
+
+ public boolean isCacheable() {
+ return false;
+ }
+
+ public Object clone() throws CloneNotSupportedException {
+ return null;
+ }
+
+ public Message invoke(Message msg) {
+ return null;
+ }
+
+ public void setNext(Interceptor next) {
+
+ }
+ }
+
+
+}