From: Mathieu Baudier Date: Thu, 26 Jun 2008 16:18:40 +0000 (+0000) Subject: Remove unused DAOs X-Git-Tag: argeo-slc-2.1.7~2755 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=7ffec52c590ce511b476f55be4ad123418268aa0;p=gpl%2Fargeo-slc.git Remove unused DAOs git-svn-id: https://svn.argeo.org/slc/trunk@1287 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/org.argeo.slc.hibernate/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSPathDaoHibernate.java b/org.argeo.slc.hibernate/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSPathDaoHibernate.java deleted file mode 100644 index 4d72b86c0..000000000 --- a/org.argeo.slc.hibernate/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSPathDaoHibernate.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.argeo.slc.hibernate.structure.tree; - -import java.util.List; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.slc.core.structure.tree.TreeSPath; -import org.argeo.slc.core.test.tree.TreeTestResult; -import org.argeo.slc.dao.structure.tree.TreeSPathDao; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; - -/** - * The Hibernate implementation for tree-based result of the test result dao. - * - * @see TreeTestResult - */ -public class TreeSPathDaoHibernate extends HibernateDaoSupport implements - TreeSPathDao { - - private static Log log = LogFactory.getLog(TreeSPathDaoHibernate.class); - - public void create(TreeSPath path) { - createImpl(path); - } - - private void createImpl(TreeSPath path) { - if (path.getParent() != null) { - TreeSPath parent = getTreeSPath(path.getParent() - .getAsUniqueString()); - if (parent == null) { - createImpl(path.getParent()); - } - } - getHibernateTemplate().save(path); - if (log.isTraceEnabled()) - log.trace("Saved TreeSPath " + path.getAsUniqueString()); - } - - public TreeSPath getTreeSPath(String pathString) { - List list = getHibernateTemplate().find( - "from TreeSPath where asUniqueString=?", pathString); - if (list.size() == 0) { - return null; - } else { - return (TreeSPath) list.get(0); - } - } - - public TreeSPath getOrCreate(TreeSPath pathTransient) { - TreeSPath path = getTreeSPath(pathTransient.getAsUniqueString()); - if (path != null) { - return path; - } else { - create(pathTransient); - // TODO: optimize - return getTreeSPath(pathTransient.getAsUniqueString()); - } - - } - -} diff --git a/org.argeo.slc.hibernate/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistryDaoHibernate.java b/org.argeo.slc.hibernate/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistryDaoHibernate.java deleted file mode 100644 index 0c21517a3..000000000 --- a/org.argeo.slc.hibernate/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistryDaoHibernate.java +++ /dev/null @@ -1,133 +0,0 @@ -package org.argeo.slc.hibernate.structure.tree; - -import java.util.List; - -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.argeo.slc.core.structure.SimpleSElement; -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.structure.tree.TreeSRegistry; -import org.argeo.slc.dao.structure.tree.TreeSPathDao; -import org.argeo.slc.dao.structure.tree.TreeSRegistryDao; -import org.hibernate.Session; - -/** - * The Hibernate implementation for tree-based structure registry. - * - * @see TreeSRegistry - */ -public class TreeSRegistryDaoHibernate extends HibernateDaoSupport implements - TreeSRegistryDao { - - private TreeSPathDao treeSPathDao; - - private static Log log = LogFactory.getLog(TreeSRegistryDaoHibernate.class); - - public void create(TreeSRegistry registry) { - getHibernateTemplate().save(registry); - } - - public void update(TreeSRegistry registryArg) { - Session session = getSession(); - session.beginTransaction(); - TreeSRegistry registry = (TreeSRegistry) session.merge(registryArg); - session.update(registry); - session.getTransaction().commit(); - } - - public TreeSRegistry getActiveTreeSRegistry() { - List list = getHibernateTemplate().find( - "from TreeSRegistry where status=?", - TreeSRegistry.STATUS_ACTIVE); - if (list.size() == 0) { - return null; - } else { - return (TreeSRegistry) list.get(0); - } - } - - public void syncPath(TreeSRegistry registryArg, - StructureRegistry localRegistry, TreeSPath pathArg) { - Session session = getSession(); - session.beginTransaction(); - TreeSRegistry registry = (TreeSRegistry) session.merge(registryArg); - TreeSPath path = (TreeSPath) session.merge(pathArg); - if (log.isTraceEnabled()) - log.trace("Session#" + session.hashCode() + " " + session); - syncPathImpl(registry, localRegistry, path, session); - session.update(registry); - session.getTransaction().commit(); - } - - private void syncPathImpl(TreeSRegistry registry, - StructureRegistry localRegistry, TreeSPath path, - Session session) { - if (path.getParent() != null) { - TreeSPath parent = treeSPathDao.getOrCreate(path.getParent()); - syncPathImpl(registry, localRegistry, parent, session); - } - - if (log.isTraceEnabled()) - log.trace("Synchronize path " + path); - - if (registry.getElement(path) == null) { - final StructureElement element = getElement(registry, - localRegistry, path, session); - StructureElement elementPersisted = (StructureElement) session - .merge(element); - registry.register(path, elementPersisted); - // update(registry); - - if (log.isTraceEnabled()) - log.trace("No element in persisted structure for " + path - + ", merged to " + elementPersisted); - } else { - if (localRegistry != null) { - StructureElement element = getElement(registry, localRegistry, - path, session); - - if (element != null) { - StructureElement elementPersisted = (StructureElement) session - .merge(element); - registry.register(path, elementPersisted); - // update(registry); - if (log.isTraceEnabled()) - log - .trace("Update existing element in persisted structure for " - + path - + ", merged to " - + elementPersisted); - } - } - } - - } - - public void setTreeSPathDao(TreeSPathDao treeSPathDao) { - this.treeSPathDao = treeSPathDao; - } - - protected StructureElement getElement(TreeSRegistry registry, - StructureRegistry localRegistry, TreeSPath path, - Session session) { - StructureElement element; - if (localRegistry != null) { - element = localRegistry.getElement(path); - if (session.getSessionFactory() - .getClassMetadata(element.getClass()) == null) { - if (log.isTraceEnabled()) - log.trace("Replace non-hibernate element " + element - + " by a simple element."); - element = new SimpleSElement(element.getLabel()); - } - } else { - element = new SimpleSElement(path.getName()); - } - return element; - } -} diff --git a/org.argeo.slc.hibernate/src/main/java/org/argeo/slc/hibernate/structure/tree/package.html b/org.argeo.slc.hibernate/src/main/java/org/argeo/slc/hibernate/structure/tree/package.html deleted file mode 100644 index 9b5cfa237..000000000 --- a/org.argeo.slc.hibernate/src/main/java/org/argeo/slc/hibernate/structure/tree/package.html +++ /dev/null @@ -1,6 +0,0 @@ - - - -Hibernate based DAO implementations for tree-based structure objects. - - \ No newline at end of file diff --git a/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/spring/applicationContext.xml b/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/spring/applicationContext.xml index 6777a1f69..e18b8a2bc 100644 --- a/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/spring/applicationContext.xml +++ b/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/spring/applicationContext.xml @@ -22,15 +22,6 @@ org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml - - org/argeo/slc/hibernate/structure/tree/TreeSPath.hbm.xml - - - org/argeo/slc/hibernate/structure/tree/TreeSRegistry.hbm.xml - - - org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml - org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml @@ -66,16 +57,6 @@ - - - - - - diff --git a/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/structure/tree/TreeSPath.hbm.xml b/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/structure/tree/TreeSPath.hbm.xml deleted file mode 100644 index 0e282505f..000000000 --- a/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/structure/tree/TreeSPath.hbm.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/structure/tree/TreeSRegistry.hbm.xml b/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/structure/tree/TreeSRegistry.hbm.xml deleted file mode 100644 index 2182a2304..000000000 --- a/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/structure/tree/TreeSRegistry.hbm.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml b/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml deleted file mode 100644 index 42f32dfb8..000000000 --- a/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.slc.hibernate/src/test/java/org/argeo/slc/hibernate/structure/tree/TreeSPathDaoHibernateTest.java b/org.argeo.slc.hibernate/src/test/java/org/argeo/slc/hibernate/structure/tree/TreeSPathDaoHibernateTest.java deleted file mode 100644 index 3cb906b24..000000000 --- a/org.argeo.slc.hibernate/src/test/java/org/argeo/slc/hibernate/structure/tree/TreeSPathDaoHibernateTest.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.argeo.slc.hibernate.structure.tree; - -import org.argeo.slc.core.structure.tree.TreeSPath; -import org.argeo.slc.dao.structure.tree.TreeSPathDao; -import org.argeo.slc.unit.AbstractSpringTestCase; - -public class TreeSPathDaoHibernateTest extends AbstractSpringTestCase { - - public void testCreate() { - TreeSPathDao treeSPathDao = getBean(TreeSPathDao.class); - - String pathParentStr = "/root/testParent"; - String pathStr = pathParentStr + "/test"; - TreeSPath path = TreeSPath.parseToCreatePath(pathStr); - treeSPathDao.create(path); - - TreeSPath pathChild = treeSPathDao.getTreeSPath(pathStr); - assertEquals(path, pathChild); - - TreeSPath pathParent = treeSPathDao.getTreeSPath(pathParentStr); - assertEquals(path.getParent(), pathParent); - } - - @Override - protected String getApplicationContextLocation() { - return "org/argeo/slc/hibernate/applicationContext.xml"; - } - -} diff --git a/org.argeo.slc.hibernate/src/test/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistryDaoHibernateTest.java b/org.argeo.slc.hibernate/src/test/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistryDaoHibernateTest.java deleted file mode 100644 index c9d0a99cd..000000000 --- a/org.argeo.slc.hibernate/src/test/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistryDaoHibernateTest.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.argeo.slc.hibernate.structure.tree; - -import org.argeo.slc.core.structure.SimpleSElement; -import org.argeo.slc.core.structure.tree.TreeSPath; -import org.argeo.slc.core.structure.tree.TreeSRegistry; -import org.argeo.slc.dao.structure.tree.TreeSPathDao; -import org.argeo.slc.dao.structure.tree.TreeSRegistryDao; -import org.argeo.slc.unit.AbstractSpringTestCase; - -public class TreeSRegistryDaoHibernateTest extends AbstractSpringTestCase { - - public void testCreate() { - TreeSRegistryDao treeSRegistryDao = getBean(TreeSRegistryDao.class); - - TreeSPathDao treeSPathDao = (TreeSPathDao) getContext().getBean( - "treeSPathDao"); - - TreeSPath root = TreeSPath.parseToCreatePath("/root"); - TreeSPath path = root.createChild("test"); - - treeSPathDao.create(root); - treeSPathDao.create(path); - - TreeSRegistry registry = new TreeSRegistry(); - registry.setStatus(TreeSRegistry.STATUS_ACTIVE); - String desc = "desc"; - registry.register(path, new SimpleSElement(desc)); - - treeSRegistryDao.create(registry); - - TreeSRegistry registry2 = treeSRegistryDao.getActiveTreeSRegistry(); - SimpleSElement element = registry2.getElements().get(path); - assertEquals(desc, element.getLabel()); - } - - @Override - protected String getApplicationContextLocation() { - return "org/argeo/slc/hibernate/applicationContext.xml"; - } - -} diff --git a/org.argeo.slc.hibernate/src/test/resources/org/argeo/slc/hibernate/applicationContext.xml b/org.argeo.slc.hibernate/src/test/resources/org/argeo/slc/hibernate/applicationContext.xml index 31158cf49..de1ee349c 100644 --- a/org.argeo.slc.hibernate/src/test/resources/org/argeo/slc/hibernate/applicationContext.xml +++ b/org.argeo.slc.hibernate/src/test/resources/org/argeo/slc/hibernate/applicationContext.xml @@ -23,14 +23,4 @@ parent="slcTemplates.dao.slcExecutionDao"> - - - - - - - - \ No newline at end of file