From e1bb03608c76c206756e00c1af6e8a2bb483c138 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 30 Aug 2011 11:20:37 +0000
Subject: [PATCH] LMS-2455 dead code removed
SVN: 22701
---
.../dataaccess/IEntityPropertyTypeDAO.java | 7 -----
.../dataaccess/db/EntityPropertyTypeDAO.java | 13 --------
.../db/EntityPropertyTypeDAOTest.java | 31 -------------------
3 files changed, 51 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEntityPropertyTypeDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEntityPropertyTypeDAO.java
index f0d5eff7e70..536d1098001 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEntityPropertyTypeDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEntityPropertyTypeDAO.java
@@ -23,7 +23,6 @@ import org.springframework.dao.DataAccessException;
import ch.systemsx.cisd.openbis.generic.shared.dto.EntityPropertyPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.EntityTypePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.EntityTypePropertyTypePE;
-import ch.systemsx.cisd.openbis.generic.shared.dto.IEntityPropertiesHolder;
import ch.systemsx.cisd.openbis.generic.shared.dto.PropertyTypePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.VocabularyPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.VocabularyTermWithStats;
@@ -61,12 +60,6 @@ public interface IEntityPropertyTypeDAO
final EntityTypePropertyTypePE entityPropertyTypeAssignement)
throws DataAccessException;
- /**
- * Returns a list of all entities of given <var>entityType</var>.
- */
- public List<IEntityPropertiesHolder> listEntities(final EntityTypePE entityType)
- throws DataAccessException;
-
/**
* Returns a list of ids of all entities of given <var>entityType</var>.
*/
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAO.java
index f3e94fa91d8..d860d909835 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAO.java
@@ -44,7 +44,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.EntityTypePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.EntityTypePropertyTypePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.ExternalDataPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.IEntityInformationWithPropertiesHolder;
-import ch.systemsx.cisd.openbis.generic.shared.dto.IEntityPropertiesHolder;
import ch.systemsx.cisd.openbis.generic.shared.dto.PropertyTypePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.SequenceNames;
import ch.systemsx.cisd.openbis.generic.shared.dto.TableNames;
@@ -140,18 +139,6 @@ final class EntityPropertyTypeDAO extends AbstractDAO implements IEntityProperty
}
}
- public List<IEntityPropertiesHolder> listEntities(final EntityTypePE entityType)
- throws DataAccessException
- {
- assert entityType != null : "Unspecified entity type.";
-
- final DetachedCriteria criteria = DetachedCriteria.forClass(entityKind.getEntityClass());
- criteria.add(Restrictions.eq(entityKind.getEntityTypeFieldName(), entityType));
- final List<IEntityPropertiesHolder> list =
- cast(getHibernateTemplate().findByCriteria(criteria));
- return list;
- }
-
public List<Long> listEntityIds(final EntityTypePE entityType) throws DataAccessException
{
assert entityType != null : "Unspecified entity type.";
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAOTest.java
index 0de7ea4c2ff..4b7d0d6a750 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAOTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAOTest.java
@@ -18,9 +18,7 @@ package ch.systemsx.cisd.openbis.generic.server.dataaccess.db;
import static org.testng.AssertJUnit.assertEquals;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -33,8 +31,6 @@ import ch.systemsx.cisd.openbis.generic.server.dataaccess.IEntityPropertyTypeDAO
import ch.systemsx.cisd.openbis.generic.shared.dto.EntityPropertyPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.EntityTypePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.EntityTypePropertyTypePE;
-import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE;
-import ch.systemsx.cisd.openbis.generic.shared.dto.IEntityPropertiesHolder;
import ch.systemsx.cisd.openbis.generic.shared.dto.PropertyTypePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.TableNames;
import ch.systemsx.cisd.openbis.generic.shared.dto.VocabularyPE;
@@ -93,33 +89,6 @@ public class EntityPropertyTypeDAOTest extends AbstractDAOTest
}
- @Test
- public void testListEntities() throws Exception
- {
- EntityKind entityKind = EntityKind.EXPERIMENT;
- String typeCode = "SIRNA_HCS";
- EntityTypePE entityType =
- daoFactory.getEntityTypeDAO(entityKind).tryToFindEntityTypeByCode(typeCode);
- List<ExperimentPE> allExperiments = daoFactory.getExperimentDAO().listExperiments();
- Assert.assertEquals(new HashSet<ExperimentPE>(filter(allExperiments, entityType)),
- new HashSet<IEntityPropertiesHolder>(daoFactory
- .getEntityPropertyTypeDAO(entityKind).listEntities(entityType)));
- }
-
- private static List<ExperimentPE> filter(List<ExperimentPE> allExperiments,
- EntityTypePE entityType)
- {
- List<ExperimentPE> result = new ArrayList<ExperimentPE>();
- for (ExperimentPE experimentPE : allExperiments)
- {
- if (experimentPE.getExperimentType().getCode().equals(entityType.getCode()))
- {
- result.add(experimentPE);
- }
- }
- return result;
- }
-
public final void testCountTermUsageStatistics()
{
IEntityPropertyTypeDAO dao = daoFactory.getEntityPropertyTypeDAO(EntityKind.EXPERIMENT);
--
GitLab