Slight refactoring

[jabaws.git] / webservices / compbio / ws / client / Jws2Client.java

diff --git a/webservices/compbio/ws/client/Jws2Client.java b/webservices/compbio/ws/client/Jws2Client.java
index c18f100..e775727 100644 (file)
--- a/webservices/compbio/ws/client/Jws2Client.java
+++ b/webservices/compbio/ws/client/Jws2Client.java
@@ -28,6 +28,7 @@ import java.io.FileInputStream;
 import java.io.IOException;\r
 import java.io.PrintWriter;\r
 import java.io.Writer;\r
+import java.net.ConnectException;\r
 import java.net.MalformedURLException;\r
 import java.net.URL;\r
 import java.util.Arrays;\r
@@ -71,12 +72,6 @@ public class Jws2Client {
        private static final Logger log = Logger.getLogger(Jws2Client.class\r
                        .getCanonicalName());\r
 \r
-       // JABAWS version 1.0 service name\r
-       static final String QUALIFIED_SERVICE_NAME = "http://msa.data.compbio/01/01/2010/";\r
-\r
-       // JABAWS version 2.0 service name\r
-       static final String V2_QUALIFIED_SERVICE_NAME = "http://msa.data.compbio/01/12/2010/";\r
-\r
        /**\r
         * Attempt to construct the URL object from the string\r
         * \r
@@ -199,6 +194,7 @@ public class Jws2Client {
                log.fine("Disconnected successfully!");\r
        }\r
 \r
+       // TODO make public?\r
        private void testService(String hostname, Services service)\r
                        throws IOException {\r
                RegistryWS registry = connectToRegistry(hostname);\r
@@ -210,6 +206,7 @@ public class Jws2Client {
                }\r
        }\r
 \r
+       // TODO make public?\r
        private void listServices(String hostname) throws IOException {\r
                RegistryWS registry = connectToRegistry(hostname);\r
                if (registry != null) {\r
@@ -320,17 +317,22 @@ public class Jws2Client {
                return analize(fastalist, wsproxy, preset, customOptions);\r
        }\r
        /**\r
-        * Connects to a web service by the host and the service name\r
+        * Connects to a web service by the host and the service name web service\r
+        * type\r
         * \r
-        * @param T\r
-        *            web service type\r
         * @param host\r
+        *            the fully qualified name of JABAWS server including JABAWS\r
+        *            context name e.g\r
+        *            http://nanna.cluster.lifesci.dundee.ac.uk:8080/jaba\r
         * @param service\r
-        * @return MsaWS<T>\r
+        *            the name of the JABAWS service to connect to\r
+        * @return JABAService<T>\r
         * @throws WebServiceException\r
+        * @throws ConnectException\r
+        *             if fails to connect to the service on the host\r
         */\r
        public static JABAService connect(String host, Services service)\r
-                       throws WebServiceException {\r
+                       throws WebServiceException, ConnectException {\r
                URL url = null;\r
                log.log(Level.FINE, "Attempting to connect...");\r
                try {\r
@@ -341,17 +343,17 @@ public class Jws2Client {
                }\r
                Service serv = null;\r
                try {\r
-                       serv = service.getService(url, QUALIFIED_SERVICE_NAME);\r
+                       serv = service.getService(url, JABAService.SERVICE_NAMESPACE);\r
                } catch (WebServiceException wse) {\r
                        System.out.println("Connecting to JABAWS version 2 service");\r
                        if (isV2service(wse)) {\r
-                               serv = service.getService(url, V2_QUALIFIED_SERVICE_NAME);\r
+                               serv = service\r
+                                               .getService(url, JABAService.V2_SERVICE_NAMESPACE);\r
                        }\r
                }\r
                if (serv == null) {\r
-                       System.err.println("Could not connect to " + url\r
+                       throw new ConnectException("Could not connect to " + url\r
                                        + " the server is down?");\r
-                       // FIXME\r
                }\r
                JABAService serviceIF = service.getInterface(serv);\r
                log.log(Level.INFO, "Connected successfully!");\r
@@ -363,13 +365,25 @@ public class Jws2Client {
                String message = wse.getMessage();\r
                int idx = message.indexOf("not a valid service");\r
                if (idx > 0) {\r
-                       if (message.substring(idx).contains(V2_QUALIFIED_SERVICE_NAME)) {\r
+                       if (message.substring(idx).contains(\r
+                                       JABAService.V2_SERVICE_NAMESPACE)) {\r
                                return true;\r
                        }\r
                }\r
                return false;\r
        }\r
 \r
+       /**\r
+        * Get a connection of JABAWS registry\r
+        * \r
+        * @param host\r
+        *            the fully qualified name of JABAWS server including JABAWS\r
+        *            context name e.g\r
+        *            http://nanna.cluster.lifesci.dundee.ac.uk:8080/jaba\r
+        * @return compbio.data.msa.RegistryWS - instance of a RegistryWS web\r
+        *         service\r
+        * @throws WebServiceException\r
+        */\r
        public static compbio.data.msa.RegistryWS connectToRegistry(String host)\r
                        throws WebServiceException {\r
                URL url = null;\r
@@ -382,7 +396,7 @@ public class Jws2Client {
                        e.printStackTrace();\r
                        // ignore as the host name is already verified\r
                }\r
-               QName qname = new QName(V2_QUALIFIED_SERVICE_NAME, service);\r
+               QName qname = new QName(JABAService.V2_SERVICE_NAMESPACE, service);\r
                Service serv = Service.create(url, qname);\r
 \r
                if (serv == null) {\r