From ba64c7c41c55c3db96819ef4ed799339658ee472 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 26 Jun 2008 16:18:47 +0000
Subject: [PATCH] Remove unused DAOs

git-svn-id: https://svn.argeo.org/slc/trunk@1288 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../tree/htmlreport/FullHtmlTreeReport.java   | 168 --------------
 .../core/test/tree/htmlreport/ResultPage.java | 207 ------------------
 .../test/tree/htmlreport/ResultsList.java     |  63 ------
 .../core/test/tree/htmlreport/package.html    |   6 -
 .../slc/dao/structure/SimpleSElementDao.java  |   5 -
 .../org/argeo/slc/dao/structure/package.html  |   6 -
 .../slc/dao/structure/tree/TreeSPathDao.java  |  11 -
 .../dao/structure/tree/TreeSRegistryDao.java  |  25 ---
 .../argeo/slc/dao/structure/tree/package.html |   6 -
 9 files changed, 497 deletions(-)
 delete mode 100644 org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/FullHtmlTreeReport.java
 delete mode 100644 org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/ResultPage.java
 delete mode 100644 org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/ResultsList.java
 delete mode 100644 org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/package.html
 delete mode 100644 org.argeo.slc.core/src/main/java/org/argeo/slc/dao/structure/SimpleSElementDao.java
 delete mode 100644 org.argeo.slc.core/src/main/java/org/argeo/slc/dao/structure/package.html
 delete mode 100644 org.argeo.slc.core/src/main/java/org/argeo/slc/dao/structure/tree/TreeSPathDao.java
 delete mode 100644 org.argeo.slc.core/src/main/java/org/argeo/slc/dao/structure/tree/TreeSRegistryDao.java
 delete mode 100644 org.argeo.slc.core/src/main/java/org/argeo/slc/dao/structure/tree/package.html

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/FullHtmlTreeReport.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/FullHtmlTreeReport.java
deleted file mode 100644
index 6e9e496a8..000000000
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/FullHtmlTreeReport.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package org.argeo.slc.core.test.tree.htmlreport;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.SimpleDateFormat;
-import java.util.Comparator;
-import java.util.List;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.argeo.slc.core.SlcException;
-import org.argeo.slc.core.structure.StructureAware;
-import org.argeo.slc.core.structure.StructurePath;
-import org.argeo.slc.core.structure.StructureRegistry;
-import org.argeo.slc.core.structure.tree.TreeSPath;
-import org.argeo.slc.core.test.TestReport;
-import org.argeo.slc.core.test.TestResult;
-import org.argeo.slc.core.test.tree.TreeTestResult;
-import org.argeo.slc.dao.structure.tree.TreeSRegistryDao;
-import org.argeo.slc.dao.test.TestResultDao;
-
-/**
- * Basic implementation of TestReport generating static HTML pages. If a
- * <code>TestResultDao</code> is passed, all the data is dumped, otherwise
- * only the passed <code>TestResult</code>.
- */
-public class FullHtmlTreeReport implements TestReport, StructureAware {
-	private static final Log log = LogFactory.getLog(FullHtmlTreeReport.class);
-	SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
-
-	private TestResultDao testResultDao;
-	private TreeSRegistryDao treeSRegistryDao;
-	private File reportDir;
-
-	private StructureRegistry localRegistry;
-
-	public void generateTestReport(TestResult testResult) {
-
-		if (testResultDao == null) {
-			if (testResult == null)
-				throw new SlcException(
-						"Cannot generate report without DAO or result instance.");
-
-			TreeTestResult result = (TreeTestResult) testResult;
-			ResultPage page = new ResultPage(this, result);
-			page.generate(getRegistry(result));
-		} else {
-			if (reportDir.exists()) {
-				// clean
-				for (File file : reportDir.listFiles()) {
-					file.delete();
-				}
-			}
-			reportDir.mkdirs();
-
-			resourceToFile("index.html");
-
-			ResultsList index = new ResultsList(this);
-			List<TestResult> list = testResultDao.listTestResults();
-			SortedSet<TestResult> sortedSet = new TreeSet<TestResult>(
-					new Comparator<TestResult>() {
-
-						public int compare(TestResult o1, TestResult o2) {
-							if (o1.getCloseDate() == null
-									|| o2.getCloseDate() == null)
-								return 0;
-							// inverse date order (last first)
-							return o2.getCloseDate().compareTo(
-									o1.getCloseDate());
-						}
-
-					});
-			sortedSet.addAll(list);
-			for (TestResult testRes : sortedSet) {
-				TreeTestResult result = (TreeTestResult) testRes;
-
-				index.addTestResult(result);
-				ResultPage page = new ResultPage(this, result);
-				page.generate(getRegistry(result));
-			}
-			index.close();
-		}
-		log.info("Generated HTML test result report to " + reportDir);
-	}
-
-	/**
-	 * Generates a result file location based on the report dir and the id of
-	 * the test result.
-	 */
-	protected File getResultFile(TreeTestResult result) {
-		return new File(reportDir.getPath() + File.separator + "slc-result-"
-				+ result.getUuid() + ".html");
-	}
-
-	/** Sets the DAO to use to extract all data. */
-	public void setTestResultDao(TestResultDao testResultDao) {
-		this.testResultDao = testResultDao;
-	}
-
-	/** Sets the tree structure registry DAO. */
-	public void setTreeSRegistryDao(TreeSRegistryDao treeSRegistryDao) {
-		this.treeSRegistryDao = treeSRegistryDao;
-	}
-
-	/** Sets the directory where to generate all the data. */
-	public void setReportDir(File reportDir) {
-		this.reportDir = reportDir;
-	}
-
-	private StructureRegistry getRegistry(TreeTestResult result) {
-		StructureRegistry registry = null;
-		if (treeSRegistryDao != null) {
-			TreeSPath path = result.getResultParts().firstKey();
-			registry = treeSRegistryDao.getActiveTreeSRegistry();
-		}
-		if (registry == null) {
-			registry = localRegistry;
-		}
-		if (registry == null) {
-			throw new SlcException("No structure registry available");
-		}
-		return registry;
-	}
-
-	public void notifyCurrentPath(StructureRegistry registry, StructurePath path) {
-		this.localRegistry = registry;
-	}
-
-	File getReportDir() {
-		return reportDir;
-	}
-
-	void addStyles(StringBuffer buf) {
-		try {
-			buf.append("<style type=\"text/css\">\n");
-			InputStream in = FullHtmlTreeReport.class
-					.getResourceAsStream("style.css");
-			String styles = IOUtils.toString(in);
-			IOUtils.closeQuietly(in);
-			buf.append(styles);
-			buf.append("\n</style>\n");
-		} catch (IOException e) {
-			throw new SlcException("Cannot load styles", e);
-		}
-	}
-
-	private void resourceToFile(String resourceName) {
-		try {
-			File file = new File(getReportDir() + File.separator + resourceName);
-			InputStream in = FullHtmlTreeReport.class
-					.getResourceAsStream(resourceName);
-			FileOutputStream out = new FileOutputStream(file);
-			IOUtils.copy(in, out);
-			IOUtils.closeQuietly(in);
-			IOUtils.closeQuietly(out);
-		} catch (Exception e) {
-			throw new SlcException("Cannot load resource", e);
-		}
-
-	}
-
-}
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/ResultPage.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/ResultPage.java
deleted file mode 100644
index 4cbb82070..000000000
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/ResultPage.java
+++ /dev/null
@@ -1,207 +0,0 @@
-package org.argeo.slc.core.test.tree.htmlreport;
-
-import java.io.IOException;
-import java.util.Date;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.slc.core.structure.StructureElement;
-import org.argeo.slc.core.structure.StructureRegistry;
-import org.argeo.slc.core.structure.tree.TreeSPath;
-import org.argeo.slc.core.test.SimpleResultPart;
-import org.argeo.slc.core.test.TestResultPart;
-import org.argeo.slc.core.test.TestStatus;
-import org.argeo.slc.core.test.tree.PartSubList;
-import org.argeo.slc.core.test.tree.TreeTestResult;
-
-class ResultPage {
-	private final static Log log = LogFactory.getLog(ResultPage.class);
-
-	private final FullHtmlTreeReport report;
-	private final TreeTestResult result;
-
-	ResultPage(FullHtmlTreeReport report, TreeTestResult result) {
-		this.report = report;
-		this.result = result;
-	}
-
-	/**
-	 * Generates a result page for one test result
-	 * 
-	 * @param file
-	 *            file to which generate the HTML
-	 * @param result
-	 *            the result to dump
-	 */
-	protected void generate(StructureRegistry<TreeSPath> registry) {
-		StringBuffer buf = new StringBuffer("");
-		buf.append("<html>\n");
-		buf.append("<header>");
-		buf.append("<title>Result #").append(result.getUuid());
-		buf.append("</title>\n");
-		report.addStyles(buf);
-		buf.append("</header>\n");
-
-		buf.append("<body>\n");
-
-		// Header
-		buf.append("<a name=\"top\"/>\n");
-		buf.append("<h1>Result #").append(result.getUuid()).append("</h1>\n");
-		Date closeDate = result.getCloseDate();
-		if (closeDate == null) {
-			buf.append("[Not closed]");
-		} else {
-			buf.append(report.sdf.format(closeDate));
-		}
-
-		// TOC
-		generateToc(buf, registry);
-
-		generatePartsList(buf, registry);
-
-		buf.append("</body>");
-		buf.append("</html>");
-
-		try {
-			FileUtils.writeStringToFile(report.getResultFile(result), buf
-					.toString());
-		} catch (IOException e) {
-			log.error("Could not save result page.", e);
-		}
-	}
-
-	private void generateToc(StringBuffer buf,
-			StructureRegistry<TreeSPath> registry) {
-		buf.append("<h2>Overview</h2>\n");
-		SortedMap<TreeSPath, Integer> toc = new TreeMap<TreeSPath, Integer>();
-		for (TreeSPath path : result.getResultParts().keySet()) {
-			PartSubList subList = (PartSubList) result.getResultParts().get(
-					path);
-			boolean isFailed = false;
-			for (TestResultPart part : subList.getParts()) {
-				if (!part.getStatus().equals(TestStatus.PASSED)) {
-					isFailed = true;
-					break;
-				}
-			}
-			fillToc(toc, path, isFailed);
-		}
-
-		buf.append("<table border=\"0\">\n");
-		for (TreeSPath path : toc.keySet()) {
-			boolean inResult = result.getResultParts().containsKey(path);
-			boolean isFailed = !toc.get(path).equals(TestStatus.PASSED);
-
-			buf.append("<tr><td class=\"").append(
-					isFailed ? "failed" : "passed").append("\">");
-			int depth = path.getDepth();
-			for (int i = 0; i < depth; i++) {
-				buf.append("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
-			}
-
-			if (inResult) {
-				buf.append("<a href=\"#").append(anchor(path)).append(
-						"\" class=\"").append(isFailed ? "failed" : "passed")
-						.append("\"><b>");
-			}
-			if (registry != null) {
-				StructureElement element = registry.getElement(path);
-				if (element != null) {
-					buf.append(element.getLabel());
-				} else {
-					buf.append(path.getName());
-				}
-			}
-			if (inResult) {
-				buf.append("</b></a>");
-			}
-			buf.append("</td></tr>\n");
-		}
-		buf.append("</table>\n");
-		buf.append("<hr/>\n");
-	}
-
-	private void generatePartsList(StringBuffer buf,
-			StructureRegistry<TreeSPath> registry) {
-		for (TreeSPath path : result.getResultParts().keySet()) {
-			buf.append("<p>\n");
-			buf.append("<a name=\"").append(anchor(path)).append("\"></a>");
-			buf.append("<h2>");
-			describedPath(path, registry, buf);
-			buf.append("</h2>");
-
-			PartSubList subList = (PartSubList) result.getResultParts().get(
-					path);
-			buf.append("<table border=0>\n");
-			int displayedIndex = 1;// for display only
-			for (TestResultPart part : subList.getParts()) {
-				SimpleResultPart sPart = (SimpleResultPart) part;
-				buf.append("Related Test Run Id:").append(
-						sPart.getTestRunUuid()).append("<br/>\n");
-				String clss = "";
-				if (sPart.getStatus().equals(TestStatus.PASSED)) {
-					clss = "passed";
-				} else {
-					clss = "failed";
-				}
-				buf.append("<tr>");
-				buf.append("<td><b>").append(displayedIndex)
-						.append("</b></td>");
-				buf.append("<td class=\"").append(clss).append("\">");
-
-				buf.append(sPart.getMessage());
-				if (sPart.getStatus().equals(TestStatus.ERROR)) {
-					buf
-							.append("<p><b>An unexpected error prevented the test to run properly.</b>");
-					buf.append(sPart.getExceptionMessage());
-					buf.append("</p>");
-				}
-				buf.append("</td>");
-				buf.append("</tr>\n");
-
-				displayedIndex++;
-			}
-			buf.append("</table>\n");
-			buf.append("<a class=\"nav\" href=\"#top\">top</a>\n");
-			buf.append("<hr/>\n");
-		}
-	}
-
-	private void fillToc(SortedMap<TreeSPath, Integer> toc, TreeSPath path,
-			boolean isFailed) {
-		if (isFailed) {
-			toc.put(path, TestStatus.FAILED);
-		} else {
-			if (!toc.containsKey(path)) {
-				toc.put(path, TestStatus.PASSED);
-			}
-		}
-
-		if (path.getParent() != null) {
-			fillToc(toc, path.getParent(), isFailed);
-		}
-	}
-
-	private String anchor(TreeSPath path) {
-		return path.getAsUniqueString().replace(path.getSeparator(), '_');
-	}
-
-	private void describedPath(TreeSPath path,
-			StructureRegistry<TreeSPath> registry, StringBuffer buf) {
-		// StringBuffer buf = new StringBuffer("");
-		if (path.getParent() != null) {
-			describedPath(path.getParent(), registry, buf);
-		}
-		String description = path.getName();
-		if (registry != null) {
-			StructureElement element = registry.getElement(path);
-			if (element != null) {
-				description = element.getLabel();
-			}
-		}
-		buf.append('/').append(description);
-	}
-}
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/ResultsList.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/ResultsList.java
deleted file mode 100644
index 09895d454..000000000
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/ResultsList.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.argeo.slc.core.test.tree.htmlreport;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.Date;
-
-import org.argeo.slc.core.test.tree.TreeTestResult;
-
-class ResultsList {
-	private final FullHtmlTreeReport report;
-	private final StringBuffer buf = new StringBuffer("");
-
-	ResultsList(FullHtmlTreeReport report) {
-		this.report = report;
-
-		buf.append("<html><header><title>Results</title></header><body>");
-		buf.append("<header>");
-		buf.append("<title>Results</title>\n");
-		report.addStyles(buf);
-		buf.append("</header>\n");
-		buf.append("<body>\n");
-
-		buf.append("<h1>Results</h1>\n");
-		buf.append("<table border=\"0\" cellspacing=\"1\">\n");
-		buf.append("<tr><th>Date</th><th>Result Id</th></tr>\n");
-	}
-
-	void addTestResult(TreeTestResult result) {
-		buf.append("<tr>\n");
-		// Date
-		buf.append("<td>");
-		Date closeDate = result.getCloseDate();
-		if (closeDate == null) {
-			buf.append("[Not closed]");
-		} else {
-			buf.append(report.sdf.format(closeDate));
-		}
-		buf.append("</td>\n");
-		// Id and link
-		buf.append("<td><a class=\"nav\" href=\"");
-		buf.append(report.getResultFile(result).getName());
-		buf.append("\" target=\"main\">#");
-		buf.append(result.getUuid()).append("</a></td>\n");
-
-		buf.append("</tr>\n");
-	}
-
-	void close() {
-		buf.append("</table>\n</body></html>");
-
-		try {
-			FileWriter writer = new FileWriter(report.getReportDir().getPath()
-					+ File.separator + "slc-resultsList.html");
-			writer.write(buf.toString());
-			writer.close();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-
-	}
-
-}
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/package.html b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/package.html
deleted file mode 100644
index b10bc3d6f..000000000
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/htmlreport/package.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<head></head>
-<body>
-Static HTML report for tree based test results.
-</body>
-</html>
\ No newline at end of file
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/structure/SimpleSElementDao.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/structure/SimpleSElementDao.java
deleted file mode 100644
index bed950ff3..000000000
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/structure/SimpleSElementDao.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.argeo.slc.dao.structure;
-
-public interface SimpleSElementDao {
-
-}
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/structure/package.html b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/structure/package.html
deleted file mode 100644
index f8b5ae763..000000000
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/structure/package.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<head></head>
-<body>
-DAOs for the core structure objects.
-</body>
-</html>
\ No newline at end of file
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/structure/tree/TreeSPathDao.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/structure/tree/TreeSPathDao.java
deleted file mode 100644
index 0ebca0d8c..000000000
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/structure/tree/TreeSPathDao.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.argeo.slc.dao.structure.tree;
-
-import org.argeo.slc.core.structure.tree.TreeSPath;
-
-public interface TreeSPathDao {
-	public void create(TreeSPath path);
-
-	public TreeSPath getTreeSPath(String pathString);
-
-	public TreeSPath getOrCreate(TreeSPath pathTransient);
-}
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/structure/tree/TreeSRegistryDao.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/structure/tree/TreeSRegistryDao.java
deleted file mode 100644
index 62c9bb444..000000000
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/structure/tree/TreeSRegistryDao.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.argeo.slc.dao.structure.tree;
-
-import org.argeo.slc.core.structure.StructureRegistry;
-import org.argeo.slc.core.structure.tree.TreeSPath;
-import org.argeo.slc.core.structure.tree.TreeSRegistry;
-
-/**
- * DAO for tree-base structure registry.
- * 
- * @see TreeSRegistry
- */
-public interface TreeSRegistryDao {
-	/** Gets the TreeSRegistry which has the same root path as the provided path. */
-	public TreeSRegistry getActiveTreeSRegistry();
-
-	/** Creates a new registry. */
-	public void create(TreeSRegistry registry);
-
-	/** Updates an existing registry. */
-	public void update(TreeSRegistry registry);
-
-	/** Sync with local registry */
-	public void syncPath(TreeSRegistry registry,
-			StructureRegistry<TreeSPath> localRegistry, TreeSPath path);
-}
diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/structure/tree/package.html b/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/structure/tree/package.html
deleted file mode 100644
index b8cd81210..000000000
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/dao/structure/tree/package.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<head></head>
-<body>
-DAOs for the tree-based structure objects.
-</body>
-</html>
\ No newline at end of file
-- 
2.39.2