From 22c0bb62aceb4aed3e60dab7a389968403b6c67a Mon Sep 17 00:00:00 2001 From: buczekp <buczekp> Date: Thu, 29 Apr 2010 12:07:40 +0000 Subject: [PATCH] [LMS-1507] removed trash SVN: 15680 --- .../server/dataaccess/db/ExternalDataDAO.java | 73 ------------------- 1 file changed, 73 deletions(-) diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExternalDataDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExternalDataDAO.java index 6f845885d8d..af0677da6dd 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExternalDataDAO.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExternalDataDAO.java @@ -25,7 +25,6 @@ import java.util.List; import java.util.Set; import java.util.TreeSet; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; import org.apache.log4j.Logger; import org.hibernate.FetchMode; import org.hibernate.HibernateException; @@ -53,8 +52,6 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.CodeConverter; import ch.systemsx.cisd.openbis.generic.shared.dto.DataPE; import ch.systemsx.cisd.openbis.generic.shared.dto.DataStorePE; import ch.systemsx.cisd.openbis.generic.shared.dto.DatabaseInstancePE; -import ch.systemsx.cisd.openbis.generic.shared.dto.DatasetDescription; -import ch.systemsx.cisd.openbis.generic.shared.dto.DatasetDescriptionPE; import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE; import ch.systemsx.cisd.openbis.generic.shared.dto.ExternalDataPE; import ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE; @@ -209,76 +206,6 @@ final class ExternalDataDAO extends AbstractGenericEntityDAO<ExternalDataPE> imp return entity; } - public List<DatasetDescription> tryToFindDatasetDescriptionsByCodes(List<String> dataSetCodes) - { - assert dataSetCodes != null : "Unspecified data set code"; - - // final Criterion codeEq = Restrictions.eq("code", mangledCode); - - // TODO - // Hibernate bug (HHH-2676) - can't take a lock in this kind of query. - String queryString = - "select new ch.systemsx.cisd.openbis.generic.shared.dto.DatasetDescription(d.code, d.location, d.sampleInternal.code, " - + "d.experimentInternal.projectInternal.group.code, " - + "d.experimentInternal.projectInternal.code, " - + "d.experimentInternal.code, " - + "d.dataSetType.mainDataSetPath, d.dataSetType.mainDataSetPattern, " - + "d.experimentInternal.projectInternal.group.databaseInstance.code) " - + "from " + TABLE_NAME + " d where d.code IN (:codes)"; - - Session session = getHibernateTemplate().getSessionFactory().getCurrentSession(); - final List<DatasetDescription> list = - cast(session.createQuery(queryString).setParameterList("codes", dataSetCodes) - .list()); - - System.err.println(list.size()); - for (DatasetDescription desc : list) - { - System.err.println(ReflectionToStringBuilder.toString(desc)); - } - // if (operationLog.isDebugEnabled()) - // { - // operationLog.debug(String.format("External data '%s' found for data set code '%s'.", - // entity, dataSetCode)); - // } - return list; - } - - public List<DatasetDescriptionPE> tryToFindDatasetDescriptionsByCodes(List<String> dataSetCodes) - { - assert dataSetCodes != null : "Unspecified data set code"; - - // final Criterion codeEq = Restrictions.eq("code", mangledCode); - - // TODO - // Hibernate bug (HHH-2676) - can't take a lock in this kind of query. - String queryString = - "select new DatasetDescriptionPE(d.code, d.location, d.sampleInternal.code, " - + "d.experimentInternal.projectInternal.group.code, " - + "d.experimentInternal.projectInternal.code, " - + "d.experimentInternal.code, " - + "d.dataSetType.mainDataSetPath, d.dataSetType.mainDataSetPattern, " - + "d.experimentInternal.projectInternal.group.databaseInstance.code) " - + "from " + TABLE_NAME + " d where d.code IN (:codes)"; - - Session session = getHibernateTemplate().getSessionFactory().getCurrentSession(); - final List<DatasetDescriptionPE> list = - cast(session.createQuery(queryString).setParameterList("codes", dataSetCodes) - .list()); - - System.err.println(list.size()); - for (DatasetDescriptionPE desc : list) - { - System.err.println(ReflectionToStringBuilder.toString(desc)); - } - // if (operationLog.isDebugEnabled()) - // { - // operationLog.debug(String.format("External data '%s' found for data set code '%s'.", - // entity, dataSetCode)); - // } - return list; - } - public List<ExternalDataPE> tryToFindFullDataSetsByCodes(Collection<String> dataSetCodes, boolean withPropertyTypes, boolean lockForUpdate) { -- GitLab