upgraded guava

Jenkinsfile

@@ -141,13 +141,6 @@ pipeline {
         }
 
     }
-
-    post {
-        failure {
-            slackSend message: "Registry build failed! - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)",
-                    channel: "#jenkins"
-        }
-    }
 }
 
 def createReleaseArgs() {

pom.xml

@@ -113,7 +113,7 @@
     <elasticsearch.version>7.9.1</elasticsearch.version>
     <feign.version>10.11</feign.version>
     <findbugs-jsr305.version>3.0.1</findbugs-jsr305.version>
-    <guava.version>18.0</guava.version>
+    <guava.version>27.0-jre</guava.version>
     <hadoop.version>2.6.0-cdh5.16.2</hadoop.version>
     <hikaricp.version>3.2.0</hikaricp.version>
     <janino-logback.version>2.5.10</janino-logback.version>

registry-doi/src/main/java/org/gbif/registry/doi/registration/DoiRegistration.java

@@ -13,14 +13,14 @@
  */
 package org.gbif.registry.doi.registration;
 
+import com.google.common.base.MoreObjects;
+import com.google.common.base.Objects;
 import org.gbif.api.annotation.Generated;
 import org.gbif.api.model.common.DOI;
 import org.gbif.registry.domain.doi.DoiType;
 
 import javax.annotation.Nullable;
 
-import com.google.common.base.Objects;
-
 /**
  * Encapsulates a DOI registration request. Some fields are optional and its values can trigger a
  * different behaviour in the DoiRegistrationService.
@@ -135,7 +135,7 @@ public int hashCode() {
   @Generated
   @Override
   public String toString() {
-    return Objects.toStringHelper(this)
+    return MoreObjects.toStringHelper(this)
         .add("key", key)
         .add("doi", doi)
         .add("metadata", metadata)

registry-domain/src/main/java/org/gbif/registry/domain/ws/LegacyDataset.java

@@ -13,6 +13,12 @@
  */
 package org.gbif.registry.domain.ws;
 
+import com.google.common.base.MoreObjects;
+import com.google.common.base.Objects;
+import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
+import org.apache.commons.validator.routines.EmailValidator;
 import org.gbif.api.annotation.Generated;
 import org.gbif.api.annotation.ParamName;
 import org.gbif.api.model.common.DOI;
@@ -21,33 +27,21 @@
 import org.gbif.api.model.registry.Dataset;
 import org.gbif.api.model.registry.Endpoint;
 import org.gbif.api.util.VocabularyUtils;
-import org.gbif.api.vocabulary.ContactType;
-import org.gbif.api.vocabulary.DatasetSubtype;
-import org.gbif.api.vocabulary.DatasetType;
-import org.gbif.api.vocabulary.EndpointType;
-import org.gbif.api.vocabulary.Language;
+import org.gbif.api.vocabulary.*;
 import org.gbif.registry.domain.ws.util.LegacyResourceConstants;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.UUID;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nullable;
 import javax.validation.constraints.NotNull;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
-
-import org.apache.commons.validator.routines.EmailValidator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.UUID;
 
 /**
  * Class used to create or update a Dataset for legacy (GBRDS/IPT) API. Previously known as a
@@ -909,7 +903,7 @@ public int hashCode() {
   @Generated
   @Override
   public String toString() {
-    return Objects.toStringHelper(this)
+    return MoreObjects.toStringHelper(this)
         .add("primaryContactType", primaryContactType)
         .add("primaryContactEmail", primaryContactEmail)
         .add("primaryContactName", primaryContactName)

registry-domain/src/main/java/org/gbif/registry/domain/ws/LegacyEndpoint.java

@@ -13,26 +13,24 @@
  */
 package org.gbif.registry.domain.ws;
 
+import com.google.common.base.MoreObjects;
+import com.google.common.base.Objects;
+import com.google.common.base.Strings;
 import org.gbif.api.annotation.Generated;
 import org.gbif.api.annotation.ParamName;
 import org.gbif.api.model.registry.Endpoint;
 import org.gbif.api.vocabulary.EndpointType;
 import org.gbif.registry.domain.ws.util.LegacyResourceConstants;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.UUID;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nullable;
 import javax.validation.constraints.NotNull;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Strings;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.UUID;
 
 /**
  * Class used to create or update an Endpoint for legacy (GBRDS/IPT) API. Previously known as a
@@ -195,6 +193,6 @@ public int hashCode() {
   @Generated
   @Override
   public String toString() {
-    return Objects.toStringHelper(this).add("datasetKey", datasetKey).toString();
+    return MoreObjects.toStringHelper(this).add("datasetKey", datasetKey).toString();
   }
 }

registry-domain/src/main/java/org/gbif/registry/domain/ws/LegacyOrganizationBriefResponse.java

@@ -13,6 +13,7 @@
  */
 package org.gbif.registry.domain.ws;
 
+import com.google.common.base.MoreObjects;
 import org.gbif.api.annotation.Generated;
 import org.gbif.registry.domain.ws.util.LegacyResourceConstants;
 
@@ -86,7 +87,7 @@ public int hashCode() {
   @Generated
   @Override
   public String toString() {
-    return Objects.toStringHelper(this).add("key", key).add("name", name).toString();
+    return MoreObjects.toStringHelper(this).add("key", key).add("name", name).toString();
   }
 
   public static class LegacyOrganizationArraySerializer

registry-domain/src/main/java/org/gbif/registry/domain/ws/LegacyOrganizationResponse.java

@@ -13,6 +13,10 @@
  */
 package org.gbif.registry.domain.ws;
 
+import com.google.common.base.Joiner;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.Objects;
+import com.google.common.base.Strings;
 import org.gbif.api.annotation.Generated;
 import org.gbif.api.model.registry.Contact;
 import org.gbif.api.model.registry.Node;
@@ -21,15 +25,10 @@
 import org.gbif.api.vocabulary.Language;
 import org.gbif.registry.domain.ws.util.LegacyResourceConstants;
 
-import java.util.Optional;
-
 import javax.validation.constraints.NotNull;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.Joiner;
-import com.google.common.base.Objects;
-import com.google.common.base.Strings;
+import java.util.Optional;
 
 /**
  * Class used to generate response for legacy (GBRDS/IPT) API. Previously known as an Organisation
@@ -315,7 +314,7 @@ public int hashCode() {
   @Generated
   @Override
   public String toString() {
-    return Objects.toStringHelper(this)
+    return MoreObjects.toStringHelper(this)
         .add("key", key)
         .add("name", name)
         .add("nameLanguage", nameLanguage)

registry-identity/src/main/java/org/gbif/registry/identity/model/UserModelMutationResult.java

@@ -13,6 +13,7 @@
  */
 package org.gbif.registry.identity.model;
 
+import com.google.common.base.MoreObjects;
 import org.gbif.api.model.common.AbstractGbifUser;
 
 import java.util.HashMap;
@@ -127,7 +128,7 @@ public boolean containsError() {
 
   @Override
   public String toString() {
-    return Objects.toStringHelper(this)
+    return MoreObjects.toStringHelper(this)
         .add("username", username)
         .add("email", email)
         .add("modelError", modelError)

registry-mail/src/main/java/org/gbif/registry/mail/BaseEmailModel.java

@@ -16,6 +16,7 @@
 import java.util.Collections;
 import java.util.Set;
 
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 
 /** Very basic email model that holds the main components of an email to send. */
@@ -71,7 +72,7 @@ public String getFrom() {
 
   @Override
   public String toString() {
-    return Objects.toStringHelper(this)
+    return MoreObjects.toStringHelper(this)
         .add("emailAddresses", emailAddresses)
         .add("subject", subject)
         .add("body", body)

registry-service/src/main/java/org/gbif/registry/service/collections/DefaultCollectionService.java

@@ -148,7 +148,7 @@ private PagingResponse<CollectionView> listInternal(
 
     String query =
         searchRequest.getQ() != null
-            ? Strings.emptyToNull(CharMatcher.WHITESPACE.trimFrom(searchRequest.getQ()))
+            ? Strings.emptyToNull(CharMatcher.whitespace().trimFrom(searchRequest.getQ()))
             : searchRequest.getQ();
 
     Set<UUID> institutionKeys = new HashSet<>();

registry-service/src/main/java/org/gbif/registry/service/collections/DefaultInstitutionService.java

@@ -182,7 +182,7 @@ private InstitutionSearchParams buildSearchParams(
       InstitutionSearchRequest searchRequest, boolean deleted, Pageable page) {
     String query =
         searchRequest.getQ() != null
-            ? Strings.emptyToNull(CharMatcher.WHITESPACE.trimFrom(searchRequest.getQ()))
+            ? Strings.emptyToNull(CharMatcher.whitespace().trimFrom(searchRequest.getQ()))
             : searchRequest.getQ();
 
     return InstitutionSearchParams.builder()

registry-ws/src/main/java/org/gbif/registry/ws/resources/BaseNetworkEntityResource.java

@@ -281,7 +281,7 @@ public PagingResponse<T> list(Pageable page) {
   @Override
   @Deprecated
   public PagingResponse<T> search(String query, Pageable page) {
-    String q = query != null ? Strings.emptyToNull(CharMatcher.WHITESPACE.trimFrom(query)) : query;
+    String q = query != null ? Strings.emptyToNull(CharMatcher.whitespace().trimFrom(query)) : query;
     return list(BaseListParams.builder().query(q).page(page).build());
   }
 
@@ -973,7 +973,7 @@ protected <D> PagingResponse<D> pagingResponse(Pageable page, Long count, List<D
   }
 
   protected String parseQuery(String q) {
-    return q != null ? Strings.emptyToNull(CharMatcher.WHITESPACE.trimFrom(q)) : q;
+    return q != null ? Strings.emptyToNull(CharMatcher.whitespace().trimFrom(q)) : q;
   }
 
   protected Date parseFrom(Range<LocalDate> range) {

registry-ws/src/main/java/org/gbif/registry/ws/resources/OrganizationResource.java

@@ -293,7 +293,7 @@ protected static String generatePassword() {
 
   @Override
   public PagingResponse<Organization> search(String query, Pageable page) {
-    String q = query != null ? Strings.emptyToNull(CharMatcher.WHITESPACE.trimFrom(query)) : query;
+    String q = query != null ? Strings.emptyToNull(CharMatcher.whitespace().trimFrom(query)) : query;
     OrganizationListParams listParams =
         OrganizationListParams.builder().query(q).page(page).build();
     long total = organizationMapper.count(listParams);

registry-ws/src/main/java/org/gbif/registry/ws/resources/UserManagementResource.java

@@ -304,7 +304,7 @@ public PagingResponse<GbifUser> search(
     page = page == null ? new PagingRequest() : page;
     String q =
         Optional.ofNullable(query)
-            .map(v -> Strings.nullToEmpty(CharMatcher.WHITESPACE.trimFrom(v)))
+            .map(v -> Strings.nullToEmpty(CharMatcher.whitespace().trimFrom(v)))
             .orElse(null);
     Set<Country> countries =
         Optional.ofNullable(countryRightsOn)