X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fcontainer%2FContainer.java;h=9669cb216dd65a28e0f75670e3f0a9d106b2efb0;hb=e1975449f1bf16ccb441632d68e440f3e3704a79;hp=60456c5e4cdb98f84b74ab811eeab0c96cac53bf;hpb=32a8562695029cf13d915bc7941a61fe07ff0005;p=utils

diff --git a/system/general/src/main/java/org/wamblee/system/container/Container.java b/system/general/src/main/java/org/wamblee/system/container/Container.java
index 60456c5e..9669cb21 100644
--- a/system/general/src/main/java/org/wamblee/system/container/Container.java
+++ b/system/general/src/main/java/org/wamblee/system/container/Container.java
@@ -17,9 +17,7 @@ package org.wamblee.system.container;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -27,6 +25,7 @@ import org.wamblee.general.Pair;
 import org.wamblee.system.core.AbstractComponent;
 import org.wamblee.system.core.Component;
 import org.wamblee.system.core.DefaultScope;
+import org.wamblee.system.core.NamedInterface;
 import org.wamblee.system.core.ProvidedInterface;
 import org.wamblee.system.core.RequiredInterface;
 import org.wamblee.system.core.Scope;
@@ -47,7 +46,6 @@ public class Container extends AbstractComponent<Scope> {
     private static final Log LOG = LogFactory.getLog(Container.class);
 
     private List<Component> _components;
-    private Set<String> _componentNames;
     private CompositeEdgeFilter _edgeFilter; 
     private boolean _sealed;
 
@@ -68,7 +66,6 @@ public class Container extends AbstractComponent<Scope> {
         super(aName, aProvided, aRequired);
         _components = new ArrayList<Component>();
 
-        _componentNames = new HashSet<String>();
         _edgeFilter = new CompositeEdgeFilter();
         _sealed = false;
         for (Component component : aComponents) {
@@ -106,12 +103,11 @@ public class Container extends AbstractComponent<Scope> {
                             + aComponent.getName()
                             + "' is already part of another hierarchy");
         }
-        if (_componentNames.contains(aComponent.getName())) {
+        if ( findComponent(aComponent.getName()) != null ) {
             throw new SystemAssemblyException("Duplicate component '"
                     + aComponent.getName() + "'");
         }
         _components.add(aComponent);
-        _componentNames.add(aComponent.getName());
         aComponent.addContext(getQualifiedName());
         return this;
     }
@@ -128,7 +124,28 @@ public class Container extends AbstractComponent<Scope> {
     public void connectRequiredProvided(String aClientComponent, String aRequiredInterface, 
             String aServerComponent, String aProvidedInterface) {
         checkSealed();
-        // TODO validate 
+        Component client = findComponent(aClientComponent);
+        Component server = findComponent(aServerComponent);
+        if ( client == null ) { 
+        	throw new SystemAssemblyException(getQualifiedName() + ": No component '" + aClientComponent + "' in the container");
+        }
+        if ( aRequiredInterface != null ) { 
+        	if ( findInterface(client.getRequiredInterfaces(), aRequiredInterface) == null ) { 
+        		throw new SystemAssemblyException(
+        				getQualifiedName() + ": Component '" + aClientComponent + "' does not have a required interface named '" 
+        				+ aRequiredInterface + "'");
+        	}
+        }
+        if ( server == null ) { 
+        	throw new SystemAssemblyException("No component '" + aClientComponent + "' in the container");
+        }
+        if ( aProvidedInterface != null ) { 
+        	if ( findInterface(server.getProvidedInterfaces(), aProvidedInterface) == null) { 
+        		throw new SystemAssemblyException(
+        				getQualifiedName() + ": Component '" + aServerComponent + "' does not have a provided interface named '" 
+        				+ aProvidedInterface + "'");
+        	}
+        }
         _edgeFilter.add(new ConnectRequiredProvidedEdgeFilter(aClientComponent, aRequiredInterface, aServerComponent, aProvidedInterface));
     }
     
@@ -141,14 +158,50 @@ public class Container extends AbstractComponent<Scope> {
     public void connectExternalRequired(String aComponent, String aRequiredInterface, 
             String aExternalRequiredInterface) {
         checkSealed();
-        // TODO validate
+        Component client = findComponent(aComponent);
+        if ( client == null ) { 
+        	throw new SystemAssemblyException(getQualifiedName() + ": No component '" + aComponent + "' in the container");
+        }
+        if ( aRequiredInterface != null ) { 
+        	if ( findInterface(client.getRequiredInterfaces(), aRequiredInterface) == null ) { 
+        		throw new SystemAssemblyException(
+        				getQualifiedName() + ": Component '" + aComponent + "' does not have a required interface named '" 
+        				+ aRequiredInterface + "'");
+        	}
+        }
+        if ( aExternalRequiredInterface != null) { 
+        	if ( findInterface(getRequiredInterfaces(), aExternalRequiredInterface) == null ) { 
+        		throw new SystemAssemblyException(
+        				getQualifiedName() + ": container does not have a required interface named '" 
+        				+ aExternalRequiredInterface + "'");
+        	}
+        }
         _edgeFilter.add(new ConnectRequiredExternallyRequiredEdgeFilter(
                 aComponent, aRequiredInterface, aExternalRequiredInterface));
     }
     
     public void connectExternalProvided(String aExternalProvided, String aComponent, String aProvidedInterface) {
         checkSealed();
-        // TODO validate
+        Component server = findComponent(aComponent);
+       
+      
+        if ( server == null ) { 
+        	throw new SystemAssemblyException("No component '" + aComponent + "' in the container");
+        }
+        if ( aProvidedInterface != null ) { 
+        	if ( findInterface(server.getProvidedInterfaces(), aProvidedInterface) == null) { 
+        		throw new SystemAssemblyException(
+        				getQualifiedName() + ": Component '" + aComponent + "' does not have a provided interface named '" 
+        				+ aProvidedInterface + "'");
+        	}
+        }
+        if ( aExternalProvided != null ) { 
+        	if ( findInterface(getProvidedInterfaces(), aExternalProvided) == null) { 
+        		throw new SystemAssemblyException(
+        				getQualifiedName() + ": Container does not have a provided interface named '" 
+        				+ aExternalProvided + "'");
+        	}
+        }
         _edgeFilter.add(new ConnectExternalProvidedProvidedFilter(aExternalProvided, aComponent, aProvidedInterface));
     }
 
@@ -218,7 +271,6 @@ public class Container extends AbstractComponent<Scope> {
 
     @Override
     protected Scope doStart(Scope aExternalScope) {
-        checkSealed();
         validate();
         Scope scope = new DefaultScope(getProvidedInterfaces().toArray(new ProvidedInterface[0]), aExternalScope);
         ComponentGraph graph = doStartOptionalDryRun(scope, false);
@@ -239,9 +291,7 @@ public class Container extends AbstractComponent<Scope> {
     private ComponentGraph doStartOptionalDryRun(Scope aScope, boolean aDryRun) {
         ComponentGraph graph = createComponentGraph();
         graph.validate();
-        if (!aDryRun) {
-            graph.link();
-        }
+        graph.link();
 
         LOG.info("Starting '" + getQualifiedName() + "'");
 
@@ -311,4 +361,27 @@ public class Container extends AbstractComponent<Scope> {
             throw new SystemAssemblyException("Container is sealed");
         }
     }
+    
+    /**
+     * Finds a component based on the non-qualified name of the component. 
+     * @param aName Component name. 
+     * @return Component or null if not found. 
+     */
+    public Component findComponent(String aName) { 
+    	for (Component<?> component: _components) { 
+    		if ( component.getName().equals(aName)) { 
+    			return component; 
+    		}
+    	}
+    	return null; 
+    }
+    
+    private static <T extends NamedInterface> T findInterface(List<T> aInterfaces, String aInterfaceName) { 
+    	for (T intf: aInterfaces) { 
+    		if ( intf.getName().equals(aInterfaceName)) { 
+    			return intf; 
+    		}
+    	}
+    	return null; 
+    }
 }