From b5da0e8130636aaa7680b76eaccff8df58de9bbb Mon Sep 17 00:00:00 2001 From: jprocter Date: Thu, 2 Aug 2012 12:53:01 +0100 Subject: [PATCH] JWS-47 override custom/preset analize methods so the input can be validated appropriately for AACons --- webservices/compbio/ws/server/AAConWS.java | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/webservices/compbio/ws/server/AAConWS.java b/webservices/compbio/ws/server/AAConWS.java index 7f8b2de..8dce707 100644 --- a/webservices/compbio/ws/server/AAConWS.java +++ b/webservices/compbio/ws/server/AAConWS.java @@ -33,7 +33,10 @@ import compbio.engine.client.ConfiguredExecutable; import compbio.metadata.ChunkHolder; import compbio.metadata.JobSubmissionException; import compbio.metadata.LimitExceededException; +import compbio.metadata.Option; +import compbio.metadata.Preset; import compbio.metadata.UnsupportedRuntimeException; +import compbio.metadata.WrongParameterException; import compbio.runner.conservation.AACon; @WebService(endpointInterface = "compbio.data.msa.SequenceAnnotation", targetNamespace = JABAService.V2_SERVICE_NAMESPACE, serviceName = "AAConWS") @@ -70,6 +73,24 @@ public class AAConWS extends SequenceAnnotationService } @Override + public String customAnalize(List sequences, + List> options) throws UnsupportedRuntimeException, + LimitExceededException, JobSubmissionException, + WrongParameterException { + WSUtil.validateAAConInput(sequences); + return super.customAnalize(sequences, options); + } + + @Override + public String presetAnalize(List sequences, + Preset preset) throws UnsupportedRuntimeException, + LimitExceededException, JobSubmissionException, + WrongParameterException { + WSUtil.validateAAConInput(sequences); + return super.presetAnalize(sequences, preset); + } + + @Override public ChunkHolder pullExecStatistics(String jobId, long position) { WSUtil.validateJobId(jobId); String file = Configurator.getWorkDirectory(jobId) + File.separator -- 1.7.10.2