Author: jboynes
Date: Thu Jul 20 08:48:36 2006
New Revision: 423961
URL: http://svn.apache.org/viewvc?rev=423961&view=rev
Log:
refactor groovy component to make teh set of propety injectors a dependency
Modified:
incubator/tuscany/java/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java
incubator/tuscany/java/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java
incubator/tuscany/java/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java
incubator/tuscany/java/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java
Modified:
incubator/tuscany/java/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java?rev=423961&r1=423960&r2=423961&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java
(original)
+++
incubator/tuscany/java/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java
Thu Jul 20 08:48:36 2006
@@ -17,12 +17,11 @@
package org.apache.tuscany.container.groovy;
import java.lang.reflect.Method;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import groovy.lang.GroovyClassLoader;
import groovy.lang.GroovyObject;
+
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.ScopeContainer;
@@ -39,9 +38,8 @@
*/
public class GroovyAtomicComponent<T> extends AtomicComponentExtension<T> {
private final Class<? extends GroovyObject> groovyClass;
-
- private List<Class<?>> services;
- private List<PropertyInjector> injectors;
+ private final List<Class<?>> services;
+ private final List<PropertyInjector> injectors;
public GroovyAtomicComponent(String name,
Class<? extends GroovyObject> groovyClass,
@@ -52,11 +50,15 @@
ScopeContainer scopeContainer,
WireService wireService) {
super(name, parent, scopeContainer, wireService, 0);
+ assert groovyClass != null;
+ assert services != null;
+ assert injectors != null;
+
this.groovyClass = groovyClass;
this.services = Collections.unmodifiableList(services);
- this.scope = scope;
- this.injectors = (injectors != null) ? injectors : new
ArrayList<PropertyInjector>();
+ this.injectors = injectors;
+ this.scope = scope;
}
public List<Class<?>> getServiceInterfaces() {
Modified:
incubator/tuscany/java/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java?rev=423961&r1=423960&r2=423961&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java
(original)
+++
incubator/tuscany/java/sca/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java
Thu Jul 20 08:48:36 2006
@@ -3,6 +3,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.Collections;
import groovy.lang.GroovyClassLoader;
import groovy.lang.GroovyObject;
@@ -54,11 +55,14 @@
throw bce;
}
+ List<PropertyInjector> injectors = Collections.emptyList();
+ // todo set up injectors
+
return new GroovyAtomicComponent(name,
groovyClass,
services,
scope,
- null,
+ injectors,
parent,
deploymentContext.getModuleScope(),
wireService);
Modified:
incubator/tuscany/java/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java?rev=423961&r1=423960&r2=423961&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java
(original)
+++
incubator/tuscany/java/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/ScriptInvokeTestCase.java
Thu Jul 20 08:48:36 2006
@@ -2,6 +2,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Collections;
import groovy.lang.GroovyObject;
import groovy.lang.GroovyClassLoader;
@@ -18,6 +19,8 @@
public class ScriptInvokeTestCase extends TestCase {
private static final String SCRIPT = "def greet(name) { return name }";
+ private static final List<PropertyInjector> INJECTORS =
Collections.emptyList();
+
private Class<? extends GroovyObject> implClass;
/**
@@ -33,7 +36,7 @@
implClass,
services,
Scope.MODULE,
- null,
+ INJECTORS,
null,
scope,
ArtifactFactory.createWireService());
Modified:
incubator/tuscany/java/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java?rev=423961&r1=423960&r2=423961&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java
(original)
+++
incubator/tuscany/java/sca/containers/container.groovy/src/test/java/org/apache/tuscany/container/groovy/WireTestCase.java
Thu Jul 20 08:48:36 2006
@@ -2,6 +2,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Collections;
import junit.framework.TestCase;
import static org.easymock.EasyMock.*;
@@ -26,6 +27,7 @@
* @version $$Rev$$ $$Date$$
*/
public class WireTestCase extends TestCase {
+ private static final List<PropertyInjector> INJECTORS =
Collections.emptyList();
private static final String SCRIPT = "import
org.apache.tuscany.container.groovy.mock.Greeting;"
+ "class Foo implements Greeting{"
@@ -64,7 +66,7 @@
implClass1,
services,
Scope.MODULE,
- null,
+ INJECTORS,
null,
scope,
ArtifactFactory.createWireService());
@@ -122,7 +124,7 @@
implClass2,
services,
Scope.MODULE,
- null,
+ INJECTORS,
null,
scope,
ArtifactFactory.createWireService());
@@ -147,7 +149,7 @@
implClass2,
services,
Scope.MODULE,
- null,
+ INJECTORS,
null,
scope,
ArtifactFactory.createWireService());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
