You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2006/05/20 22:27:55 UTC
svn commit: r408090 - in /incubator/tuscany/sandbox/jboynes/sca/core2/src:
main/java/org/apache/tuscany/core/system/context/
test/java/org/apache/tuscany/core/system/context/
Author: jboynes
Date: Sat May 20 13:27:55 2006
New Revision: 408090
URL: http://svn.apache.org/viewvc?rev=408090&view=rev
Log:
tighten generics on SystemCompositeContext
Modified:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContext.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContextImpl.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/SystemObjectRegistrationTestCase.java
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContext.java?rev=408090&r1=408089&r2=408090&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContext.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContext.java Sat May 20 13:27:55 2006
@@ -14,9 +14,9 @@
* code to create the initial configuration components.
*
* @param name the name of the resulting component
- * @param service
+ * @param service the service interface the component should expose
* @param instance the Object that will become the component's implementation
* @throws ObjectRegistrationException
*/
- void registerJavaObject(String name, Class<?> service, Object instance) throws ObjectRegistrationException;
+ <S, I extends S> void registerJavaObject(String name, Class<S> service, I instance) throws ObjectRegistrationException;
}
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContextImpl.java?rev=408090&r1=408089&r2=408090&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContextImpl.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/system/context/SystemCompositeContextImpl.java Sat May 20 13:27:55 2006
@@ -27,13 +27,12 @@
super(name, parent, autowireContext);
}
- public void registerJavaObject(String componentName, Class<?> service, Object instance) throws ObjectRegistrationException {
- SystemAtomicContext<Object> context = new SystemSingletonAtomicContext<Object>(componentName, service, instance);
- registerContext(context);
+ public <S, I extends S> void registerJavaObject(String name, Class<S> service, I instance) throws ObjectRegistrationException {
+ registerContext(new SystemSingletonAtomicContext<S>(name, service, instance));
}
public <T> T resolveInstance(Class<T> instanceInterface) throws AutowireResolutionException {
- if (CompositeContext.class.equals(instanceInterface)) {
+ if (instanceInterface.isAssignableFrom(CompositeContext.class)) {
return instanceInterface.cast(this);
} else {
return super.resolveInstance(instanceInterface);
Modified: incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/SystemObjectRegistrationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/SystemObjectRegistrationTestCase.java?rev=408090&r1=408089&r2=408090&view=diff
==============================================================================
--- incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/SystemObjectRegistrationTestCase.java (original)
+++ incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/system/context/SystemObjectRegistrationTestCase.java Sat May 20 13:27:55 2006
@@ -5,19 +5,18 @@
import org.apache.tuscany.core.context.event.ModuleStart;
import org.apache.tuscany.core.context.event.ModuleStop;
import org.apache.tuscany.core.context.DuplicateNameException;
-import org.apache.tuscany.spi.context.AtomicContext;
import junit.framework.TestCase;
/**
* @version $Rev$ $Date$
*/
public class SystemObjectRegistrationTestCase extends TestCase {
- private SystemCompositeContext systemContext;
+ private SystemCompositeContext<?> systemContext;
public void testRegistration() throws Exception {
MockComponent instance = new MockComponent();
systemContext.registerJavaObject("foo", MockComponent.class, instance);
- MockComponent resolvedInstance = (MockComponent)((AtomicContext)systemContext.getContext("foo")).getService();
+ MockComponent resolvedInstance = (MockComponent)systemContext.getContext("foo").getService();
assertSame(instance, resolvedInstance);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org