Positive numbers prefilter for lookup

Author: marcos-lg

vocabulary-lookup/src/main/java/org/gbif/vocabulary/lookup/InMemoryVocabularyLookup.java

@@ -13,11 +13,17 @@
  */
 package org.gbif.vocabulary.lookup;
 
-import org.gbif.vocabulary.model.LanguageRegion;
-import org.gbif.vocabulary.model.export.ConceptExportView;
-import org.gbif.vocabulary.model.export.Export;
-import org.gbif.vocabulary.tools.VocabularyDownloader;
+import static org.gbif.vocabulary.model.normalizers.StringNormalizer.normalizeLabel;
+import static org.gbif.vocabulary.model.normalizers.StringNormalizer.normalizeName;
+import static org.gbif.vocabulary.model.normalizers.StringNormalizer.replaceNonAsciiCharactersWithEquivalents;
 
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import java.io.IOException;
 import java.io.InputStream;
 import java.time.ZoneId;
@@ -34,24 +40,14 @@
 import java.util.Set;
 import java.util.function.Function;
 import java.util.function.UnaryOperator;
-
-import org.cache2k.Cache;
-import org.cache2k.Cache2kBuilder;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-
-import static org.gbif.vocabulary.model.normalizers.StringNormalizer.normalizeLabel;
-import static org.gbif.vocabulary.model.normalizers.StringNormalizer.normalizeName;
-import static org.gbif.vocabulary.model.normalizers.StringNormalizer.replaceNonAsciiCharactersWithEquivalents;
+import org.cache2k.Cache;
+import org.cache2k.Cache2kBuilder;
+import org.gbif.vocabulary.model.LanguageRegion;
+import org.gbif.vocabulary.model.export.ConceptExportView;
+import org.gbif.vocabulary.model.export.Export;
+import org.gbif.vocabulary.tools.VocabularyDownloader;
 
 /**
  * Class that allows to load a vocabulary export in memory to do fast lookups by concept labels.
@@ -358,8 +354,8 @@ private void addHiddenLabelToCache(String hiddenLabel, ConceptExportView concept
           "Incorrect vocabulary: different concepts cannot have the same hidden label. "
               + "The concept hidden label: {} in the concept: {} is also present in: {}",
           hiddenLabel,
-          concept.toString(),
-          existing.toString());
+          concept,
+          existing);
     }
   }
 

vocabulary-lookup/src/main/java/org/gbif/vocabulary/lookup/PreFilters.java

@@ -27,6 +27,7 @@ public final class PreFilters {
   private static final Pattern NON_ALPHANUMERIC_PATTERN = Pattern.compile("[^A-Za-z0-9]");
   private static final Pattern NON_LETTERS_PATTERN = Pattern.compile("[^A-Za-z]");
   private static final Pattern NUMBERS_PATTERN = Pattern.compile("[0-9]");
+  private static final Pattern POSITIVE_NUMBERS_PATTERN = Pattern.compile("[1-9]");
   private static final Pattern NUMERIC_PREFIX_PATTERN = Pattern.compile("^[0-9]+");
   private static final Pattern SIGNED_DECIMAL_NUMBERS_PREFIX_PATTERN =
       Pattern.compile("^[+-]?[0-9]+([.,][0-9]+)*|^[+-]?[0-9]*[.,][0-9]+");
@@ -40,6 +41,10 @@ public final class PreFilters {
   public static final UnaryOperator<String> REMOVE_NUMERIC =
       s -> NUMBERS_PATTERN.matcher(s).replaceAll(EMPTY);
 
+  /** Removes all positive numeric chars. */
+  public static final UnaryOperator<String> REMOVE_POSITIVE_NUMERIC =
+      s -> POSITIVE_NUMBERS_PATTERN.matcher(s).replaceAll(EMPTY);
+
   /** Removes all the characters that are not letters. */
   public static final UnaryOperator<String> REMOVE_NON_LETTER =
       s -> NON_LETTERS_PATTERN.matcher(s).replaceAll(EMPTY);