From c129ced90007016c50e3b66d773d00a96cc6e728 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 28 Jun 2008 10:09:19 +0000 Subject: [PATCH 1/1] Improve web services git-svn-id: https://svn.argeo.org/slc/trunk@1304 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../test/impl/TestManagerServiceImpl.java | 6 ------ .../slc/ws/process/SlcExecutionRequestEp.java | 13 +++++++++---- .../ws/process/SlcExecutionStepsRequestEp.java | 13 +++---------- .../test/tree/CloseTreeTestResultRequestEp.java | 4 ++-- .../test/tree/CreateTreeTestResultRequestEp.java | 4 ++-- .../slc/ws/test/tree/ResultPartRequestEp.java | 15 ++++++++------- 6 files changed, 24 insertions(+), 31 deletions(-) diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/services/test/impl/TestManagerServiceImpl.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/services/test/impl/TestManagerServiceImpl.java index 8c1d109c2..b9a3a7045 100644 --- a/org.argeo.slc.server/src/main/java/org/argeo/slc/services/test/impl/TestManagerServiceImpl.java +++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/services/test/impl/TestManagerServiceImpl.java @@ -2,10 +2,8 @@ package org.argeo.slc.services.test.impl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.argeo.slc.core.process.SlcExecution; import org.argeo.slc.core.test.TestRunDescriptor; -import org.argeo.slc.core.test.tree.TreeTestResult; import org.argeo.slc.core.test.tree.TreeTestResultCollection; import org.argeo.slc.dao.process.SlcExecutionDao; import org.argeo.slc.dao.test.TestRunDescriptorDao; @@ -33,10 +31,6 @@ public class TestManagerServiceImpl implements TestManagerService { public void registerTestRunDescriptor(TestRunDescriptor testRunDescriptor) { if (testRunDescriptor != null) { - if (log.isDebugEnabled()) - log.debug("Updating test run descriptor with id " - + testRunDescriptor.getTestRunUuid()); - testRunDescriptorDao.saveOrUpdate(testRunDescriptor); // Update tree test result collection diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionRequestEp.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionRequestEp.java index 3c41d9afd..10a7aab22 100644 --- a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionRequestEp.java +++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionRequestEp.java @@ -29,14 +29,14 @@ public class SlcExecutionRequestEp extends AbstractMarshallingPayloadEndpoint { SlcExecution slcExecution = msg.getSlcExecution(); if (slcExecutionDao.getSlcExecution(slcExecution.getUuid()) == null) { - if (log.isDebugEnabled()) - log.debug("Creating SLC execution #" + if (log.isTraceEnabled()) + log.trace("Creating SLC execution #" + slcExecution.getUuid()); slcExecutionDao.create(slcExecution); } else { - if (log.isDebugEnabled()) - log.debug("Updating SLC execution #" + if (log.isTraceEnabled()) + log.trace("Updating SLC execution #" + slcExecution.getUuid()); slcExecutionDao.update(slcExecution); @@ -52,6 +52,11 @@ public class SlcExecutionRequestEp extends AbstractMarshallingPayloadEndpoint { + msg.getSlcExecutionUuid()); slcExecution.setStatus(msg.getNewStatus()); + + if (log.isTraceEnabled()) + log.trace("Updating status for SLC execution #" + + slcExecution.getUuid()); + slcExecutionDao.update(slcExecution); return null; } else { diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionStepsRequestEp.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionStepsRequestEp.java index 738c2c699..c15b4de75 100644 --- a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionStepsRequestEp.java +++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/process/SlcExecutionStepsRequestEp.java @@ -1,17 +1,11 @@ package org.argeo.slc.ws.process; -import java.util.List; - -import org.springframework.ws.server.endpoint.AbstractMarshallingPayloadEndpoint; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - -import org.argeo.slc.core.SlcException; -import org.argeo.slc.core.process.SlcExecution; import org.argeo.slc.core.process.SlcExecutionStep; import org.argeo.slc.dao.process.SlcExecutionDao; import org.argeo.slc.msg.process.SlcExecutionStepsRequest; +import org.springframework.ws.server.endpoint.AbstractMarshallingPayloadEndpoint; public class SlcExecutionStepsRequestEp extends AbstractMarshallingPayloadEndpoint { @@ -37,11 +31,10 @@ public class SlcExecutionStepsRequestEp extends log.trace("Step " + step.getUuid() + " (in SLC execution #" + uuid + ")"); } + log.trace("Adding " + msg.getSteps().size() + + " steps to SLC execution #" + uuid); } - log.debug("Adding " + msg.getSteps().size() - + " steps to SLC execution #" + uuid); - slcExecutionDao.addSteps(uuid, msg.getSteps()); return null; } catch (Exception e) { diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/CloseTreeTestResultRequestEp.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/CloseTreeTestResultRequestEp.java index 4c42b6e1c..507dc3440 100644 --- a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/CloseTreeTestResultRequestEp.java +++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/CloseTreeTestResultRequestEp.java @@ -23,8 +23,8 @@ public class CloseTreeTestResultRequestEp extends protected Object invokeInternal(Object requestObject) throws Exception { CloseTreeTestResultRequest msg = (CloseTreeTestResultRequest) requestObject; - if (log.isDebugEnabled()) - log.debug("Closing result #" + msg.getResultUuid() + " at date " + if (log.isTraceEnabled()) + log.trace("Closing result #" + msg.getResultUuid() + " at date " + msg.getCloseDate()); treeTestResultDao.close(msg.getResultUuid(), msg.getCloseDate()); diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/CreateTreeTestResultRequestEp.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/CreateTreeTestResultRequestEp.java index a250703bb..7ffa5c081 100644 --- a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/CreateTreeTestResultRequestEp.java +++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/CreateTreeTestResultRequestEp.java @@ -25,8 +25,8 @@ public class CreateTreeTestResultRequestEp extends CreateTreeTestResultRequest msg = (CreateTreeTestResultRequest) requestObject; TreeTestResult treeTestResult = msg.getTreeTestResult(); - if (log.isDebugEnabled()) - log.debug("Creating result #" + treeTestResult.getUuid()); + if (log.isTraceEnabled()) + log.trace("Creating result #" + treeTestResult.getUuid()); treeTestResultDao.create(treeTestResult); diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/ResultPartRequestEp.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/ResultPartRequestEp.java index e80808ee2..3dcff1949 100644 --- a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/ResultPartRequestEp.java +++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/ResultPartRequestEp.java @@ -2,9 +2,6 @@ package org.argeo.slc.ws.test.tree; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.slc.core.SlcException; -import org.argeo.slc.core.test.tree.PartSubList; -import org.argeo.slc.core.test.tree.TreeTestResult; import org.argeo.slc.dao.test.tree.TreeTestResultDao; import org.argeo.slc.msg.test.tree.ResultPartRequest; import org.argeo.slc.services.test.TestManagerService; @@ -27,16 +24,20 @@ public class ResultPartRequestEp extends AbstractMarshallingPayloadEndpoint { protected Object invokeInternal(Object requestObject) throws Exception { ResultPartRequest msg = (ResultPartRequest) requestObject; + if (log.isTraceEnabled()) + log.trace("Registering test run descriptor #" + + msg.getTestRunDescriptor().getTestRunUuid()); + testManagerService .registerTestRunDescriptor(msg.getTestRunDescriptor()); + if (log.isTraceEnabled()) + log.trace("Adding result part to test result #" + + msg.getResultUuid()); + treeTestResultDao.addResultPart(msg.getResultUuid(), msg.getPath(), msg .getResultPart(), msg.getRelatedElements()); - if (log.isDebugEnabled()) - log.debug("Added result part to test result #" - + msg.getResultUuid()); - return null; } -- 2.39.2