removing parameters for WorkingSetService method

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/description/IWorkingSetDao.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/description/IWorkingSetDao.java
index 2d39b6490c7d6bf9f89c668864650ff4e583594e..39e75c001b9b51a691b45fab947b5578faa2ba8c 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/description/IWorkingSetDao.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/description/IWorkingSetDao.java
@@ -17,5 +17,5 @@ public interface IWorkingSetDao extends IAnnotatableDao<WorkingSet> {
     \r
        public Map<DescriptionBase,Set<DescriptionElementBase>> getDescriptionElements(WorkingSet workingSet, Set<Feature> features, Integer pageSize, Integer pageNumber, List<String> propertyPaths);\r
 \r
-       public <T extends DescriptionElementBase> Map<UuidAndTitleCache, Map<UUID, Set<T>>> getTaxonFeatureDescriptionElementMap(Class<T> clazz, UUID workingSetUuid, DescriptiveSystemRole role, Integer pageSize, Integer pageNumber, List<String> propertyPaths);\r
+       public <T extends DescriptionElementBase> Map<UuidAndTitleCache, Map<UUID, Set<T>>> getTaxonFeatureDescriptionElementMap(Class<T> clazz, UUID workingSetUuid, DescriptiveSystemRole role);\r
 }\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/WorkingSetDao.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/WorkingSetDao.java
index e90999bb8c22be84b4dd6753a081cf80b1f47aca..cacb03b40deb9dfebe54901565cca64f8654b187 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/WorkingSetDao.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/WorkingSetDao.java
@@ -1,7 +1,5 @@
 package eu.etaxonomy.cdm.persistence.dao.hibernate.description;\r
 \r
-import java.awt.datatransfer.StringSelection;\r
-import java.util.Formatter;\r
 import java.util.HashMap;\r
 import java.util.HashSet;\r
 import java.util.List;\r
@@ -11,11 +9,9 @@ import java.util.UUID;
 \r
 import org.apache.log4j.Logger;\r
 import org.hibernate.Criteria;\r
-import org.hibernate.HibernateException;\r
 import org.hibernate.Query;\r
 import org.hibernate.criterion.Restrictions;\r
 import org.springframework.beans.factory.annotation.Qualifier;\r
-import org.springframework.dao.DataAccessException;\r
 import org.springframework.stereotype.Repository;\r
 \r
 import eu.etaxonomy.cdm.model.common.UuidAndTitleCache;\r
@@ -26,7 +22,6 @@ import eu.etaxonomy.cdm.model.description.DescriptiveSystemRole;
 import eu.etaxonomy.cdm.model.description.Feature;\r
 import eu.etaxonomy.cdm.model.description.QuantitativeData;\r
 import eu.etaxonomy.cdm.model.description.WorkingSet;\r
-import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.persistence.dao.description.IWorkingSetDao;\r
 import eu.etaxonomy.cdm.persistence.dao.hibernate.common.AnnotatableDaoImpl;\r
 \r
@@ -67,9 +62,8 @@ public class WorkingSetDao extends AnnotatableDaoImpl<WorkingSet> implements IWo
                return result;\r
        }\r
 \r
