Improve web services

git-svn-id: https://svn.argeo.org/slc/trunk@1304 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

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 8c1d109c295e5485ff14655f6d0e1e3a77cdb542..b9a3a7045b6a14e0dad8c8950b141443d365876a 100644 (file)
--- 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;
 \r
 import org.apache.commons.logging.Log;\r
 import org.apache.commons.logging.LogFactory;\r
-\r
 import org.argeo.slc.core.process.SlcExecution;\r
 import org.argeo.slc.core.test.TestRunDescriptor;\r
-import org.argeo.slc.core.test.tree.TreeTestResult;\r
 import org.argeo.slc.core.test.tree.TreeTestResultCollection;\r
 import org.argeo.slc.dao.process.SlcExecutionDao;\r
 import org.argeo.slc.dao.test.TestRunDescriptorDao;\r
@@ -33,10 +31,6 @@ public class TestManagerServiceImpl implements TestManagerService {
 \r
        public void registerTestRunDescriptor(TestRunDescriptor testRunDescriptor) {\r
                if (testRunDescriptor != null) {\r
-                       if (log.isDebugEnabled())\r
-                               log.debug("Updating test run descriptor with id "\r
-                                               + testRunDescriptor.getTestRunUuid());\r
-\r
                        testRunDescriptorDao.saveOrUpdate(testRunDescriptor);\r
 \r
                        // Update tree test result collection\r

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 3c41d9afd5e7d706885a3328a80ccbfd98fec96e..10a7aab22d3edcecd4c76b0541292aab0c42771b 100644 (file)
--- 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 738c2c69966afc0fc7acaa56a6261da5747d5738..c15b4de758eb1a352bda27a985f4ea75a26af1c7 100644 (file)
--- 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 4c42b6e1c68d02f61a4818c0859b68c6eeef2cd9..507dc34409e2dec99b3ddbdf051cfbb6d46e7af5 100644 (file)
--- 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 a250703bbbf26de5761ee2986ff081c55b1c6ebf..7ffa5c081a8d080a1abb87d196a43903c113b280 100644 (file)
--- 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 e80808ee2c0a709a54be9f2cc670e53317748282..3dcff1949177b40a679c27a7919de131969ee265 100644 (file)
--- 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;
        }