cleanup

[cdm-vaadin.git] / src / main / java / eu / etaxonomy / cdm / service / TaxonNameStringFilterablePagingProvider.java

diff --git a/src/main/java/eu/etaxonomy/cdm/service/TaxonNameStringFilterablePagingProvider.java b/src/main/java/eu/etaxonomy/cdm/service/TaxonNameStringFilterablePagingProvider.java
index 4f2caa665ec467e0e0f1b360b5b7abdadf5a183e..9ad08931915ffb8a8d1990de0d323fd6c70af9d3 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/service/TaxonNameStringFilterablePagingProvider.java
+++ b/src/main/java/eu/etaxonomy/cdm/service/TaxonNameStringFilterablePagingProvider.java
@@ -13,11 +13,11 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

+import java.util.UUID;

 
 

-import org.apache.log4j.Logger;
-import org.hibernate.criterion.Criterion;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;

 import org.vaadin.viritin.fields.LazyComboBox.FilterableCountProvider;
 import org.vaadin.viritin.fields.LazyComboBox.FilterableCountProvider;

-import org.vaadin.viritin.fields.LazyComboBox.FilterablePagingProvider;

 
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.ui.AbstractField;
 
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.ui.AbstractField;


@@ -25,22 +25,28 @@ import com.vaadin.ui.Field;
 
 import eu.etaxonomy.cdm.api.service.INameService;
 import eu.etaxonomy.cdm.api.service.pager.Pager;
 
 import eu.etaxonomy.cdm.api.service.INameService;
 import eu.etaxonomy.cdm.api.service.pager.Pager;

-import eu.etaxonomy.cdm.api.utility.TaxonNamePartsFilter;
+import eu.etaxonomy.cdm.api.util.TaxonNamePartsFilter;

 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.Rank;

+import eu.etaxonomy.cdm.model.name.TaxonName;

 import eu.etaxonomy.cdm.persistence.dto.TaxonNameParts;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;
 import eu.etaxonomy.cdm.persistence.query.OrderHint;
 
 /**
 import eu.etaxonomy.cdm.persistence.dto.TaxonNameParts;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;
 import eu.etaxonomy.cdm.persistence.query.OrderHint;
 
 /**

+ * IMPORTANT !!!
+ *
+ * The string representations returned as rankSpecificNamePart must be unique in the database since these are being used as weak references between e.g.
+ * genus name and the TaxonName entity for this genus.
+ *

  * @author a.kohlbecker
  * @since Jun 7, 2017
  *
  */
  * @author a.kohlbecker
  * @since Jun 7, 2017
  *
  */