-//     @Override\r
-       public <T extends DescriptionElementBase> Map<UuidAndTitleCache, Map<UUID, Set<T>>> getTaxonFeatureDescriptionElementMap(Class<T> clazz, UUID workingSetUuid, DescriptiveSystemRole role, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {\r
-               //TODO\r
+       @Override\r
+       public <T extends DescriptionElementBase> Map<UuidAndTitleCache, Map<UUID, Set<T>>> getTaxonFeatureDescriptionElementMap(Class<T> clazz, UUID workingSetUuid, DescriptiveSystemRole role) {\r
                checkNotInPriorView("WorkingSetDao.getTaxonFeatureDescriptionElementMap(WorkingSet workingSet, Set<Feature> features, Integer pageSize,Integer pageNumber, List<OrderHint> orderHints,  List<String> propertyPaths)");\r
                Map<UuidAndTitleCache, Map<UUID, Set<T>>> result = new HashMap<UuidAndTitleCache, Map<UUID, Set<T>>>();\r
                try {\r
@@ -116,17 +110,16 @@ public class WorkingSetDao extends AnnotatableDaoImpl<WorkingSet> implements IWo
                                        + " and feature.id in (:features)  "\r
                                + " order by taxon.uuid asc, feature.uuid asc"\r
                                ;\r
-//                     System.out.println(strQuery);\r
                        Query query = getSession().createQuery(strQuery);\r
                                        \r
-                       \r
-\r
                        query.setParameter("workingSetUuid", workingSetUuid);\r
                        query.setParameter("clazz", clazz.getSimpleName());\r
                        query.setParameterList("features", features);\r
-                       \r
+\r
+                       //NOTE: Paging does not work with fetch\r
+\r
+                       // fill result\r
                        List<Object[]> list = query.list();\r
-                       logger.warn("Retrieved data for " + clazz == null? "Structured Data":clazz.getSimpleName());\r
                        for (Object[] listEntry : list){\r
                                UUID taxonUuid = (UUID)listEntry[0];\r
                                String titleCache = (String)listEntry[1];\r
@@ -148,7 +141,6 @@ public class WorkingSetDao extends AnnotatableDaoImpl<WorkingSet> implements IWo
                                featureSet.add(data);\r
                                \r
                        }\r
-                       logger.warn("Filled resultset");\r
                        \r
 //                     defaultBeanInitializer.initialize(\r
                                        \r

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IWorkingSetService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IWorkingSetService.java
index a428ddaeaa18e2d205ae4711569d6f32a6ec4c68..2eecd5eee64fc01c8374420bb3b99fa1caf4fbb5 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IWorkingSetService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IWorkingSetService.java
@@ -27,7 +27,7 @@ public interface IWorkingSetService extends IAnnotatableService<WorkingSet> {
         */\r
        public Map<DescriptionBase, Set<DescriptionElementBase>> getDescriptionElements(WorkingSet workingSet, Set<Feature> features, Integer pageSize, Integer pageNumber,     List<String> propertyPaths);\r
 \r
-       public <T extends DescriptionElementBase> Map<UuidAndTitleCache, Map<UUID, Set<T>>> getTaxonFeatureDescriptionElementMap(Class<T> clazz, UUID workingSetUuid, DescriptiveSystemRole role, Integer pageSize, Integer pageNumber, List<String> propertyPaths);\r
+       public <T extends DescriptionElementBase> Map<UuidAndTitleCache, Map<UUID, Set<T>>> getTaxonFeatureDescriptionElementMap(Class<T> clazz, UUID workingSetUuid, DescriptiveSystemRole role);\r
 \r
        \r
        \r

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/WorkingSetService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/WorkingSetService.java
index 0698da7e2a87fd33f1cfdbc96f12ee3564150dd0..be6a78d5c753d048b7765463491de2fa3f62ddeb 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/WorkingSetService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/WorkingSetService.java
@@ -37,8 +37,7 @@ public class WorkingSetService extends
 \r
        @Override\r
        public <T extends DescriptionElementBase> Map<UuidAndTitleCache, Map<UUID, Set<T>>> getTaxonFeatureDescriptionElementMap(\r
-                       Class<T> clazz, UUID workingSetUuid, DescriptiveSystemRole role, Integer pageSize,\r
-                       Integer pageNumber, List<String> propertyPaths) {\r
-               return dao.getTaxonFeatureDescriptionElementMap(clazz, workingSetUuid, role, pageSize, pageNumber, propertyPaths);\r
+                       Class<T> clazz, UUID workingSetUuid, DescriptiveSystemRole role) {\r
+               return dao.getTaxonFeatureDescriptionElementMap(clazz, workingSetUuid, role);\r
        }\r
 }\r