X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.server%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fservices%2Fimpl%2Ftest%2FTestManagerServiceImpl.java;fp=runtime%2Forg.argeo.slc.server%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fservices%2Fimpl%2Ftest%2FTestManagerServiceImpl.java;h=0000000000000000000000000000000000000000;hb=1d1bc92e4aef2b8b889d7482f91b7ed905f0fb47;hp=59b7b37db734b8b1976b27895b5663b63919955a;hpb=8c6970618e2eb9a967665964e6b22ae585b74b63;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/test/TestManagerServiceImpl.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/test/TestManagerServiceImpl.java
deleted file mode 100644
index 59b7b37db..000000000
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/test/TestManagerServiceImpl.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package org.argeo.slc.services.impl.test;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-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;
-import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao;
-import org.argeo.slc.dao.test.tree.TreeTestResultDao;
-import org.argeo.slc.msg.test.tree.AddTreeTestResultAttachmentRequest;
-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.process.SlcExecution;
-import org.argeo.slc.services.test.TestManagerService;
-import org.argeo.slc.test.TestRunDescriptor;
-
-/**
- * Implementation of complex operations impacting the underlying data.
- */
-public class TestManagerServiceImpl implements TestManagerService {
-	private Log log = LogFactory.getLog(getClass());
-
-	private final TreeTestResultDao treeTestResultDao;
-	private final TestRunDescriptorDao testRunDescriptorDao;
-	private final SlcExecutionDao slcExecutionDao;
-	private final TreeTestResultCollectionDao treeTestResultCollectionDao;
-
-	public TestManagerServiceImpl(TreeTestResultDao treeTestResultDao,
-			TestRunDescriptorDao testRunDescriptorDao,
-			SlcExecutionDao slcExecutionDao,
-			TreeTestResultCollectionDao treeTestResultCollectionDao) {
-		this.treeTestResultDao = treeTestResultDao;
-		this.testRunDescriptorDao = testRunDescriptorDao;
-		this.slcExecutionDao = slcExecutionDao;
-		this.treeTestResultCollectionDao = treeTestResultCollectionDao;
-	}
-
-	public void registerTestRunDescriptor(TestRunDescriptor testRunDescriptor) {
-		if (testRunDescriptor != null) {
-			if (log.isTraceEnabled())
-				log.trace("Registering test run descriptor #"
-						+ testRunDescriptor.getTestRunUuid());
-			testRunDescriptorDao.saveOrUpdate(testRunDescriptor);
-
-			// Update tree test result collection
-			// TODO: optimize
-
-			if (testRunDescriptor.getSlcExecutionUuid() != null) {
-				SlcExecution slcExecution = slcExecutionDao
-						.getSlcExecution(testRunDescriptor
-								.getSlcExecutionUuid());
-				if (slcExecution != null) {
-					String collectionId = slcExecution.getUser() != null ? slcExecution
-							.getUser()
-							: "default";
-					addResultToCollection(collectionId, testRunDescriptor
-							.getTestResultUuid());
-				}
-			} else {
-				if (log.isTraceEnabled())
-					log.trace("ResultUUID="
-							+ testRunDescriptor.getTestResultUuid());
-				addResultToCollection("default", testRunDescriptor
-						.getTestResultUuid());
-			}
-		}
-	}
-
-	public void addResultToCollection(String collectionId, String resultUuid) {
-		// TODO: improve collections
-		TreeTestResultCollection ttrc = treeTestResultCollectionDao
-				.getTestResultCollection(collectionId);
-		if (ttrc == null) {
-			ttrc = new TreeTestResultCollection(collectionId);
-			treeTestResultCollectionDao.create(ttrc);
-		}
-		treeTestResultCollectionDao.addResultToCollection(ttrc, resultUuid);
-	}
-
-	public void removeResultFromCollection(String collectionId,
-			String resultUuid) {
-		TreeTestResultCollection ttrc = treeTestResultCollectionDao
-				.getTestResultCollection(collectionId);
-		if (ttrc != null) {
-			treeTestResultCollectionDao.removeResultFromCollection(ttrc,
-					resultUuid);
-		}
-
-		// Delete collection if empty
-		// see https://www.argeo.org/bugzilla/show_bug.cgi?id=74
-		if (ttrc.getResults().size() == 0) {
-			treeTestResultCollectionDao.delete(ttrc);
-		}
-	}
-
-	public void createTreeTestResult(CreateTreeTestResultRequest msg) {
-		TreeTestResult treeTestResult = msg.getTreeTestResult();
-
-		if (log.isTraceEnabled())
-			log.trace("Creating result #" + treeTestResult.getUuid());
-		treeTestResultDao.create(treeTestResult);
-
-		registerTestRunDescriptor(msg.getTestRunDescriptor());
-
-		// FIXME: temporary hack before better collection management is found
-		if (msg.getTestRunDescriptor() == null) {
-			addResultToCollection("default", treeTestResult.getUuid());
-		}
-	}
-
-	public void addResultPart(ResultPartRequest msg) {
-		// 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());
-		// treeTestResultDao.updateAttributes(msg.getResultUuid(), msg
-		// .getAttributes());
-	}
-
-	public void closeTreeTestResult(CloseTreeTestResultRequest msg) {
-		if (log.isTraceEnabled())
-			log.trace("Closing result #" + msg.getResultUuid() + " at date "
-					+ msg.getCloseDate());
-
-		treeTestResultDao.close(msg.getResultUuid(), msg.getCloseDate());
-	}
-
-	public void addAttachment(AddTreeTestResultAttachmentRequest msg) {
-		if (log.isTraceEnabled())
-			log.trace("Adding attachment " + msg.getAttachment()
-					+ " to result #" + msg.getResultUuid());
-		treeTestResultDao.addAttachment(msg.getResultUuid(), msg
-				.getAttachment());
-
-	}
-
-}