/ - Diff - EDIT - EDIT Project Management

          */
         public T load(int id, List<String> propertyPaths);
         /**
          * @param ids
          * @param pageSize
          * @param pageNumber
          * @param orderHints
          * @param propertyPaths
          * @return
          * @throws DataAccessException
          */
         public List<T> listByIds(Collection<Integer> ids, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) throws DataAccessException;
         public List<T> loadList(Collection<Integer> ids, List<String> propertyPaths) throws DataAccessException;
         /**
          * @param Uuid
          * @return

     	@Override
         public T findById(int id) throws DataAccessException {
             return (T) getSession().get(type, id);
             return getSession().get(type, id);
+        }
-...
+        }
         @Override
         public List<T> listByIds(Collection<Integer> ids,  Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) throws DataAccessException {
         public List<T> loadList(Collection<Integer> ids,  List<String> propertyPaths) throws DataAccessException {
             if (ids.isEmpty()) {
                 return new ArrayList<T>(0);
+            }
             Criteria criteria = prepareList(ids, pageSize, pageNumber, orderHints, "id");
             Criteria criteria = prepareList(ids, null, null, null, "id");
             if (logger.isDebugEnabled()){logger.debug(criteria.toString());};
             if (logger.isDebugEnabled()){logger.debug(criteria.toString());}
              @SuppressWarnings("unchecked")
     		List<T> result = criteria.list();

+        }
         /**
          * Test method for {@link eu.etaxonomy.cdm.persistence.dao.hibernate.common.CdmEntityDaoBase#listByIds(java.util.Collection, Integer, Integer, List, List)}.
          * Test method for {@link eu.etaxonomy.cdm.persistence.dao.hibernate.common.CdmEntityDaoBase#loadList(java.util.Collection, List)}.
          */
         @Test
         @DataSet("CdmEntityDaoBaseTest.xml")
-...
             List<OrderHint> orderHints = new ArrayList<OrderHint>();
             orderHints.add(new RandomOrder());
             Integer[] ids = new Integer[]{1, 2};
             List<TaxonBase> list = cdmEntityDaoBase.listByIds(Arrays.asList(ids), 20, 0, orderHints, null);
             List<TaxonBase> list = cdmEntityDaoBase.loadList(Arrays.asList(ids), null);
             assertNotNull("list() should not return null",list);
             assertEquals("list() should return a list with two entities in it",list.size(),2);
+        }

