Implemented the ObjectAdapter for adapting existing objects to a component.

diff --git a/trunk/system/general/src/main/java/org/wamblee/system/adapters/ClassConfiguration.java b/trunk/system/general/src/main/java/org/wamblee/system/adapters/ClassConfiguration.java
index a4114175340495ca81740a6073851df7aed2aec7..cff3cd042db281fd63668084bb338dfa1256cce1 100644 (file)
--- a/trunk/system/general/src/main/java/org/wamblee/system/adapters/ClassConfiguration.java
+++ b/trunk/system/general/src/main/java/org/wamblee/system/adapters/ClassConfiguration.java
@@ -70,7 +70,7 @@ public class ClassConfiguration {
         * @param aScope Scope in which injection takes place. 
         */
        public void inject(Scope aScope, Object aObject) { 
-           _setterConfig.invoke(aScope, aObject);
+           _setterConfig.inject(aScope, aObject);
        }
        
        public List<ProvidedInterface> getProvidedInterfaces() {

diff --git a/trunk/system/general/src/main/java/org/wamblee/system/adapters/ObjectAdapter.java b/trunk/system/general/src/main/java/org/wamblee/system/adapters/ObjectAdapter.java
new file mode 100644 (file)
index 0000000..91b10b3
--- /dev/null
+++ b/trunk/system/general/src/main/java/org/wamblee/system/adapters/ObjectAdapter.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2008 the original author or authors.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.wamblee.system.adapters;
+
+import org.wamblee.system.core.AbstractComponent;
+import org.wamblee.system.core.DefaultProvidedInterface;
+import org.wamblee.system.core.ProvidedInterface;
+import org.wamblee.system.core.RequiredInterface;
+import org.wamblee.system.core.Scope;
+
+/**
+ * An adapter class that adapts an existing object to a component. 
+ *  
+ * @author Erik Brakkee
+ */
+public class ObjectAdapter extends AbstractComponent<Object> {
+
+       private SetterConfiguration _setterConfig;
+       private Object _object; 
+
+       public ObjectAdapter(String aName, Object aObject, SetterConfiguration aSetterConfig) {
+               super(aName, 
+                               new ProvidedInterface[] { new DefaultProvidedInterface(aName, aObject.getClass()) },
+                               aSetterConfig.getRequiredInterfaces().toArray(new RequiredInterface[0]));
+               _setterConfig = aSetterConfig;
+               _object = aObject; 
+       }
+       
+       @Override
+       protected Object doStart(Scope aScope) {
+
+           _setterConfig.inject(aScope, _object);
+           
+           for (ProvidedInterface provided: getProvidedInterfaces()) { 
+               addInterface(provided, _object, aScope); 
+           }
+           
+           return _object; 
+       }
+       
+       @Override
+       protected void doStop(Object aRuntime) {
+               // Empty. 
+       }
+}

diff --git a/trunk/system/general/src/main/java/org/wamblee/system/adapters/SetterConfiguration.java b/trunk/system/general/src/main/java/org/wamblee/system/adapters/SetterConfiguration.java
index 83992d388d5f325d55ee75e33ee3ee1f9e8cbb75..ec99512f3fa99843c9cc79f552e770ec9539dc4f 100644 (file)
--- a/trunk/system/general/src/main/java/org/wamblee/system/adapters/SetterConfiguration.java
+++ b/trunk/system/general/src/main/java/org/wamblee/system/adapters/SetterConfiguration.java
@@ -160,7 +160,7 @@ public class SetterConfiguration {
      * @param aScope Scope within which invocation takes place. 
      * @param aObject Object on which the invocation takes place. 
      */
-    public void invoke(Scope aScope, Object aObject) {
+    public void inject(Scope aScope, Object aObject) {
         if ( !_class.isInstance(aObject)) { 
             throw new IllegalArgumentException("Object '" + aObject + "' is not an instance of " 
                     + _class.getName());

diff --git a/trunk/system/general/src/main/java/org/wamblee/system/core/DefaultRequiredInterface.java b/trunk/system/general/src/main/java/org/wamblee/system/core/DefaultRequiredInterface.java
index 9927b517f9c9accf0618fcfba2e4f065c09889ea..5e9f8bb60dda715ef632f6d58029f88353e89fc4 100644 (file)
--- a/trunk/system/general/src/main/java/org/wamblee/system/core/DefaultRequiredInterface.java
+++ b/trunk/system/general/src/main/java/org/wamblee/system/core/DefaultRequiredInterface.java
@@ -121,6 +121,7 @@ public class DefaultRequiredInterface implements RequiredInterface {
        @Override
        public String toString() {
                StringBuffer buf = new StringBuffer();
+               buf.append("." + getName() + ":");
                for (Class intf: _required) { 
                        buf.append("." + intf.getName());
                }

diff --git a/trunk/system/general/src/test/java/org/wamblee/system/adapters/ObjectAdapterTest.java b/trunk/system/general/src/test/java/org/wamblee/system/adapters/ObjectAdapterTest.java
new file mode 100644 (file)
index 0000000..572629f
--- /dev/null
+++ b/trunk/system/general/src/test/java/org/wamblee/system/adapters/ObjectAdapterTest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2008 the original author or authors.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */ 
+package org.wamblee.system.adapters;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.wamblee.system.core.Component;
+import org.wamblee.system.core.Container;
+import org.wamblee.system.core.DefaultProvidedInterface;
+import org.wamblee.system.core.ProvidedInterface;
+import org.wamblee.system.core.RequiredInterface;
+import org.wamblee.system.core.RequiredInterfaceComparator;
+import org.wamblee.system.core.Scope;
+import org.wamblee.test.AssertionUtils;
+
+public class ObjectAdapterTest extends AdapterTestCase {
+
+       public void testSetterInjection() {
+           
+           ClassConfiguration x1Config = new ClassConfiguration(X1.class);
+           x1Config.getConstructorConfig().getParameters().setValue(0, "hello");
+              
+        ClassConfiguration x4Config = new ClassConfiguration(X4.class);
+        SetterConfiguration x8Config = new SetterConfiguration(X8.class);
+        
+        X1 x1 = new X1(); 
+        X8 x8 = new X8(x1);
+        
+        ClassAdapter x1Adapter = new ClassAdapter("x1", x1Config);
+        ClassAdapter x4Adapter = new ClassAdapter("x4", x4Config);
+        ObjectAdapter x8Adapter = new ObjectAdapter("x8", x8, x8Config);
+        
+        Container container = new Container("top", new Component[] { 
+                x1Adapter, x4Adapter, x8Adapter
+        }, new ProvidedInterface[0], new RequiredInterface[0]);
+        
+        EVENT_TRACKER.clear();
+        Scope scope = container.start();
+        AssertionUtils.assertEquals(new String[] { "x1(hello)", "x4(x1)", "x8.setX4(x4)" },
+                EVENT_TRACKER.getEvents(Thread.currentThread()).toArray());
+        
+        Object obj1 = scope.getRuntime(x1Adapter);
+        assertTrue(obj1 instanceof X1); 
+        Object obj4 = scope.getRuntime(x4Adapter);
+        assertTrue(obj4 instanceof X4);
+        Object obj8 = scope.getRuntime(x8Adapter);
+        assertSame(x8, obj8);
+        
+        X4 x4 = (X4) obj4;
+       
+        
+        assertSame(x4, x8.getX4());
+        assertSame(x1, x8.getX1());
+       }
+}

diff --git a/trunk/system/general/src/test/java/org/wamblee/system/adapters/SetterConfigurationTest.java b/trunk/system/general/src/test/java/org/wamblee/system/adapters/SetterConfigurationTest.java
index 106da512158b773cf86f48fae4c78327921315c1..ba01f19110fa43e0e57fb9542eb7281b09cc9ea0 100644 (file)
--- a/trunk/system/general/src/test/java/org/wamblee/system/adapters/SetterConfigurationTest.java
+++ b/trunk/system/general/src/test/java/org/wamblee/system/adapters/SetterConfigurationTest.java
@@ -38,7 +38,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
         
         X5 obj = new X5(); 
         assertNull(obj.getValue());
-        config.invoke(_scope, obj);
+        config.inject(_scope, obj);
         assertEquals("hello", obj.getValue());
     }
     
@@ -62,7 +62,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
         assertNull(obj.getHost());
         assertNull(obj.getPort());
         
-        config.invoke(_scope, obj);
+        config.inject(_scope, obj);
         assertEquals("hello", obj.getHost());
         assertEquals(10, obj.getPort().intValue());
     }
@@ -81,7 +81,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
         AssertionUtils.assertException(new AssertionUtils.ErroneousCode() { 
             @Override
             public void run() throws Exception {
-                config.invoke(_scope, obj);            
+                config.inject(_scope, obj);            
             }
         }, IllegalArgumentException.class);  
     }
@@ -95,7 +95,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
         
         X5 obj = new X5(); 
         assertNull(obj.getValue());
-        config.invoke(_scope, obj);
+        config.inject(_scope, obj);
         assertEquals("bladibla", obj.getValue());
     }
     
@@ -110,7 +110,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
         assertNull(obj.getHost());
         assertNull(obj.getPort());
         
-        config.invoke(_scope, obj);
+        config.inject(_scope, obj);
       
         assertNull(obj.getHost());
         assertNull(obj.getPort());
@@ -132,7 +132,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
         assertNull(obj.getHost());
         assertNull(obj.getPort());
         
-        config.invoke(_scope, obj);
+        config.inject(_scope, obj);
         assertEquals("hello", obj.getHost());
         assertNull(obj.getPort());
     }
@@ -165,7 +165,7 @@ public class SetterConfigurationTest extends AdapterTestCase {
         assertNull(obj.getHost());
         assertNull(obj.getPort());
         
-        config.invoke(_scope, obj);
+        config.inject(_scope, obj);
         assertEquals("hello", obj.getHost());
         assertNull(obj.getPort());
     }