Start bringing up the client api to the recent proposals

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@790961 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 31 insertions, 59 deletions

diff --git a/java/sca/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java b/java/sca/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java
index 390e370a48..d318a5899c 100644
--- a/java/sca/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java
+++ b/java/sca/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java
@@ -19,14 +19,41 @@
 

 package org.apache.tuscany.sca.client.impl;

 

-import org.oasisopen.sca.client.SCAClient;

+import java.net.URI;

+import java.util.List;

+

+import org.apache.tuscany.sca.node.Node;

+import org.apache.tuscany.sca.node.NodeFinder;

+import org.oasisopen.sca.NoSuchDomainException;

+import org.oasisopen.sca.NoSuchServiceException;

+import org.oasisopen.sca.ServiceUnavailableException;

 import org.oasisopen.sca.client.SCAClientFactory;

 

 public class SCAClientFactoryImpl extends SCAClientFactory {

 

-    @Override

-    protected SCAClient createSCAClient() {

-        return new SCAClientImpl();

+    public SCAClientFactoryImpl(URI domainURI) {

+        super(domainURI);

     }

 

+    @Override

+    public <T> T getService(Class<T> serviceInterface, String serviceName) throws NoSuchServiceException, NoSuchDomainException {

+        URI domainURI = getDomainURI();

+        if (domainURI == null) {

+            domainURI = URI.create(Node.DEFAULT_DOMAIN_URI);

+        }

+        List<Node> nodes = NodeFinder.getNodes(domainURI);

+        if (nodes == null || nodes.size() < 1) {

+            throw new NoSuchDomainException(domainURI.toString());

+        }

+

+        for (Node n : nodes) {

+            try {

+                return n.getService(serviceInterface, serviceName);

+            } catch(ServiceUnavailableException e) {

+                // Ingore and continue

+            }

+        }

+

+        throw new NoSuchServiceException(serviceName);

+    }

 }

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
deleted file mode 100644
index 01160b69d5..0000000000
--- a/java/sca/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you 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.apache.tuscany.sca.client.impl;

-

-import java.net.URI;

-import java.util.List;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFinder;

-import org.oasisopen.sca.NoSuchDomainException;

-import org.oasisopen.sca.NoSuchServiceException;

-import org.oasisopen.sca.ServiceUnavailableException;

-import org.oasisopen.sca.client.SCAClient;

-

-public class SCAClientImpl implements SCAClient {

-

-    public <T> T getService(Class<T> serviceInterface, String serviceName, URI domainURI)

-        throws NoSuchServiceException, NoSuchDomainException {

-        if (domainURI == null) {

-            domainURI = URI.create(Node.DEFAULT_DOMAIN_URI);

-        }

-        List<Node> nodes = NodeFinder.getNodes(domainURI);

-        if (nodes == null || nodes.size() < 1) {

-            throw new NoSuchDomainException(domainURI.toString());

-        }

-

-        for (Node n : nodes) {

-            try {

-                return n.getService(serviceInterface, serviceName);

-            } catch(ServiceUnavailableException e) {

-                // Ingore and continue

-            }

-        }

-

-        throw new NoSuchServiceException(serviceName);

-    }

-

-}