-public class TaxonNameStringFilterablePagingProvider implements FilterablePagingProvider<String>, FilterableCountProvider {
+public class TaxonNameStringFilterablePagingProvider implements FilterableStringRepresentationPagingProvider<UUID>, FilterableCountProvider {

 
 

-    private static final List<String> DEFAULT_INIT_STRATEGY = Arrays.asList("$");
+    private static final Logger logger = LogManager.getLogger();

 
 

-    private static final Logger logger = Logger.getLogger(TaxonNameStringFilterablePagingProvider.class);
+    private static final List<String> DEFAULT_INIT_STRATEGY = Arrays.asList("$");

 
     private int pageSize = 20;
 
 
     private int pageSize = 20;
 


@@ -52,12 +58,12 @@ public class TaxonNameStringFilterablePagingProvider implements FilterablePaging
 
     List<String> initStrategy = DEFAULT_INIT_STRATEGY;
 
 
     List<String> initStrategy = DEFAULT_INIT_STRATEGY;
 

-    private List<Criterion> criteria = new ArrayList<>();
-

     private TaxonNamePartsFilter namePartsFilter = new TaxonNamePartsFilter();
 
     private Map<AbstractField<String>, ValueChangeListener> registeredToFields = new HashMap<>();
 
     private TaxonNamePartsFilter namePartsFilter = new TaxonNamePartsFilter();
 
     private Map<AbstractField<String>, ValueChangeListener> registeredToFields = new HashMap<>();
 

+    private Map<String, UUID> lastPagedEntityUUIDs;
+

 
     public TaxonNameStringFilterablePagingProvider(INameService service) {
         this(service, Rank.GENUS(), null);
 
     public TaxonNameStringFilterablePagingProvider(INameService service) {
         this(service, Rank.GENUS(), null);


@@ -169,14 +175,19 @@ public class TaxonNameStringFilterablePagingProvider implements FilterablePaging
             logger.trace("findEntities() - page: " + taxonNamePager.getCurrentIndex() + "/" + taxonNamePager.getPagesAvailable() + " totalRecords: " + taxonNamePager.getCount() + "\n" + taxonNamePager.getRecords());
         }
         List<String> namePartStrings = new ArrayList<>(taxonNamePager.getRecords().size());
             logger.trace("findEntities() - page: " + taxonNamePager.getCurrentIndex() + "/" + taxonNamePager.getPagesAvailable() + " totalRecords: " + taxonNamePager.getCount() + "\n" + taxonNamePager.getRecords());
         }
         List<String> namePartStrings = new ArrayList<>(taxonNamePager.getRecords().size());

+        lastPagedEntityUUIDs = new HashMap<>(taxonNamePager.getRecords().size());

         for(TaxonNameParts tnp : taxonNamePager.getRecords()){
         for(TaxonNameParts tnp : taxonNamePager.getRecords()){

-               namePartStrings.add(tnp.rankSpecificNamePart());
+               String rankSpecificNamePart = tnp.rankSpecificNamePart();
+               String namePartKey = rankSpecificNamePart;
+               if(lastPagedEntityUUIDs.containsKey(namePartKey)){
+                   namePartKey = rankSpecificNamePart + " DUPLICATE[" + tnp.getTaxonNameUuid() + "]";
+               }
+               namePartStrings.add(namePartKey);
+               lastPagedEntityUUIDs.put(namePartKey, tnp.getTaxonNameUuid());

         }
         return namePartStrings;
     }
 
         }
         return namePartStrings;
     }
 

-
-

     /**
      * {@inheritDoc}
      */
     /**
      * {@inheritDoc}
      */


@@ -204,20 +215,52 @@ public class TaxonNameStringFilterablePagingProvider implements FilterablePaging
         this.pageSize = pageSize;
     }
 
         this.pageSize = pageSize;
     }
 

-

     /**
     /**

-     * The list of criteria is initially empty.
-     *
-     * @return the criteria
+     * @return the lastPagedEntityUUIDs

      */
      */

-    public List<Criterion> getCriteria() {
-        return criteria;
+    public Map<String, UUID> getLastPagedEntityUUIDs() {
+        return lastPagedEntityUUIDs;

     }
 
     }
 

+

     public class UnknownFieldException extends Exception {
 
         private static final long serialVersionUID = 1L;
     public class UnknownFieldException extends Exception {
 
         private static final long serialVersionUID = 1L;

+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public UUID idFor(String stringRepresentation) {
+        if(stringRepresentation == null){
+            return null;
+        }
+        if(lastPagedEntityUUIDs == null || !lastPagedEntityUUIDs.containsKey(stringRepresentation)){
+            int pages = Math.max(1, size(stringRepresentation));
+            for(int i = 0; i < pages; i++){
+                findEntities(i, stringRepresentation);
+            }
+        }
+        return lastPagedEntityUUIDs.get(stringRepresentation);
+    }

 
 

+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void clearIdCache() {
+        lastPagedEntityUUIDs = null;
+    }

 
 

+    /**
+     * @param asList
+     * @return
+     */
+    public void excludeNames(TaxonName ... excludedTaxonNames) {
+        namePartsFilter.getExludedNamesUuids();
+        for(TaxonName n : excludedTaxonNames){
+            namePartsFilter.getExludedNamesUuids().add(n.getUuid());
+        }

     }
 }
     }
 }