From 336593b6fdf6054c662152a8d1551b4fd52b4e71 Mon Sep 17 00:00:00 2001 From: Mateusz Warowny Date: Mon, 11 Apr 2022 19:49:08 +0200 Subject: [PATCH] JAL-3878 Add conservation service discovery --- src/jalview/ws2/client/slivka/SlivkaWSClient.java | 2 +- .../ws2/client/slivka/SlivkaWSDiscoverer.java | 22 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/jalview/ws2/client/slivka/SlivkaWSClient.java b/src/jalview/ws2/client/slivka/SlivkaWSClient.java index b32c188..d7841af 100644 --- a/src/jalview/ws2/client/slivka/SlivkaWSClient.java +++ b/src/jalview/ws2/client/slivka/SlivkaWSClient.java @@ -200,7 +200,7 @@ public class SlivkaWSClient implements WebServiceClientI public void cancel(WebServiceJobHandle job) throws IOException, UnsupportedOperationException { - throw new UnsupportedOperationException( + Cache.log.warn( "slivka client does not support job cancellation"); } } diff --git a/src/jalview/ws2/client/slivka/SlivkaWSDiscoverer.java b/src/jalview/ws2/client/slivka/SlivkaWSDiscoverer.java index 4829b49..1f46fc3 100644 --- a/src/jalview/ws2/client/slivka/SlivkaWSDiscoverer.java +++ b/src/jalview/ws2/client/slivka/SlivkaWSDiscoverer.java @@ -135,6 +135,28 @@ public class SlivkaWSDiscoverer extends AbstractWebServiceDiscoverer psaService.addAction(actionBuilder.build()); allServices.add(psaService); } + else if (serviceClass == SERVICE_CLASS_CONSERVATION) + { + var wsb = WebService. newBuilder(); + initServiceBuilder(slivkaService, wsb); + wsb.category("Conservation"); + wsb.interactive(true); + wsb.actionClass(AnnotationAction.class); + var conService = wsb.build(); + var client = new SlivkaAnnotationWSClient(slivkaService); + var actionBuilder = AnnotationAction.newBuilder(client); + actionBuilder.webService(conService); + actionBuilder.name(""); + actionBuilder.alignmentAnalysis(true); + actionBuilder.requireAlignedSequences(true); + actionBuilder.filterSymbols(true); + conService.addAction(actionBuilder.build()); + allServices.add(conService); + } + else if (serviceClass == SERVICE_CLASS_RNA_SEC_STR_PRED) + { + + } else { continue; -- 1.7.10.2