You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/02/26 23:12:25 UTC
svn commit: r381183 - in /incubator/tuscany/java/sca/core/src:
main/java/org/apache/tuscany/core/builder/impl/
main/java/org/apache/tuscany/core/system/builder/
test/java/org/apache/tuscany/core/builder/impl/
test/java/org/apache/tuscany/core/invocatio...
Author: jsdelfino
Date: Sun Feb 26 14:12:21 2006
New Revision: 381183
URL: http://svn.apache.org/viewcvs?rev=381183&view=rev
Log:
changed HashMaps to the new MethodHashMap to allow methods to be matched based on their signatures instead on strict equality
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentContextBuilder.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilderTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/NegativeDefaultWireBuilderTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/InvocationErrorTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/jdk/JDKInvocationHandlerTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/jdk/JDKProxyFactoryTestCase.java
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java?rev=381183&r1=381182&r2=381183&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilder.java Sun Feb 26 14:12:21 2006
@@ -59,8 +59,7 @@
// get the proxy chain for the target
if (targetFactory != null) {
// if null, the target side has no interceptors or handlers
- Map<Method, InvocationConfiguration> targetInvocationConfigs = targetFactory.getProxyConfiguration()
- .getInvocationConfigurations();
+ Map<Method, InvocationConfiguration> targetInvocationConfigs = targetFactory.getProxyConfiguration().getInvocationConfigurations();
for (InvocationConfiguration sourceInvocationConfig : sourceFactory.getProxyConfiguration()
.getInvocationConfigurations().values()) {
// match invocation chains
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentContextBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentContextBuilder.java?rev=381183&r1=381182&r2=381183&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentContextBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemComponentContextBuilder.java Sun Feb 26 14:12:21 2006
@@ -55,6 +55,7 @@
import org.apache.tuscany.model.assembly.ConfiguredService;
import org.apache.tuscany.model.assembly.Module;
import org.apache.tuscany.model.assembly.Scope;
+import org.apache.tuscany.model.assembly.impl.AggregateImpl;
import org.osoa.sca.annotations.ComponentName;
import org.osoa.sca.annotations.Context;
import org.osoa.sca.annotations.Destroy;
@@ -141,13 +142,16 @@
}
}
- // handle references
- List<ConfiguredReference> configuredReferences = component.getConfiguredReferences();
- if (configuredReferences != null) {
- for (ConfiguredReference reference : configuredReferences) {
- Injector injector = createReferenceInjector(parentContext.getName(), component.getName(), parentContext,
- reference, fields, methods);
- injectors.add(injector);
+ //FIXME do not inject references on an application module yet
+ if (implClass!=AggregateContextImpl.class) {
+ // handle references
+ List<ConfiguredReference> configuredReferences = component.getConfiguredReferences();
+ if (configuredReferences != null) {
+ for (ConfiguredReference reference : configuredReferences) {
+ Injector injector = createReferenceInjector(parentContext.getName(), component.getName(), parentContext,
+ reference, fields, methods);
+ injectors.add(injector);
+ }
}
}
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilderTestCase.java?rev=381183&r1=381182&r2=381183&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/DefaultWireBuilderTestCase.java Sun Feb 26 14:12:21 2006
@@ -9,6 +9,7 @@
import org.apache.tuscany.core.context.QualifiedName;
import org.apache.tuscany.core.invocation.InvocationConfiguration;
+import org.apache.tuscany.core.invocation.MethodHashMap;
import org.apache.tuscany.core.invocation.ProxyConfiguration;
import org.apache.tuscany.core.invocation.impl.InvokerInterceptor;
import org.apache.tuscany.core.invocation.jdk.JDKProxyFactory;
@@ -54,7 +55,7 @@
source.addSourceInterceptor(sourceInterceptor);
ProxyFactory sourceFactory = new JDKProxyFactory();
- Map<Method, InvocationConfiguration> sourceInvocationConfigs = new HashMap();
+ Map<Method, InvocationConfiguration> sourceInvocationConfigs = new MethodHashMap();
sourceInvocationConfigs.put(hello, source);
ProxyConfiguration sourceConfig = new ProxyConfiguration(new QualifiedName("target/SimpleTarget"),
sourceInvocationConfigs, Thread.currentThread().getContextClassLoader(), msgFactory);
@@ -71,7 +72,7 @@
target.addTargetInterceptor(new InvokerInterceptor());
ProxyFactory targetFactory = new JDKProxyFactory();
- Map<Method, InvocationConfiguration> targetInvocationConfigs = new HashMap();
+ Map<Method, InvocationConfiguration> targetInvocationConfigs = new MethodHashMap();
targetInvocationConfigs.put(hello, target);
ProxyConfiguration targetConfig = new ProxyConfiguration(new QualifiedName("target/SimpleTarget"),
targetInvocationConfigs, Thread.currentThread().getContextClassLoader(), msgFactory);
@@ -109,7 +110,7 @@
source.addSourceInterceptor(sourceInterceptor);
ProxyFactory sourceFactory = new JDKProxyFactory();
- Map<Method, InvocationConfiguration> sourceInvocationConfigs = new HashMap();
+ Map<Method, InvocationConfiguration> sourceInvocationConfigs = new MethodHashMap();
sourceInvocationConfigs.put(hello, source);
ProxyConfiguration sourceConfig = new ProxyConfiguration(new QualifiedName("target/SimpleTarget"),
sourceInvocationConfigs, Thread.currentThread().getContextClassLoader(), msgFactory);
@@ -126,7 +127,7 @@
target.addTargetInterceptor(new InvokerInterceptor());
ProxyFactory targetFactory = new JDKProxyFactory();
- Map<Method, InvocationConfiguration> targetInvocationConfigs = new HashMap();
+ Map<Method, InvocationConfiguration> targetInvocationConfigs = new MethodHashMap();
targetInvocationConfigs.put(hello, target);
ProxyConfiguration targetConfig = new ProxyConfiguration(new QualifiedName("target/SimpleTarget"),
targetInvocationConfigs, Thread.currentThread().getContextClassLoader(), msgFactory);
@@ -165,7 +166,7 @@
source.addSourceInterceptor(sourceInterceptor);
ProxyFactory sourceFactory = new JDKProxyFactory();
- Map<Method, InvocationConfiguration> sourceInvocationConfigs = new HashMap();
+ Map<Method, InvocationConfiguration> sourceInvocationConfigs = new MethodHashMap();
sourceInvocationConfigs.put(hello, source);
ProxyConfiguration sourceConfig = new ProxyConfiguration(new QualifiedName("target/SimpleTarget"),
sourceInvocationConfigs, Thread.currentThread().getContextClassLoader(), msgFactory);
@@ -180,7 +181,7 @@
target.addTargetInterceptor(new InvokerInterceptor());
ProxyFactory targetFactory = new JDKProxyFactory();
- Map<Method, InvocationConfiguration> targetInvocationConfigs = new HashMap();
+ Map<Method, InvocationConfiguration> targetInvocationConfigs = new MethodHashMap();
targetInvocationConfigs.put(hello, target);
ProxyConfiguration targetConfig = new ProxyConfiguration(new QualifiedName("target/SimpleTarget"),
targetInvocationConfigs, Thread.currentThread().getContextClassLoader(), msgFactory);
@@ -216,7 +217,7 @@
source.addSourceInterceptor(sourceInterceptor);
ProxyFactory sourceFactory = new JDKProxyFactory();
- Map<Method, InvocationConfiguration> sourceInvocationConfigs = new HashMap();
+ Map<Method, InvocationConfiguration> sourceInvocationConfigs = new MethodHashMap();
sourceInvocationConfigs.put(hello, source);
ProxyConfiguration sourceConfig = new ProxyConfiguration(new QualifiedName("target/SimpleTarget"),
sourceInvocationConfigs, Thread.currentThread().getContextClassLoader(), msgFactory);
@@ -229,7 +230,7 @@
target.addTargetInterceptor(new InvokerInterceptor());
ProxyFactory targetFactory = new JDKProxyFactory();
- Map<Method, InvocationConfiguration> targetInvocationConfigs = new HashMap();
+ Map<Method, InvocationConfiguration> targetInvocationConfigs = new MethodHashMap();
targetInvocationConfigs.put(hello, target);
ProxyConfiguration targetConfig = new ProxyConfiguration(new QualifiedName("target/SimpleTarget"),
targetInvocationConfigs, Thread.currentThread().getContextClassLoader(), msgFactory);
@@ -268,7 +269,7 @@
source.addSourceInterceptor(sourceInterceptor);
ProxyFactory sourceFactory = new JDKProxyFactory();
- Map<Method, InvocationConfiguration> sourceInvocationConfigs = new HashMap();
+ Map<Method, InvocationConfiguration> sourceInvocationConfigs = new MethodHashMap();
sourceInvocationConfigs.put(hello, source);
ProxyConfiguration sourceConfig = new ProxyConfiguration(new QualifiedName("target/SimpleTarget"),
sourceInvocationConfigs, Thread.currentThread().getContextClassLoader(), msgFactory);
@@ -281,7 +282,7 @@
target.addTargetInterceptor(new InvokerInterceptor());
ProxyFactory targetFactory = new JDKProxyFactory();
- Map<Method, InvocationConfiguration> targetInvocationConfigs = new HashMap();
+ Map<Method, InvocationConfiguration> targetInvocationConfigs = new MethodHashMap();
targetInvocationConfigs.put(hello, target);
ProxyConfiguration targetConfig = new ProxyConfiguration(new QualifiedName("target/SimpleTarget"),
targetInvocationConfigs, Thread.currentThread().getContextClassLoader(), msgFactory);
@@ -316,7 +317,7 @@
InvocationConfiguration source = new InvocationConfiguration(hello);
ProxyFactory sourceFactory = new JDKProxyFactory();
- Map<Method, InvocationConfiguration> sourceInvocationConfigs = new HashMap();
+ Map<Method, InvocationConfiguration> sourceInvocationConfigs = new MethodHashMap();
sourceInvocationConfigs.put(hello, source);
ProxyConfiguration sourceConfig = new ProxyConfiguration(new QualifiedName("target/SimpleTarget"),
sourceInvocationConfigs, Thread.currentThread().getContextClassLoader(), msgFactory);
@@ -333,7 +334,7 @@
target.addTargetInterceptor(new InvokerInterceptor());
ProxyFactory targetFactory = new JDKProxyFactory();
- Map<Method, InvocationConfiguration> targetInvocationConfigs = new HashMap();
+ Map<Method, InvocationConfiguration> targetInvocationConfigs = new MethodHashMap();
targetInvocationConfigs.put(hello, target);
ProxyConfiguration targetConfig = new ProxyConfiguration(new QualifiedName("target/SimpleTarget"),
targetInvocationConfigs, Thread.currentThread().getContextClassLoader(), msgFactory);
@@ -366,7 +367,7 @@
InvocationConfiguration source = new InvocationConfiguration(hello);
ProxyFactory sourceFactory = new JDKProxyFactory();
- Map<Method, InvocationConfiguration> sourceInvocationConfigs = new HashMap();
+ Map<Method, InvocationConfiguration> sourceInvocationConfigs = new MethodHashMap();
sourceInvocationConfigs.put(hello, source);
ProxyConfiguration sourceConfig = new ProxyConfiguration(new QualifiedName("target/SimpleTarget"),
sourceInvocationConfigs, Thread.currentThread().getContextClassLoader(), msgFactory);
@@ -379,7 +380,7 @@
target.addTargetInterceptor(new InvokerInterceptor());
ProxyFactory targetFactory = new JDKProxyFactory();
- Map<Method, InvocationConfiguration> targetInvocationConfigs = new HashMap();
+ Map<Method, InvocationConfiguration> targetInvocationConfigs = new MethodHashMap();
targetInvocationConfigs.put(hello, target);
ProxyConfiguration targetConfig = new ProxyConfiguration(new QualifiedName("target/SimpleTarget"),
targetInvocationConfigs, Thread.currentThread().getContextClassLoader(), msgFactory);
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/NegativeDefaultWireBuilderTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/NegativeDefaultWireBuilderTestCase.java?rev=381183&r1=381182&r2=381183&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/NegativeDefaultWireBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/builder/impl/NegativeDefaultWireBuilderTestCase.java Sun Feb 26 14:12:21 2006
@@ -9,6 +9,7 @@
import org.apache.tuscany.core.builder.BuilderConfigException;
import org.apache.tuscany.core.context.QualifiedName;
import org.apache.tuscany.core.invocation.InvocationConfiguration;
+import org.apache.tuscany.core.invocation.MethodHashMap;
import org.apache.tuscany.core.invocation.ProxyConfiguration;
import org.apache.tuscany.core.invocation.jdk.JDKProxyFactory;
import org.apache.tuscany.core.invocation.mock.SimpleTarget;
@@ -41,7 +42,7 @@
InvocationConfiguration source = new InvocationConfiguration(hello);
ProxyFactory sourceFactory = new JDKProxyFactory();
- Map<Method, InvocationConfiguration> sourceInvocationConfigs = new HashMap();
+ Map<Method, InvocationConfiguration> sourceInvocationConfigs = new MethodHashMap();
sourceInvocationConfigs.put(hello, source);
ProxyConfiguration sourceConfig = new ProxyConfiguration(new QualifiedName("target/SimpleTarget"),
sourceInvocationConfigs, Thread.currentThread().getContextClassLoader(), msgFactory);
@@ -51,7 +52,7 @@
InvocationConfiguration target = new InvocationConfiguration(hello);
ProxyFactory targetFactory = new JDKProxyFactory();
- Map<Method, InvocationConfiguration> targetInvocationConfigs = new HashMap();
+ Map<Method, InvocationConfiguration> targetInvocationConfigs = new MethodHashMap();
targetInvocationConfigs.put(hello, target);
ProxyConfiguration targetConfig = new ProxyConfiguration(new QualifiedName("target/SimpleTarget"),
targetInvocationConfigs, Thread.currentThread().getContextClassLoader(), msgFactory);
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/InvocationErrorTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/InvocationErrorTestCase.java?rev=381183&r1=381182&r2=381183&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/InvocationErrorTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/InvocationErrorTestCase.java Sun Feb 26 14:12:21 2006
@@ -58,7 +58,7 @@
}
public void testCheckedException() throws Exception {
- Map<Method, InvocationConfiguration> config = new HashMap();
+ Map<Method, InvocationConfiguration> config = new MethodHashMap();
config.put(checkedMethod, getConfiguration(checkedMethod));
InvocationHandler handler = new JDKInvocationHandler(new MessageFactoryImpl(), config);
try {
@@ -72,7 +72,7 @@
}
public void testRuntimeException() throws Exception {
- Map<Method, InvocationConfiguration> config = new HashMap();
+ Map<Method, InvocationConfiguration> config = new MethodHashMap();
config.put(runtimeMethod, getConfiguration(runtimeMethod));
InvocationHandler handler = new JDKInvocationHandler(new MessageFactoryImpl(), config);
try {
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/jdk/JDKInvocationHandlerTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/jdk/JDKInvocationHandlerTestCase.java?rev=381183&r1=381182&r2=381183&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/jdk/JDKInvocationHandlerTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/jdk/JDKInvocationHandlerTestCase.java Sun Feb 26 14:12:21 2006
@@ -8,6 +8,7 @@
import junit.framework.TestCase;
import org.apache.tuscany.core.invocation.InvocationConfiguration;
+import org.apache.tuscany.core.invocation.MethodHashMap;
import org.apache.tuscany.core.invocation.impl.InvokerInterceptor;
import org.apache.tuscany.core.invocation.impl.MessageChannelImpl;
import org.apache.tuscany.core.invocation.mock.MockHandler;
@@ -37,14 +38,14 @@
}
public void testBasicInvoke() throws Throwable {
- Map<Method, InvocationConfiguration> configs = new HashMap();
+ Map<Method, InvocationConfiguration> configs = new MethodHashMap();
configs.put(hello, getInvocationHandler(hello));
JDKInvocationHandler handler = new JDKInvocationHandler(new MessageFactoryImpl(), configs);
Assert.assertEquals("foo", handler.invoke(null, hello, new Object[] { "foo" }));
}
public void testErrorInvoke() throws Throwable {
- Map<Method, InvocationConfiguration> configs = new HashMap();
+ Map<Method, InvocationConfiguration> configs = new MethodHashMap();
configs.put(hello, getInvocationHandler(hello));
JDKInvocationHandler handler = new JDKInvocationHandler(new MessageFactoryImpl(), configs);
try {
@@ -60,7 +61,7 @@
MockStaticInvoker invoker = new MockStaticInvoker(hello, new SimpleTargetImpl());
source.setTargetInvoker(invoker);
- Map<Method, InvocationConfiguration> configs = new HashMap();
+ Map<Method, InvocationConfiguration> configs = new MethodHashMap();
configs.put(hello, source);
JDKInvocationHandler handler = new JDKInvocationHandler(new MessageFactoryImpl(), configs);
try {
@@ -76,7 +77,7 @@
MockStaticInvoker invoker = new MockStaticInvoker(hello, new SimpleTargetImpl());
source.setTargetInvoker(invoker);
- Map<Method, InvocationConfiguration> configs = new HashMap();
+ Map<Method, InvocationConfiguration> configs = new MethodHashMap();
configs.put(hello, source);
JDKInvocationHandler handler = new JDKInvocationHandler(new MessageFactoryImpl(), configs);
Assert.assertEquals("foo", handler.invoke(null, hello, new Object[] { "foo" }));
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/jdk/JDKProxyFactoryTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/jdk/JDKProxyFactoryTestCase.java?rev=381183&r1=381182&r2=381183&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/jdk/JDKProxyFactoryTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/invocation/jdk/JDKProxyFactoryTestCase.java Sun Feb 26 14:12:21 2006
@@ -14,7 +14,6 @@
package org.apache.tuscany.core.invocation.jdk;
import java.lang.reflect.Method;
-import java.util.HashMap;
import java.util.Map;
import junit.framework.Assert;
@@ -22,6 +21,7 @@
import org.apache.tuscany.core.context.QualifiedName;
import org.apache.tuscany.core.invocation.InvocationConfiguration;
+import org.apache.tuscany.core.invocation.MethodHashMap;
import org.apache.tuscany.core.invocation.ProxyConfiguration;
import org.apache.tuscany.core.invocation.impl.InvokerInterceptor;
import org.apache.tuscany.core.invocation.mock.MockStaticInvoker;
@@ -52,7 +52,7 @@
source.addTargetInterceptor(new InvokerInterceptor());
source.setTargetInvoker(new MockStaticInvoker(hello, new SimpleTargetImpl()));
source.build();
- Map<Method, InvocationConfiguration> configs = new HashMap();
+ Map<Method, InvocationConfiguration> configs = new MethodHashMap();
configs.put(hello, source);
ProxyConfiguration config = new ProxyConfiguration(new QualifiedName("foo"), configs, Thread.currentThread()
.getContextClassLoader(), new MessageFactoryImpl());