From f04591a97eb344c6c48357976d595f0e12789afa Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 4 May 2008 19:07:07 +0000 Subject: [PATCH] Improve notifications to web services git-svn-id: https://svn.argeo.org/slc/trunk@1114 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../WebServiceSlcExecutionNotifier.java | 42 +++++++++---------- ... => WebServiceTreeTestResultNotifier.java} | 10 ++--- .../resources/org/argeo/slc/ant/build.xml | 2 + .../resources/org/argeo/slc/ws/result.xml | 3 +- 4 files changed, 29 insertions(+), 28 deletions(-) rename org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/{WebServiceSlcExecutionNotifier.java => WebServiceTreeTestResultNotifier.java} (87%) diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/process/WebServiceSlcExecutionNotifier.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/process/WebServiceSlcExecutionNotifier.java index 887a014ce..09e37122d 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/process/WebServiceSlcExecutionNotifier.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/process/WebServiceSlcExecutionNotifier.java @@ -17,47 +17,47 @@ public class WebServiceSlcExecutionNotifier implements SlcExecutionNotifier { private Log log = LogFactory.getLog(getClass()); - public void addSteps(SlcExecution slcExecution, - List additionalSteps) { - SlcExecutionStepsRequest req = new SlcExecutionStepsRequest(); - req.setSlcExecutionUuid(slcExecution.getUuid()); - req.setSteps(additionalSteps); - if (log.isTraceEnabled()) { - for (SlcExecutionStep step : additionalSteps) { - log.trace("Step " + step.getUuid() + ": " + step.logAsString()); - } - } - + public void newExecution(SlcExecution slcExecution) { + SlcExecutionRequest req = new SlcExecutionRequest(); + req.setSlcExecution(slcExecution); try { WebServiceUtils.marshalSendAndReceive(template, req); - if (log.isDebugEnabled()) - log.debug("Added steps to slc execution " + if (log.isTraceEnabled()) + log.trace("Notified creation of slc execution " + slcExecution.getUuid()); } catch (SoapFaultClientException e) { WebServiceUtils.manageSoapException(e); } } - public void newExecution(SlcExecution slcExecution) { + public void updateExecution(SlcExecution slcExecution) { SlcExecutionRequest req = new SlcExecutionRequest(); req.setSlcExecution(slcExecution); try { WebServiceUtils.marshalSendAndReceive(template, req); - if (log.isDebugEnabled()) - log.debug("Notified creation of slc execution " + if (log.isTraceEnabled()) + log.trace("Notified update of slc execution " + slcExecution.getUuid()); } catch (SoapFaultClientException e) { WebServiceUtils.manageSoapException(e); } } - public void updateExecution(SlcExecution slcExecution) { - SlcExecutionRequest req = new SlcExecutionRequest(); - req.setSlcExecution(slcExecution); + public void addSteps(SlcExecution slcExecution, + List additionalSteps) { + SlcExecutionStepsRequest req = new SlcExecutionStepsRequest(); + req.setSlcExecutionUuid(slcExecution.getUuid()); + req.setSteps(additionalSteps); + if (log.isTraceEnabled()) { + for (SlcExecutionStep step : additionalSteps) { + log.trace("Step " + step.getUuid() + ": " + step.logAsString()); + } + } + try { WebServiceUtils.marshalSendAndReceive(template, req); - if (log.isDebugEnabled()) - log.debug("Notified update of slc execution " + if (log.isTraceEnabled()) + log.trace("Added steps to slc execution " + slcExecution.getUuid()); } catch (SoapFaultClientException e) { WebServiceUtils.manageSoapException(e); diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/WebServiceSlcExecutionNotifier.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/WebServiceTreeTestResultNotifier.java similarity index 87% rename from org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/WebServiceSlcExecutionNotifier.java rename to org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/WebServiceTreeTestResultNotifier.java index 0d51d2237..698c24cb7 100644 --- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/WebServiceSlcExecutionNotifier.java +++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/WebServiceTreeTestResultNotifier.java @@ -1,7 +1,5 @@ package org.argeo.slc.core.test.tree; -import java.util.List; - import org.springframework.ws.client.core.WebServiceTemplate; import org.springframework.ws.soap.client.SoapFaultClientException; @@ -10,15 +8,12 @@ import org.apache.commons.logging.LogFactory; import org.argeo.slc.core.test.TestResultListener; import org.argeo.slc.core.test.TestResultPart; -import org.argeo.slc.dao.test.tree.TreeTestResultDao; -import org.argeo.slc.msg.process.SlcExecutionRequest; -import org.argeo.slc.msg.process.SlcExecutionStepsRequest; import org.argeo.slc.msg.test.tree.CloseTreeTestResultRequest; import org.argeo.slc.msg.test.tree.CreateTreeTestResultRequest; import org.argeo.slc.msg.test.tree.ResultPartRequest; import org.argeo.slc.ws.client.WebServiceUtils; -public class WebServiceSlcExecutionNotifier implements +public class WebServiceTreeTestResultNotifier implements TestResultListener { private WebServiceTemplate template; private Boolean onlyOnClose = false; @@ -27,6 +22,9 @@ public class WebServiceSlcExecutionNotifier implements public void resultPartAdded(TreeTestResult testResult, TestResultPart testResultPart) { + if (onlyOnClose) + return; + try { if (testResult.getResultParts().size() == 1) { CreateTreeTestResultRequest req = new CreateTreeTestResultRequest( diff --git a/org.argeo.slc.core/src/test/resources/org/argeo/slc/ant/build.xml b/org.argeo.slc.core/src/test/resources/org/argeo/slc/ant/build.xml index 950e87024..f2ea5c52c 100644 --- a/org.argeo.slc.core/src/test/resources/org/argeo/slc/ant/build.xml +++ b/org.argeo.slc.core/src/test/resources/org/argeo/slc/ant/build.xml @@ -12,5 +12,7 @@ + + \ No newline at end of file diff --git a/org.argeo.slc.core/src/test/resources/org/argeo/slc/ws/result.xml b/org.argeo.slc.core/src/test/resources/org/argeo/slc/ws/result.xml index 27eb95534..b2cb1ff94 100644 --- a/org.argeo.slc.core/src/test/resources/org/argeo/slc/ws/result.xml +++ b/org.argeo.slc.core/src/test/resources/org/argeo/slc/ws/result.xml @@ -20,9 +20,10 @@ + class="org.argeo.slc.core.test.tree.WebServiceTreeTestResultNotifier"> + \ No newline at end of file -- 2.39.2