/ - Diff - EDIT - EDIT Project Management

     import java.util.List;
     import java.util.UUID;
     import javax.persistence.EntityNotFoundException;
     import javax.servlet.http.HttpServletRequest;
     import javax.servlet.http.HttpServletResponse;
-...
     //       service.startTransaction();
            boolean recursive = false;
            UUID taxonNodeUuid = service.getTaxonNodeUuidByTaxonUuid(classificationUuid, taxonUuid) ;
            if (taxonNodeUuid == null){
                HttpStatusMessage.UUID_NOT_FOUND.send(response);
                return null;
+           }
            Pager<TaxonNodeDto> pager = taxonNodeService.pageChildNodesDTOs(taxonNodeUuid, recursive, doSynonyms, sortMode, pageSize, pageIndex);
     //       service.commitTransaction()
-...
                HttpServletResponse response
                ) throws IOException {
            TaxonInContextDTO taxonInContextDTO = service.getTaxonInContext(classificationUuid, taxonUuid, doChildren, doSynonyms, ancestorMarkers, sortMode) ;
            return taxonInContextDTO;
            try {
                TaxonInContextDTO taxonInContextDTO = service.getTaxonInContext(classificationUuid, taxonUuid, doChildren, doSynonyms, ancestorMarkers, sortMode);
                return taxonInContextDTO;
            } catch (EntityNotFoundException e) {
                HttpStatusMessage.UUID_NOT_FOUND.send(response);
                return null;
+           }
+       }

             List<TaxonNodeDto> dtos = new ArrayList<>(pageSize==null?25:pageSize);
             Integer start = PagerUtils.startFor(pageSize, pageIndex);
             start = start == null ? 0 : start;
             Integer limit = PagerUtils.limitFor(pageSize);
             limit = limit == null ? Integer.MAX_VALUE : limit;
             Long totalCount = Long.valueOf(allRecords.size());
             if(PagerUtils.hasResultsInRange(totalCount, pageIndex, pageSize)) {
                 TaxonNameBase<?,?> parentName = null;
                 for(int i = start; i < Math.min(totalCount, start + limit); i++) {
                     CdmBase record = allRecords.get(i);
     //            for(int i = start; i < Math.min(totalCount, start + limit); i++) {
                 for(CdmBase record : PagerUtils.pageList(allRecords, pageIndex, pageSize)) {
                     if (record.isInstanceOf(TaxonNode.class)){
                         dtos.add(new TaxonNodeDto(CdmBase.deproxy(record, TaxonNode.class)));
                     }else if (record.isInstanceOf(Synonym.class)){
-...
                         dtos.add(new TaxonNodeDto(synonym, isHomotypic));
+                    }
+                }
+            }
     //        }
             return new DefaultPagerImpl<TaxonNodeDto>(pageIndex, totalCount, pageSize , dtos);
+        }

     // $Id$
     /**
     * Copyright (C) 2016 EDIT
     * European Distributed Institute of Taxonomy
     * http://www.e-taxonomy.eu
+    *
     * The contents of this file are subject to the Mozilla Public License Version 1.1
     * See LICENSE.TXT at the top of this package for the full license terms.
     */
     package eu.etaxonomy.cdm.api.service.pager;
     /**
      * @author a.mueller
      * @date 22.09.2016
+     *
      */
     public class PagerRangeException extends RuntimeException {
         private static final long serialVersionUID = 1626299671702704921L;
         /**
          * @param message
          */
         public PagerRangeException(String message) {
             super(message);
+        }
+    }

     */
     package eu.etaxonomy.cdm.api.service.pager;
     import java.util.List;
     import eu.etaxonomy.cdm.api.service.pager.impl.AbstractPagerImpl;
     /**
-...
      */
     public class PagerUtils {
         public static Integer startFor(Integer pageSize, Integer pageIndex) {
             if(pageSize == null){
                 return null;
+            }
         /**
          * Returns the start index for the given page size and page index values
          * by multiplying both values (startFor = pageSize * pageIndex).<BR>
          * If page size is <code>null</code>, either <code>null</code> is returned
          * or an exception is thrown if page index is > 0.
          * If page index is null it is assumed as 0.
+         *
          * @param pageSize the page size
          * @param pageIndex the page index
          * @return the start index
          * @throws PagerRangeException if pageSize == null and pageIndex > 0
          */
         public static Integer startFor(Integer pageSize, Integer pageIndex) throws PagerRangeException {
             if(pageIndex == null) {
                 pageIndex = 0;
+            }
             if(pageSize == null){
                 if (pageIndex > 0 ){
                     throw new PagerRangeException("Page index must be undefined or 0 for undefined page size but was " + pageIndex);
                 }else{
                     return null;
+                }
+            }
             return pageSize *  pageIndex;
+        }
         /**
          * Returns the limit value as used in SQL/HQL statements for the given
          * page size.<BR>
          * Earlier, for <code>null</code> the value 0 was returned but as
          * it was decided that pageSize = <code>null</code> should not set any limitation
          * it was changed to return value <code>null</code>. This way the current implementation
          * is the identity function and has no effect except for documentation.
          * <code>null</code> should be handled in dao-s or specialized code such as
          * {@link #pageList(List, Integer, Integer)}.
+         *
          * @param pageSize
          * @return
          */
         public static Integer limitFor(Integer pageSize) {
             if(pageSize == null){
                 return null;
             }else{
                 return pageSize;
+            }
             return pageSize;
+        }
         /**
-...
             return AbstractPagerImpl.hasResultsInRange(numberOfResults, pageIndex, pageSize);
+        }
         /**
          * Returns a synchronized (sub)list of fullList which contains only the items
          * for the given page
          * @param fullList
          * @param pageIndex page index
          * @param pageSize page size
          * @return a synchronized list holding the page items
          */
         public  static  <T extends Object> List<T> pageList(List<T> fullList, Integer pageIndex, Integer pageSize ){
             Integer start = startFor(pageSize, pageIndex);
             if (start == null){
                 return fullList;
+            }
             Integer limit = limitFor(pageSize); //no effect and never null at this point due to startFor semantics
             limit = Math.min(Integer.MAX_VALUE - start, limit);
             if (fullList.size() > start) {
                 Integer toIndex = Math.min(fullList.size(), start + limit);
                 return fullList.subList(start, toIndex);
             }else{
                 return fullList.subList(fullList.size(), fullList.size()); //empty list
+            }
+        }
+    }

Project

General

Profile

EDIT

Revision cb994835

Added by Andreas Müller over 7 years ago

Project

General

Profile

EDIT

Revision cb994835

Added by Andreas Müller over 7 years ago

Related issues