X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Frest%2FRestJobThread.java;h=f60ff0c3e778c9b99ba29aabd27416527b27cf60;hb=841485c28403b4a8e00c9bddae9caa9411667b8a;hp=35dd13b2748fbdeff6f3e9e3beae9c44a78c7cfb;hpb=a8f483d04205bb8273ee311c12968b7e86d205fa;p=jalview.git diff --git a/src/jalview/ws/rest/RestJobThread.java b/src/jalview/ws/rest/RestJobThread.java index 35dd13b..f60ff0c 100644 --- a/src/jalview/ws/rest/RestJobThread.java +++ b/src/jalview/ws/rest/RestJobThread.java @@ -1,19 +1,21 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * 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.rest; @@ -24,7 +26,7 @@ import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.AlignmentI; import jalview.datamodel.AlignmentOrder; import jalview.datamodel.Annotation; -import jalview.datamodel.ColumnSelection; +import jalview.datamodel.HiddenColumns; import jalview.datamodel.SequenceGroup; import jalview.datamodel.SequenceI; import jalview.gui.AlignFrame; @@ -34,6 +36,7 @@ import jalview.gui.WebserviceInfo; import jalview.io.NewickFile; import jalview.io.packed.JalviewDataset; import jalview.io.packed.JalviewDataset.AlignmentSet; +import jalview.util.MessageManager; import jalview.ws.AWSThread; import jalview.ws.AWsJob; @@ -56,8 +59,6 @@ import org.apache.http.client.methods.HttpRequestBase; import org.apache.http.entity.mime.HttpMultipartMode; import org.apache.http.entity.mime.MultipartEntity; import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.protocol.BasicHttpContext; -import org.apache.http.protocol.HttpContext; import org.apache.http.util.EntityUtils; public class RestJobThread extends AWSThread @@ -87,8 +88,8 @@ public class RestJobThread extends AWSThread { jobs = new RestJob[1]; jobs[0] = new RestJob(0, this, - restClient._input.getVisibleAlignment(restClient.service - .getGapCharacter()), + restClient._input.getVisibleAlignment( + restClient.service.getGapCharacter()), restClient._input.getVisibleContigs()); // need a function to get a range on a view/alignment and return both // annotation, groups and selection subsetted to just that region. @@ -98,15 +99,14 @@ public class RestJobThread extends AWSThread { int[] viscontig = restClient._input.getVisibleContigs(); AlignmentI[] viscontigals = restClient._input - .getVisibleContigAlignments(restClient.service - .getGapCharacter()); + .getVisibleContigAlignments( + restClient.service.getGapCharacter()); if (viscontigals != null && viscontigals.length > 0) { jobs = new RestJob[viscontigals.length]; for (int j = 0; j < jobs.length; j++) { - int[] visc = new int[] - { viscontig[j * 2], viscontig[j * 2 + 1] }; + int[] visc = new int[] { viscontig[j * 2], viscontig[j * 2 + 1] }; if (j != 0) { jobs[j] = new RestJob(j, this, viscontigals[j], visc); @@ -171,9 +171,13 @@ public class RestJobThread extends AWSThread private String getStage(Stage stg) { if (stg == Stage.SUBMIT) + { return "submitting "; + } if (stg == Stage.POLL) + { return "checking status of "; + } return (" being confused about "); } @@ -210,9 +214,6 @@ public class RestJobThread extends AWSThread protected void doHttpReq(Stage stg, RestJob rj, String postUrl) throws Exception { - StringBuffer respText = new StringBuffer(); - // con.setContentHandlerFactory(new - // jalview.ws.io.mime.HttpContentHandler()); HttpRequestBase request = null; String messages = ""; if (stg == Stage.SUBMIT) @@ -227,8 +228,8 @@ public class RestJobThread extends AWSThread { if (input.getValue().validFor(rj)) { - postentity.addPart(input.getKey(), input.getValue() - .formatForInput(rj)); + postentity.addPart(input.getKey(), + input.getValue().formatForInput(rj)); } else { @@ -247,7 +248,6 @@ public class RestJobThread extends AWSThread { DefaultHttpClient httpclient = new DefaultHttpClient(); - HttpContext localContext = new BasicHttpContext(); HttpResponse response = null; try { @@ -281,42 +281,19 @@ public class RestJobThread extends AWSThread Cache.log.debug("Processing result set."); processResultSet(rj, response, request); break; + case 202: - rj.statMessage = "
Job submitted successfully. Results available at this URL:\n" - + "" - + rj.getJobId() - + "
"; - rj.running = true; + markJobAsRunning(rj); break; + + case 201: + // Created - redirect may be present. Fallthrough to 302 case 302: - Header[] loc; - if (!rj.isSubmitted() - && (loc = response - .getHeaders(HTTPConstants.HEADER_LOCATION)) != null - && loc.length > 0) - { - if (loc.length > 1) - { - Cache.log - .warn("Ignoring additional " - + (loc.length - 1) - + " location(s) provided in response header ( next one is '" - + loc[1].getValue() + "' )"); - } - rj.setJobId(loc[0].getValue()); - rj.setSubmitted(true); - } + extractJobId(rj, response); completeStatus(rj, response); break; case 500: - // Failed. - rj.setSubmitted(true); - rj.setAllowedServerExceptions(0); - rj.setSubjobComplete(true); - rj.error = true; - rj.running = false; + markAsFailed(rj, response); completeStatus(rj, response, "" + getStage(stg) + "failed. Reason below:\n"); break; @@ -331,16 +308,10 @@ public class RestJobThread extends AWSThread rj.setSubmitted(true); try { - completeStatus( - rj, - response, - "" - + getStage(stg) - + " resulted in an unexpected server response.
Url concerned was " - + request.getURI() - + "
Filtered response content below:
"); + completeStatus(rj, response, "" + getStage(stg) + + " resulted in an unexpected server response.
Url concerned was " + request.getURI() + + "
Filtered response content below:
"); } catch (IOException e) { Cache.log.debug("IOException when consuming unhandled response", @@ -351,6 +322,64 @@ public class RestJobThread extends AWSThread } } + private void markAsFailed(RestJob rj, HttpResponse response) + { + // Failed. + rj.setSubmitted(true); + rj.setAllowedServerExceptions(0); + rj.setSubjobComplete(true); + rj.error = true; + rj.running = false; + } + + /** + * set the jobRunning flag and post a link to the physical result page encoded + * in rj.getJobId() + * + * @param rj + */ + private void markJobAsRunning(RestJob rj) + { + rj.statMessage = "
Job submitted successfully. Results available at this URL:\n" + + "" + + rj.getJobId() + + "
"; + rj.running = true; + } + + /** + * extract the job ID URL from the redirect page. Does nothing if job is + * already running. + * + * @param rj + * @param response + */ + private void extractJobId(RestJob rj, HttpResponse response) + { + Header[] loc; + if (!rj.isSubmitted()) + { + + // redirect URL - typical for IBIVU type jobs. + if ((loc = response.getHeaders(HTTPConstants.HEADER_LOCATION)) != null + && loc.length > 0) + { + if (loc.length > 1) + { + Cache.log + .warn("Ignoring additional " + + (loc.length - 1) + + " location(s) provided in response header ( next one is '" + + loc[1].getValue() + "' )"); + } + rj.setJobId(loc[0].getValue()); + rj.setSubmitted(true); + } + } + } + /** * job has completed. Something valid should be available from con * @@ -478,21 +507,19 @@ public class RestJobThread extends AWSThread } catch (Error ex) { - Cache.log.warn("Failed to finish parsing data for job " - + rj.getJobId()); + Cache.log.warn( + "Failed to finish parsing data for job " + rj.getJobId()); ex.printStackTrace(); } catch (Exception ex) { - Cache.log.warn("Failed to finish parsing data for job " - + rj.getJobId()); + Cache.log.warn( + "Failed to finish parsing data for job " + rj.getJobId()); ex.printStackTrace(); } finally { rj.error = true; rj.statMessage = "Error whilst parsing data for this job.
URL for job response is :" - + rj.resSet.getUrl() + + rj.resSet.getUrl() + "\">" + rj.resSet.getUrl() + "
"; } } @@ -582,12 +609,12 @@ public class RestJobThread extends AWSThread /** * alignment panels derived from each alignment set returned by service. */ - ArrayList destPanels = new ArrayList(); + ArrayList destPanels = new ArrayList<>(); /** * list of instructions for how to process each distinct alignment set * returned by the job set */ - ArrayList resultDest = new ArrayList(); + ArrayList resultDest = new ArrayList<>(); /** * when false, zeroth pane is panel derived from input deta. */ @@ -606,9 +633,9 @@ public class RestJobThread extends AWSThread boolean vsepjobs = restClient.service.isVseparable(); // total number of distinct alignment sets generated by job set. int numAlSets = 0, als = 0; - List destAls = new ArrayList(); - List destColsel = new ArrayList(); - List> trees = new ArrayList>(); + List destAls = new ArrayList<>(); + List destColsel = new ArrayList<>(); + List> trees = new ArrayList<>(); do { @@ -667,7 +694,7 @@ public class RestJobThread extends AWSThread if (alset.trees != null) { - trees.add(new ArrayList(alset.trees)); + trees.add(new ArrayList<>(alset.trees)); } else { @@ -695,8 +722,8 @@ public class RestJobThread extends AWSThread */ int vrestjob = 0; // Destination alignments for all result data. - ArrayList visgrps = new ArrayList(); - Hashtable groupNames = new Hashtable(); + ArrayList visgrps = new ArrayList<>(); + Hashtable groupNames = new Hashtable<>(); ArrayList visAlAn = null; for (nvertsep = 0; nvertsep < nvertseps; nvertsep++) { @@ -713,7 +740,7 @@ public class RestJobThread extends AWSThread RestJob rj = (RestJob) jobs[nrj]; int contigs[] = input.getVisibleContigs(); AlignmentI destAl = null; - jalview.datamodel.ColumnSelection destCs = null; + jalview.datamodel.HiddenColumns destHCs = null; // Resolve destAl for this data. if (als == 0 && rj.isInputContextModified()) { @@ -729,10 +756,10 @@ public class RestJobThread extends AWSThread if (!restClient.isAlignmentModified() && merge) { destAl = restClient.av.getAlignment(); - destCs = restClient.av.getColumnSelection(); - resultDest - .add(restClient.isShowResultsInNewView() ? AddDataTo.newView - : AddDataTo.currentView); + destHCs = restClient.av.getAlignment().getHiddenColumns(); + resultDest.add(restClient.isShowResultsInNewView() + ? AddDataTo.newView + : AddDataTo.currentView); destPanels.add(restClient.recoverAlignPanelForView()); } else @@ -740,15 +767,15 @@ public class RestJobThread extends AWSThread newAlignment = true; // recreate the input alignment data Object[] idat = input - .getAlignmentAndColumnSelection(gapCharacter); + .getAlignmentAndHiddenColumns(gapCharacter); destAl = new Alignment((SequenceI[]) idat[0]); - destCs = (ColumnSelection) idat[1]; + destHCs = (HiddenColumns) idat[1]; resultDest.add(AddDataTo.newAlignment); // but do not add to the alignment panel list - since we need to // create a whole new alignFrame set. } destAls.add(destAl); - destColsel.add(destCs); + destColsel.add(destHCs); } } else @@ -761,13 +788,13 @@ public class RestJobThread extends AWSThread { // TODO: decide if multiple multiple alignments returned by // non-vseparable services are allowed. - Cache.log - .warn("dealing with multiple alignment products returned by non-vertically separable service."); + Cache.log.warn( + "dealing with multiple alignment products returned by non-vertically separable service."); } // recover reference to last alignment created for this rest frame // ready for extension destAl = destAls.get(als); - destCs = destColsel.get(als); + destHCs = destColsel.get(als); } else { @@ -796,14 +823,16 @@ public class RestJobThread extends AWSThread newview = input.getUpdatedView(rseqs, orders, gapCharacter); } destAl = new Alignment((SequenceI[]) newview[0]); - destCs = (ColumnSelection) newview[1]; + destHCs = (HiddenColumns) newview[1]; newAlignment = true; // TODO create alignment from result data with propagated // references. destAls.add(destAl); - destColsel.add(destCs); + destColsel.add(destHCs); resultDest.add(AddDataTo.newAlignment); - throw new Error("Impl. Error! TODO: "); + throw new Error( + MessageManager.getString("error.implementation_error") + + "TODO: "); } } /** @@ -873,8 +902,8 @@ public class RestJobThread extends AWSThread } else { - Cache.log - .warn("Couldn't resolve original sequence for new sequence."); + Cache.log.warn( + "Couldn't resolve original sequence for new sequence."); } } if (sg.hasSeqrep()) @@ -896,8 +925,8 @@ public class RestJobThread extends AWSThread { // adjust boundaries of recovered group w.r.t. new group being // merged on to original alignment. - int start = sg.getStartRes() + contigs[ncnt], end = sg - .getEndRes() + contigs[ncnt]; + int start = sg.getStartRes() + contigs[ncnt], + end = sg.getEndRes() + contigs[ncnt]; if (start < exsg.getStartRes()) { exsg.setStartRes(start); @@ -951,14 +980,14 @@ public class RestJobThread extends AWSThread grass = groupNames.get(alan[nrj][an].groupRef.getName()); if (grass == null) { - Cache.log - .error("Couldn't relocate group referemce for group " + Cache.log.error( + "Couldn't relocate group referemce for group " + alan[nrj][an].groupRef.getName()); } } if (visAlAn == null) { - visAlAn = new ArrayList(); + visAlAn = new ArrayList<>(); } AlignmentAnnotation visan = null; for (AlignmentAnnotation v : visAlAn) @@ -978,7 +1007,8 @@ public class RestJobThread extends AWSThread visan.sequenceRef = sqass; visAlAn.add(visan); } - if (contigs[ncnt] + alan[nrj][an].annotations.length > visan.annotations.length) + if (contigs[ncnt] + + alan[nrj][an].annotations.length > visan.annotations.length) { // increase width of annotation row Annotation[] newannv = new Annotation[contigs[ncnt] @@ -1001,8 +1031,8 @@ public class RestJobThread extends AWSThread { // TODO: process each newick file, lifting over sequence refs to // current alignment, if necessary. - Cache.log - .error("Tree recovery from restjob not yet implemented."); + Cache.log.error( + "Tree recovery from restjob not yet implemented."); } } } @@ -1038,10 +1068,12 @@ public class RestJobThread extends AWSThread for (AddDataTo action : resultDest) { AlignmentI destal; - ColumnSelection destcs; - String alTitle = restClient.service.details.Action + " using " - + restClient.service.details.Name + " on " - + restClient.viewTitle; + HiddenColumns destcs; + String alTitle = MessageManager + .formatMessage("label.webservice_job_title_on", new String[] + { restClient.service.details.getAction(), + restClient.service.details.getName(), + restClient.viewTitle }); switch (action) { case newAlignment: @@ -1049,8 +1081,8 @@ public class RestJobThread extends AWSThread destcs = destColsel.get(als); destaf = new AlignFrame(destal, destcs, AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT); - PaintRefresher.Refresh(destaf, destaf.getViewport() - .getSequenceSetId()); + PaintRefresher.Refresh(destaf, + destaf.getViewport().getSequenceSetId()); // todo transfer any feature settings and colouring /* * destaf.getFeatureRenderer().transferSettings(this.featureSettings); @@ -1178,8 +1210,8 @@ public class RestJobThread extends AWSThread { if (start + width < end) { - blocks[c][s] = sequenceIs[s].getSubSequence(start, start - + width); + blocks[c][s] = sequenceIs[s].getSubSequence(start, + start + width); } else { @@ -1251,7 +1283,7 @@ public class RestJobThread extends AWSThread */ public boolean isValid() { - ArrayList _warnings = new ArrayList(); + ArrayList _warnings = new ArrayList<>(); boolean validt = true; if (jobs != null) {