diff options
Diffstat (limited to 'java/sca')
3 files changed, 38 insertions, 13 deletions
diff --git a/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFinder.java b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFinder.java index f81906af89..27926a0115 100644 --- a/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFinder.java +++ b/java/sca/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFinder.java @@ -20,22 +20,38 @@ package org.apache.tuscany.sca.node;
import java.net.URI;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
public class NodeFinder {
- private static Map<URI, Node> nodes = new HashMap<URI, Node>();
+ private static Map<URI, List<Node>> nodes = new HashMap<URI, List<Node>>();
public static void addNode(URI domainName, Node node) {
- nodes.put(domainName, node);
+ List<Node> domainNodes = nodes.get(domainName);
+ if (domainNodes == null) {
+ domainNodes = new ArrayList<Node>();
+ }
+ domainNodes.add(node);
+ nodes.put(domainName, domainNodes);
}
- public static Node removeNode(URI domainName) {
- return nodes.remove(domainName);
+ public static Node removeNode(Node node) {
+ for (List<Node> domainNodes : nodes.values()) {
+ if (domainNodes.contains(node)) {
+ domainNodes.remove(node);
+ if (domainNodes.size() < 1) {
+ nodes.remove(domainNodes);
+ }
+ return node;
+ }
+ }
+ return null;
}
- public static Node getNode(URI domainURI) {
+ public static List<Node> getNodes(URI domainURI) {
return nodes.get(domainURI);
}
diff --git a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java index acd2d91db9..8b79fbbe5e 100644 --- a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java +++ b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java @@ -102,7 +102,7 @@ public class NodeImpl implements Node, Client { if (compositeActivator == null) { return; } - NodeFinder.removeNode(NodeUtil.createURI(configuration.getDomainURI())); + NodeFinder.removeNode(this); if( compositeActivator.getDomainComposite() != null ) { List<Composite> composites = compositeActivator.getDomainComposite().getIncludes(); for (Composite composite : composites) { diff --git a/java/sca/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientImpl.java b/java/sca/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientImpl.java index c72938d849..3cb79c3e3c 100644 --- a/java/sca/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientImpl.java +++ b/java/sca/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientImpl.java @@ -20,9 +20,12 @@ package org.apache.tuscany.sca.client.impl;
import java.net.URI;
+import java.util.List;
+import org.apache.tuscany.sca.assembly.Endpoint2;
import org.apache.tuscany.sca.node.Node;
import org.apache.tuscany.sca.node.NodeFinder;
+import org.apache.tuscany.sca.node.impl.NodeImpl;
import org.oasisopen.sca.NoSuchDomainException;
import org.oasisopen.sca.NoSuchServiceException;
import org.oasisopen.sca.client.SCAClient;
@@ -34,17 +37,23 @@ public class SCAClientImpl implements SCAClient { if (domainURI == null) {
domainURI = URI.create(Node.DEFAULT_DOMAIN_URI);
}
- Node node = NodeFinder.getNode(domainURI);
- if (node == null) {
+ List<Node> nodes = NodeFinder.getNodes(domainURI);
+ if (nodes == null || nodes.size() < 1) {
throw new NoSuchDomainException(domainURI.toString());
}
-
- T service = node.getService(serviceInterface, serviceName);
- if (service == null) {
- throw new NoSuchServiceException(serviceName);
+
+ for (Node n : nodes) {
+ if (n instanceof NodeImpl) {
+ for ( Endpoint2 e : ((NodeImpl)n).getServiceEndpoints()) {
+ // TODO: implement more complete matching
+ if (serviceName.equals(e.getComponent().getName())) {
+ return n.getService(serviceInterface, serviceName);
+ }
+ }
+ }
}
- return service;
+ throw new NoSuchServiceException(serviceName);
}
}
|