+         *
          * @param idSet
          * @return
          * @deprecated use {@link #listByIds(Set, Integer, Integer, List, List)} instead
          * @deprecated use {@link #loadByIds(Set, List)} instead
          */
         @Deprecated
         public List<T> findById(Set<Integer> idSet);  //can't be called find(Set<Integer>) as this conflicts with find(Set<UUID)
-...
         public List<T> merge(List<T> detachedObjects);
         /**
          * Loads a batch of entities referenced by their ids.
+         *
          * @param idSet
          * @param pageSize
          * @param pageNumber
          * @param orderHints
          * @param propertyPaths
          * @return
          */
         List<T> listByIds(Set<Integer> idSet, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints,
                 List<String> propertyPaths);
         List<T> loadByIds(List<Integer> idSet, List<String> propertyPaths);
         /**
          * This method allows for the possibility of returning the input transient

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java
373	373	}
374	374	}
375	375	//dao.listByIds() does the paging of the field units. Passing the field units directly to the Pager would not work
376		List<SpecimenOrObservationBase> fieldUnits = dao.listByIds(fieldUnitIds, pageSize, pageNumber, orderHints, propertyPaths);
	376	List<SpecimenOrObservationBase> fieldUnits = dao.loadList(fieldUnitIds, propertyPaths);
377	377	return new DefaultPagerImpl<SpecimenOrObservationBase>(pageNumber, fieldUnitIds.size(), pageSize, fieldUnits);
378	378	}
379	379
...	...
743	743	occurrenceIds.add(o.getId());
744	744	}
745	745	}
746		occurrences = (List<T>) dao.listByIds(occurrenceIds, pageSize, pageNumber, orderHints, propertyPaths);
	746	occurrences = (List<T>) dao.loadList(occurrenceIds, propertyPaths);
747	747
748	748	return new DefaultPagerImpl<T>(pageNumber, occurrenceIds.size(), pageSize, occurrences);
749	749

         @Override
         @Transactional(readOnly = true)
         public List<T> findById(Set<Integer> idSet) {  //can't be called find(Set<Integer>) as this conflicts with find(Set<UUID)
             return dao.listByIds(idSet, null, null, null, null);
             return dao.loadList(idSet, null);
+        }
         @Override
         @Transactional(readOnly = true)
         public List<T> listByIds(Set<Integer> idSet, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths){
             return dao.listByIds(idSet, pageSize, pageNumber, orderHints, propertyPaths);
         public List<T> loadByIds(List<Integer> idList, List<String> propertyPaths){
             return dao.loadList(idList, propertyPaths);
+        }
         @Override

         @Override
         public List<TaxonBase> findTaxaByID(Set<Integer> listOfIDs) {
             return this.dao.listByIds(listOfIDs, null, null, null, null);
             return this.dao.loadList(listOfIDs, null);
+        }
         @Override

                 // load taxa for this batch
                 List<TaxonBase> taxa = null;
                 Set<Integer> taxonIds = new HashSet<Integer>(batchSize);
                 List<Integer> taxonIds = new ArrayList<Integer>(batchSize);
                 while(taxonIdIterator.hasNext() && taxonIds.size() < batchSize ) {
                     taxonIds.add(taxonIdIterator.next());
+                }
     //            logger.debug("accumulateByArea() - taxon " + taxonPager.getFirstRecord() + " to " + taxonPager.getLastRecord() + " of " + taxonPager.getCount() + "]");
                 taxa = taxonService.listByIds(taxonIds, null, null, emptyOrderHints, TAXONDESCRIPTION_INIT_STRATEGY);
                 taxa = taxonService.loadByIds(taxonIds, TAXONDESCRIPTION_INIT_STRATEGY);
                 // iterate over the taxa and accumulate areas
                 for(TaxonBase taxonBase : taxa) {
-...
+                    }
                     // load taxa for this batch
                     Set<Integer> taxonIds = new HashSet<Integer>(batchSize);
                     List<Integer> taxonIds = new ArrayList<Integer>(batchSize);
                     while(taxonIdIterator.hasNext() && taxonIds.size() < batchSize ) {
                         taxonIds.add(taxonIdIterator.next());
+                    }
                     taxa = taxonService.listByIds(taxonIds, null, null, emptyOrderHints, null);
                     taxa = taxonService.loadByIds(taxonIds, null);
                     if(taxonSubMonitor == null) {
                         taxonSubMonitor = new SubProgressMonitor(subMonitor, ticksPerRank);
-...
                         // Step through direct taxonomic children for accumulation
                         Map<NamedArea, StatusAndSources> accumulatedStatusMap = new HashMap<NamedArea, StatusAndSources>();
                         Set<Integer> childTaxonIds = classificationLookupDao.getChildTaxonMap().get(taxon.getId());
                         if(childTaxonIds != null && !childTaxonIds.isEmpty()) {
                             childTaxa = taxonService.listByIds(childTaxonIds, null, null, emptyOrderHints, TAXONDESCRIPTION_INIT_STRATEGY);
                         List<Integer> childTaxonIds = new ArrayList<>();
                         Set<Integer> childSet = classificationLookupDao.getChildTaxonMap().get(taxon.getId());
                         if(childSet != null) {
                             childTaxonIds.addAll(childSet);
+                        }
                         if(!childTaxonIds.isEmpty()) {
                             childTaxa = taxonService.loadByIds(childTaxonIds, TAXONDESCRIPTION_INIT_STRATEGY);
                             for (TaxonBase childTaxonBase : childTaxa){

Project

General

Profile

EDIT

Revision 1ec74f53

Added by Andreas Kohlbecker almost 8 years ago