X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FJws2Discoverer.java;h=56a4b775b9fc78a03b39e2148caff9f5a9fabd76;hb=c41398473f1493a06f28da53be50630a0f6e6f6d;hp=8089e1a584cbfe41ffb4dcf157e941d0194e53bc;hpb=4674dbf3f27eee61a7e21174649aa4c9ec7a04dd;p=jalview.git
diff --git a/src/jalview/ws/jws2/Jws2Discoverer.java b/src/jalview/ws/jws2/Jws2Discoverer.java
index 8089e1a..56a4b77 100644
--- a/src/jalview/ws/jws2/Jws2Discoverer.java
+++ b/src/jalview/ws/jws2/Jws2Discoverer.java
@@ -1,57 +1,57 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.ws.jws2;
-import java.awt.Color;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
+import jalview.bin.Cache;
+import jalview.bin.Console;
+import jalview.bin.ApplicationSingletonProvider;
+import jalview.bin.ApplicationSingletonProvider.ApplicationSingletonI;
+import jalview.gui.AlignFrame;
+import jalview.util.MessageManager;
+import jalview.ws.ServiceChangeListener;
+import jalview.ws.WSDiscovererI;
+import jalview.ws.api.ServiceWithParameters;
+import jalview.ws.jws2.jabaws2.Jws2Instance;
+import jalview.ws.params.ParamDatastoreI;
+
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import java.io.Closeable;
-import java.net.ConnectException;
+import java.beans.PropertyChangeSupport;
+import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashSet;
-import java.util.Hashtable;
import java.util.List;
+import java.util.Set;
import java.util.StringTokenizer;
import java.util.Vector;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.FutureTask;
import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import javax.swing.event.MenuEvent;
-import javax.swing.event.MenuListener;
-
-import org.apache.log4j.Level;
-import jalview.bin.Cache;
-import jalview.datamodel.AlignmentView;
-import jalview.gui.AlignFrame;
-import jalview.gui.Desktop;
-import jalview.gui.JalviewChangeSupport;
-import jalview.ws.WSMenuEntryProviderI;
-import jalview.ws.params.ParamDatastoreI;
-import compbio.data.msa.MsaWS;
-import compbio.metadata.Option;
-import compbio.metadata.Preset;
-import compbio.metadata.PresetManager;
-import compbio.metadata.RunnerConfig;
-import compbio.ws.client.Jws2Client;
import compbio.ws.client.Services;
/**
@@ -61,36 +61,80 @@ import compbio.ws.client.Services;
* @author JimP
*
*/
-public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
+public class Jws2Discoverer implements WSDiscovererI, Runnable, ApplicationSingletonI
{
- private java.beans.PropertyChangeSupport changeSupport = new java.beans.PropertyChangeSupport(
- this);
-
/**
- * change listeners are notified of "services" property changes
+ * Returns the singleton instance of this class.
*
- * @param listener
- * to be added that consumes new services Hashtable object.
+ * @return
*/
- public void addPropertyChangeListener(
- java.beans.PropertyChangeListener listener)
+ public static Jws2Discoverer getInstance()
{
- changeSupport.addPropertyChangeListener(listener);
+ return (Jws2Discoverer) ApplicationSingletonProvider
+ .getInstance(Jws2Discoverer.class);
}
+ public static final String COMPBIO_JABAWS = "http://www.compbio.dundee.ac.uk/jabaws";
+
+ /*
+ * the .jalview_properties entry for JWS2 URLS
+ */
+ private final static String JWS2HOSTURLS = "JWS2HOSTURLS";
+
+ /*
+ * Override for testing only
+ */
+ private List testUrls = null;
+
+ // preferred url has precedence over others
+ private String preferredUrl;
+
+
+ private Set serviceListeners = new CopyOnWriteArraySet<>();
+
+ private Vector invalidServiceUrls = null;
+
+ private Vector urlsWithoutServices = null;
+
+ private Vector validServiceUrls = null;
+
+ private volatile boolean running = false;
+
+ private volatile boolean aborted = false;
+
+
+ private volatile Thread oldthread = null;
/**
- *
- *
- * @param listener
- * to be removed
+ * holds list of services.
*/
- public void removePropertyChangeListener(
- java.beans.PropertyChangeListener listener)
+ protected Vector services;
+
+ /**
+ * Private constructor enforces use of singleton via getDiscoverer()
+ */
+ private Jws2Discoverer()
{
- changeSupport.removePropertyChangeListener(listener);
}
- boolean running = false, aborted = false;
+ @Override
+ public void addServiceChangeListener(ServiceChangeListener listener)
+ {
+ serviceListeners.add(listener);
+ }
+
+ @Override
+ public void removeServiceChangeListener(ServiceChangeListener listener)
+ {
+ serviceListeners.remove(listener);
+ }
+
+ private void notifyServiceListeners(List services)
+ {
+ if (services == null) services = this.services;
+ for (var listener : serviceListeners) {
+ listener.servicesChanged(this, services);
+ }
+ }
/**
* @return the aborted
@@ -109,10 +153,10 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
this.aborted = aborted;
}
- Thread oldthread = null;
-
+ @Override
public void run()
{
+
if (running && oldthread != null && oldthread.isAlive())
{
if (!aborted)
@@ -123,26 +167,36 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
{
try
{
- Cache.log
- .debug("Waiting around for old discovery thread to finish.");
+ Console.debug(
+ "Waiting around for old discovery thread to finish.");
// wait around until old discoverer dies
Thread.sleep(100);
} catch (Exception e)
{
}
}
- Cache.log.debug("Old discovery thread has finished.");
+ aborted = false;
+ Console.debug("Old discovery thread has finished.");
}
running = true;
+
+ // first set up exclusion list if needed
+ final Set ignoredServices = new HashSet<>();
+ for (String ignored : Cache
+ .getDefault("IGNORED_JABAWS_SERVICETYPES", "").split("\\|"))
+ {
+ ignoredServices.add(ignored);
+ }
+
+ notifyServiceListeners(Collections.emptyList());
oldthread = Thread.currentThread();
try
{
- Class foo = getClass().getClassLoader().loadClass(
- "compbio.ws.client.Jws2Client");
+ getClass().getClassLoader().loadClass("compbio.ws.client.Jws2Client");
} catch (ClassNotFoundException e)
{
- System.err
- .println("Not enabling JABA Webservices : client jar is not available."
+ System.err.println(
+ "Not enabling JABA Webservices : client jar is not available."
+ "\nPlease check that your webstart JNLP file is up to date!");
running = false;
return;
@@ -160,44 +214,90 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
{
invalidServiceUrls.removeAllElements();
}
+ if (validServiceUrls != null)
+ {
+ validServiceUrls.removeAllElements();
+ }
+ ArrayList svctypes = new ArrayList<>();
- List qrys = new ArrayList();
- for (final String jwsservers : getServiceUrls())
+ List qrys = new ArrayList<>();
+ for (final String jwsserver : getServiceUrls())
{
- JabaWsServerQuery squery = new JabaWsServerQuery(this, jwsservers);
+ JabaWsServerQuery squery = new JabaWsServerQuery(this, jwsserver);
+ if (svctypes.size() == 0)
+ {
+ // TODO: remove this ugly hack to get Canonical JABA service ordering
+ // for all possible services
+ for (Services sv : squery.JABAWS2SERVERS)
+ {
+ if (!ignoredServices.contains(sv.toString()))
+ {
+ svctypes.add(sv.toString());
+ }
+ }
+
+ }
qrys.add(squery);
new Thread(squery).start();
}
- boolean finished = false;
+ boolean finished = true;
do
{
+ finished = true;
try
{
Thread.sleep(100);
} catch (Exception e)
{
}
- ;
for (JabaWsServerQuery squery : qrys)
{
- finished |= !squery.isRunning();
+ if (squery.isRunning())
+ {
+ finished = false;
+ }
}
if (aborted)
{
- Cache.log.debug("Aborting " + qrys.size()
- + " JABAWS discovery threads.");
+ Console.debug(
+ "Aborting " + qrys.size() + " JABAWS discovery threads.");
for (JabaWsServerQuery squery : qrys)
{
squery.setQuit(true);
}
}
} while (!aborted && !finished);
- oldthread = null;
- running = false;
if (!aborted)
{
- changeSupport.firePropertyChange("services", new Vector(), services);
+ // resort services according to order found in jabaws service list
+ // also ensure services for each host are ordered in same way.
+
+ if (services != null && services.size() > 0)
+ {
+ Jws2Instance[] svcs = new Jws2Instance[services.size()];
+ int[] spos = new int[services.size()];
+ int ipos = 0;
+ List svcUrls = getServiceUrls();
+ for (Jws2Instance svc : services)
+ {
+ svcs[ipos] = svc;
+ spos[ipos++] = 1000 * svcUrls.indexOf(svc.getHostURL()) + 1
+ + svctypes.indexOf(svc.getName());
+ }
+ jalview.util.QuickSort.sort(spos, svcs);
+ services = new Vector<>();
+ for (Jws2Instance svc : svcs)
+ {
+ if (!ignoredServices.contains(svc.getName()))
+ {
+ services.add(svc);
+ }
+ }
+ }
}
+ oldthread = null;
+ running = false;
+ notifyServiceListeners(services);
}
/**
@@ -207,369 +307,106 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
* @param srv
* @param service2
*/
- synchronized void addService(String jwsservers, Services srv,
- MsaWS service2)
+ synchronized void addService(String jwsservers, Jws2Instance service)
{
if (services == null)
{
- services = new Vector();
+ services = new Vector<>();
}
- System.out.println("Discovered service: " + jwsservers + " "
- + srv.toString());
- Jws2Instance service = new Jws2Instance(jwsservers, srv.toString(),
- service2);
+ System.out.println(
+ "Discovered service: " + jwsservers + " " + service.toString());
+ // Jws2Instance service = new Jws2Instance(jwsservers, srv.toString(),
+ // service2);
services.add(service);
// retrieve the presets and parameter set and cache now
- service.getParamStore().getPresets();
- service.hasParameters();
- }
-
- public class Jws2Instance
- {
- public String hosturl;
-
- public String serviceType;
-
- public MsaWS service;
-
- public Jws2Instance(String hosturl, String serviceType, MsaWS service)
+ ParamDatastoreI pds = service.getParamStore();
+ if (pds != null)
{
- super();
- this.hosturl = hosturl;
- this.serviceType = serviceType;
- this.service = service;
+ pds.getPresets();
}
-
- PresetManager presets = null;
-
- public JabaParamStore paramStore = null;
-
- /**
- * non thread safe - gets the presets for this service (blocks whilst it
- * calls the service to get the preset set)
- *
- * @return service presets or null if exceptions were raised.
- */
- public PresetManager getPresets()
- {
- if (presets == null)
- {
- try
- {
- presets = service.getPresets();
- } catch (Exception ex)
- {
- System.err
- .println("Exception when retrieving presets for service "
- + serviceType + " at " + hosturl);
- }
- }
- return presets;
- }
-
- public String getHost()
- {
- return hosturl;
- /*
- * try { URL serviceurl = new URL(hosturl); if (serviceurl.getPort()!=80)
- * { return serviceurl.getHost()+":"+serviceurl.getPort(); } return
- * serviceurl.getHost(); } catch (Exception e) {
- * System.err.println("Failed to parse service URL '" + hosturl +
- * "' as a valid URL!"); } return null;
- */
- }
-
- /**
- * @return short description of what the service will do
- */
- public String getActionText()
- {
- return "Align with " + serviceType;
- }
-
- /**
- * non-thread safe - blocks whilst accessing service to get complete set of
- * available options and parameters
- *
- * @return
- */
- public RunnerConfig getRunnerConfig()
- {
- return service.getRunnerOptions();
- }
-
- @Override
- protected void finalize() throws Throwable
- {
- if (service != null)
- {
- try
- {
- Closeable svc = (Closeable) service;
- service = null;
- svc.close();
- } catch (Exception e)
- {
- }
- ;
- }
- super.finalize();
- }
-
- public ParamDatastoreI getParamStore()
- {
- if (paramStore == null)
- {
- try
- {
- paramStore = new JabaParamStore(this,
- (Desktop.instance != null ? Desktop
- .getUserParameterStore() : null));
- } catch (Exception ex)
- {
- }
-
- }
- return paramStore;
- }
-
- public String getUri()
- {
- // this is only valid for Jaba 1.0 - this formula might have to change!
- return hosturl
- + (hosturl.lastIndexOf("/") == (hosturl.length() - 1) ? "/"
- : "") + serviceType;
- }
-
- private boolean hasParams = false, lookedForParams = false;
-
- public boolean hasParameters()
+ service.hasParameters();
+ if (validServiceUrls == null)
{
- if (!lookedForParams)
- {
- lookedForParams = true;
- try
- {
- hasParams = (getRunnerConfig().getArguments().size() > 0);
- } catch (Exception e)
- {
-
- }
- }
- return hasParams;
+ validServiceUrls = new Vector<>();
}
- };
-
- /**
- * holds list of services.
- */
- protected Vector services;
+ validServiceUrls.add(jwsservers);
+ }
/**
- * find or add a submenu with the given title in the given menu
*
- * @param menu
- * @param submenu
- * @return the new or existing submenu
+ * @param args
+ * @j2sIgnore
*/
- private JMenu findOrCreateMenu(JMenu menu, String submenu)
+ public static void main(String[] args)
{
- JMenu submenuinstance = null;
- for (int i = 0, iSize = menu.getMenuComponentCount(); i < iSize; i++)
+ Jws2Discoverer instance = getInstance();
+ if (args.length > 0)
{
- if (menu.getMenuComponent(i) instanceof JMenu
- && ((JMenu) menu.getMenuComponent(i)).getText().equals(
- submenu))
+ instance.testUrls = new ArrayList<>();
+ for (String url : args)
{
- submenuinstance = (JMenu) menu.getMenuComponent(i);
+ instance.testUrls.add(url);
}
}
- if (submenuinstance == null)
- {
- submenuinstance = new JMenu(submenu);
- menu.add(submenuinstance);
- }
- return submenuinstance;
-
- }
-
- public void attachWSMenuEntry(JMenu wsmenu, final AlignFrame alignFrame)
- {
- // dynamically regenerate service list.
- final JMenu jws2al = new JMenu("JABAWS Alignment");
- jws2al.addMenuListener(new MenuListener()
- {
- // TODO: future: add menu listener to parent menu - so submenus are
- // populated *before* they are selected.
- @Override
- public void menuSelected(MenuEvent e)
+ var discoverer = getInstance();
+ discoverer.addServiceChangeListener((_discoverer, _services) -> {
+ if (discoverer.services != null)
{
- populateWSMenuEntry(jws2al, alignFrame);
- }
-
- @Override
- public void menuDeselected(MenuEvent e)
- {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void menuCanceled(MenuEvent e)
- {
- // TODO Auto-generated method stub
-
- }
-
- });
- wsmenu.add(jws2al);
-
- }
-
- private void populateWSMenuEntry(JMenu jws2al, final AlignFrame alignFrame)
- {
- if (running || services == null || services.size() == 0)
- {
- return;
- }
- boolean byhost = Cache.getDefault("WSMENU_BYHOST", true), bytype = Cache
- .getDefault("WSMENU_BYTYPE", true);
- /**
- * eventually, JWS2 services will appear under the same align/etc submenus.
- * for moment we keep them separate.
- */
- JMenu atpoint;
- MsaWSClient msacl = new MsaWSClient();
- Vector hostLabels = new Vector();
- jws2al.removeAll();
- String lasthost = null;
- for (final Jws2Instance service : services)
- {
- atpoint = jws2al;
- String host = service.getHost();
- String type = service.serviceType;
- if (byhost)
- {
- atpoint = findOrCreateMenu(atpoint, host);
- if (atpoint.getToolTipText() == null)
- {
- atpoint.setToolTipText("Services at " + host);
- }
- }
- if (bytype)
- {
- atpoint = findOrCreateMenu(atpoint, type);
- if (atpoint.getToolTipText() == null)
- {
- atpoint.setToolTipText(service.getActionText());
- }
- }
- if (!byhost
- && !hostLabels.contains(host + service.serviceType
- + service.getActionText()))
- // !hostLabels.contains(host + (bytype ?
- // service.serviceType+service.getActionText() : "")))
- {
- // add a marker indicating where this service is hosted
- // relies on services from the same host being listed in a contiguous
- // group
- JMenuItem hitm;
- atpoint.addSeparator();
- if (lasthost == null || !lasthost.equals(host))
+ System.out.println("Changesupport: There are now "
+ + discoverer.services.size() + " services");
+ int i = 1;
+ for (ServiceWithParameters s_instance : discoverer.services)
{
- atpoint.add(hitm = new JMenuItem(host));
- hitm.setForeground(Color.blue);
- lasthost = host;
+ System.out.println(
+ "Service " + i++ + " " + s_instance.getClass()
+ + "@" + s_instance.getHostURL() + ": "
+ + s_instance.getActionText());
}
- hostLabels.addElement(host + service.serviceType
- + service.getActionText());
- // hostLabels.addElement(host + (bytype ?
- // service.serviceType+service.getActionText() : ""));
- }
- msacl.attachWSMenuEntry(atpoint, service, alignFrame);
- /*
- * JMenuItem sitem = new JMenuItem(service.serviceType);
- * sitem.setToolTipText("Hosted at " + service.hosturl);
- * sitem.addActionListener(new ActionListener() {
- *
- * @Override public void actionPerformed(ActionEvent e) { AlignmentView
- * msa = alignFrame.gatherSequencesForAlignment(); MsaWSClient client =
- * new MsaWSClient(service, "JWS2 Alignment of " + alignFrame.getTitle(),
- * msa, false, true, alignFrame.getViewport().getAlignment().getDataset(),
- * alignFrame); } });
- */
- }
- }
- public static void main(String[] args)
- {
- Thread runner = getDiscoverer().startDiscoverer(
- new PropertyChangeListener()
- {
-
- public void propertyChange(PropertyChangeEvent evt)
- {
- if (getDiscoverer().services!=null)
- {
- System.out.println("Changesupport: There are now "
- + getDiscoverer().services.size() + " services");
-
- }
}
});
- while (runner.isAlive())
+ try
+ {
+ discoverer.startDiscoverer().get();
+ } catch (InterruptedException | ExecutionException e)
{
- try
- {
- Thread.sleep(50);
- } catch (InterruptedException e)
- {
- }
- ;
}
- }
-
- private static Jws2Discoverer discoverer;
-
- public static Jws2Discoverer getDiscoverer()
- {
- if (discoverer == null)
+ try
+ {
+ Thread.sleep(50);
+ } catch (InterruptedException x)
{
- discoverer = new Jws2Discoverer();
}
- return discoverer;
}
+
+ @Override
public boolean hasServices()
{
- // TODO Auto-generated method stub
return !running && services != null && services.size() > 0;
}
+ @Override
public boolean isRunning()
{
return running;
}
- /**
- * the jalview .properties entry for JWS2 URLS
- */
- final static String JWS2HOSTURLS = "JWS2HOSTURLS";
-
- public static void setServiceUrls(Vector urls)
+ @Override
+ public void setServiceUrls(List wsUrls)
{
- if (urls != null)
+ if (wsUrls != null && !wsUrls.isEmpty())
{
- StringBuffer urlbuffer = new StringBuffer();
+ StringBuilder urls = new StringBuilder(128);
String sep = "";
- for (String url : urls)
+ for (String url : wsUrls)
{
- urlbuffer.append(sep);
- urlbuffer.append(url);
+ urls.append(sep);
+ urls.append(url);
sep = ",";
}
- Cache.setProperty(JWS2HOSTURLS, urlbuffer.toString());
+ Cache.setProperty(JWS2HOSTURLS, urls.toString());
}
else
{
@@ -577,11 +414,28 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
}
}
- public static Vector getServiceUrls()
+ /**
+ * Returns web service URLs, in the order in which they should be tried (or an
+ * empty list).
+ *
+ * @return
+ */
+ @Override
+ public List getServiceUrls()
{
- String surls = Cache.getDefault(JWS2HOSTURLS,
- "http://www.compbio.dundee.ac.uk/jabaws");
- Vector urls = new Vector();
+ if (testUrls != null)
+ {
+ // return test urls, if there are any, instead of touching cache
+ return testUrls;
+ }
+ List urls = new ArrayList<>();
+
+ if (this.preferredUrl != null)
+ {
+ urls.add(preferredUrl);
+ }
+
+ String surls = Cache.getDefault(JWS2HOSTURLS, COMPBIO_JABAWS);
try
{
StringTokenizer st = new StringTokenizer(surls, ",");
@@ -590,46 +444,40 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
String url = null;
try
{
- java.net.URL u = new java.net.URL(url = st.nextToken());
+ url = st.nextToken();
+ new URL(url);
if (!urls.contains(url))
{
urls.add(url);
}
else
{
- jalview.bin.Cache.log.info("Ignoring duplicate url in "
+ Console.warn("Ignoring duplicate url " + url + " in "
+ JWS2HOSTURLS + " list");
}
- } catch (Exception ex)
+ } catch (MalformedURLException ex)
{
- jalview.bin.Cache.log
- .warn("Problem whilst trying to make a URL from '"
- + ((url != null) ? url : "") + "'");
- jalview.bin.Cache.log
- .warn("This was probably due to a malformed comma separated list"
- + " in the "
- + JWS2HOSTURLS
+ Console.warn("Problem whilst trying to make a URL from '"
+ + ((url != null) ? url : "") + "'");
+ Console.warn(
+ "This was probably due to a malformed comma separated list"
+ + " in the " + JWS2HOSTURLS
+ " entry of $(HOME)/.jalview_properties)");
- jalview.bin.Cache.log.debug("Exception was ", ex);
+ Console.debug("Exception was ", ex);
}
}
} catch (Exception ex)
{
- jalview.bin.Cache.log.warn(
- "Error parsing comma separated list of urls in "
- + JWS2HOSTURLS + " preference.", ex);
- }
- if (urls.size() >= 0)
- {
- return urls;
+ Console.warn("Error parsing comma separated list of urls in "
+ + JWS2HOSTURLS + " preference.", ex);
}
- return null;
+ return urls;
}
- public Vector getServices()
+ @Override
+ public Vector getServices()
{
- return (services == null) ? new Vector()
- : new Vector(services);
+ return (services == null) ? new Vector<>() : new Vector<>(services);
}
/**
@@ -638,12 +486,14 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
* @param foo
* @return
*/
- public static boolean testServiceUrl(URL foo)
+ @Override
+ public boolean testServiceUrl(URL foo)
{
try
{
- compbio.ws.client.WSTester.main(new String[]
- { "-h=" + foo.toString() });
+ compbio.ws.client.WSTester
+ .main(new String[]
+ { "-h=" + foo.toString() });
} catch (Exception e)
{
e.printStackTrace();
@@ -657,9 +507,26 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
e.printStackTrace();
return false;
}
+
return true;
}
+ public boolean restart()
+ {
+ synchronized (this)
+ {
+ if (running)
+ {
+ aborted = true;
+ }
+ else
+ {
+ running = true;
+ }
+ return aborted;
+ }
+ }
+
/**
* Start a fresh discovery thread and notify the given object when we're
* finished. Any known existing threads will be killed before this one is
@@ -668,20 +535,31 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
* @param changeSupport2
* @return new thread
*/
- public Thread startDiscoverer(PropertyChangeListener changeSupport2)
+ @Override
+ public CompletableFuture startDiscoverer()
{
+ /* if (restart())
+ {
+ return;
+ }
+ else
+ {
+ Thread thr = new Thread(this);
+ thr.start();
+ }
+ */
if (isRunning())
{
setAborted(true);
}
- addPropertyChangeListener(changeSupport2);
- Thread thr = new Thread(this);
- thr.start();
- return thr;
+ CompletableFuture task = CompletableFuture
+ .supplyAsync(() -> {
+ run();
+ return Jws2Discoverer.this;
+ });
+ return task;
}
- Vector invalidServiceUrls = null, urlsWithoutServices = null;
-
/**
* @return the invalidServiceUrls
*/
@@ -699,7 +577,8 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
}
/**
- * add an 'empty' JABA server to the list
+ * add an 'empty' JABA server to the list. Only servers not already in the
+ * 'bad URL' list will be added to this list.
*
* @param jwsservers
*/
@@ -707,9 +586,12 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
{
if (urlsWithoutServices == null)
{
- urlsWithoutServices = new Vector();
+ urlsWithoutServices = new Vector<>();
}
- if (!urlsWithoutServices.contains(jwsservers))
+
+ if ((invalidServiceUrls == null
+ || !invalidServiceUrls.contains(jwsservers))
+ && !urlsWithoutServices.contains(jwsservers))
{
urlsWithoutServices.add(jwsservers);
}
@@ -724,7 +606,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
{
if (invalidServiceUrls == null)
{
- invalidServiceUrls = new Vector();
+ invalidServiceUrls = new Vector<>();
}
if (!invalidServiceUrls.contains(jwsservers))
{
@@ -737,6 +619,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
* @return a human readable report of any problems with the service URLs used
* for discovery
*/
+ @Override
public String getErrorMessages()
{
if (!isRunning() && !isAborted())
@@ -746,7 +629,8 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
if (getInvalidServiceUrls() != null
&& getInvalidServiceUrls().size() > 0)
{
- ermsg.append("Invalid Service URLS: \n");
+ ermsg.append(MessageManager.getString("warn.urls_not_contacted")
+ + ": \n");
for (String svcurl : getInvalidServiceUrls())
{
if (list)
@@ -762,7 +646,8 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
if (getUrlsWithoutServices() != null
&& getUrlsWithoutServices().size() > 0)
{
- ermsg.append("URLs without any JABA Services : \n");
+ ermsg.append(
+ MessageManager.getString("warn.urls_no_jaba") + ": \n");
for (String svcurl : getUrlsWithoutServices())
{
if (list)
@@ -783,4 +668,38 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
return null;
}
+ @Override
+ public int getServerStatusFor(String url)
+ {
+ if (validServiceUrls != null && validServiceUrls.contains(url))
+ {
+ return STATUS_OK;
+ }
+ if (urlsWithoutServices != null && urlsWithoutServices.contains(url))
+ {
+ return STATUS_NO_SERVICES;
+ }
+ if (invalidServiceUrls != null && invalidServiceUrls.contains(url))
+ {
+ return STATUS_INVALID;
+ }
+ return STATUS_UNKNOWN;
+ }
+
+ /**
+ * Set a URL to try before any others. For use with command-line parameter to
+ * configure a local Jabaws installation without the need to add to property
+ * files.
+ *
+ * @param value
+ * @throws MalformedURLException
+ */
+ public void setPreferredUrl(String value) throws MalformedURLException
+ {
+ if (value != null && value.trim().length() > 0)
+ {
+ new URL(value);
+ preferredUrl = value;
+ }
+ }
}