Adapt web services to lazy loading

[gpl/argeo-slc.git] / org.argeo.slc.server / src / main / java / org / argeo / slc / ws / process / SlcExecutionStepsRequestEp.java

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 945ee80791f05e456014b418ea626eadb09226db..738c2c69966afc0fc7acaa56a6261da5747d5738 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,5 +1,7 @@
 package org.argeo.slc.ws.process;
 
+import java.util.List;
+
 import org.springframework.ws.server.endpoint.AbstractMarshallingPayloadEndpoint;
 
 import org.apache.commons.logging.Log;
@@ -7,6 +9,7 @@ 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;
 
@@ -27,20 +30,22 @@ public class SlcExecutionStepsRequestEp extends
                try {
                        SlcExecutionStepsRequest msg = (SlcExecutionStepsRequest) requestObject;
                        uuid = msg.getSlcExecutionUuid();
-                       SlcExecution slcExecution = slcExecutionDao.getSlcExecution(uuid);
-
-                       if (slcExecution == null)
-                               throw new SlcException("Could not find slc execution " + uuid);
-
-                       slcExecution.getSteps().addAll(msg.getSteps());
-
-                       slcExecutionDao.update(slcExecution);
-                       log.debug("Added " + msg.getSteps().size()
-                                       + " steps to SlcExecution with uuid "
-                                       + slcExecution.getUuid());
+                       if (log.isTraceEnabled()) {
+                               log.trace("Trying to add additional steps to SLC execution #"
+                                               + uuid + ":");
+                               for (SlcExecutionStep step : msg.getSteps()) {
+                                       log.trace("Step " + step.getUuid() + " (in SLC execution #"
+                                                       + uuid + ")");
+                               }
+                       }
+
+                       log.debug("Adding " + msg.getSteps().size()
+                                       + " steps to SLC execution #" + uuid);
+
+                       slcExecutionDao.addSteps(uuid, msg.getSteps());
                        return null;
                } catch (Exception e) {
-                       log.error("Could not update SlcExecution " + uuid
+                       log.error("Could not update SLC execution #" + uuid
                                        + " with additional steps", e);
                        throw e;
                }