[java-identity-provider] branch master updated: IDP-1403 replace com.google.common.base.Objects.equals(...) with java.util.Objects.equals(...)

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=24ff5573e26e699c267c1daaab3fdcc4a812784b

The following commit(s) were added to refs/heads/master by this push:
       new  24ff557   IDP-1403 replace com.google.common.base.Objects.equals(...) with java.util.Objects.equals(...)
24ff557 is described below

commit 24ff5573e26e699c267c1daaab3fdcc4a812784b
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Mar 30 11:37:44 2019 +0000

    IDP-1403 replace com.google.common.base.Objects.equals(...) with java.util.Objects.equals(...)
    
    https://issues.shibboleth.net/jira/browse/IDP-1403
---
 .../shibboleth/idp/saml/metadata/RelyingPartyMetadataProvider.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/RelyingPartyMetadataProvider.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/RelyingPartyMetadataProvider.java
index bf2e69b..76401d8 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/RelyingPartyMetadataProvider.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/RelyingPartyMetadataProvider.java
@@ -21,6 +21,7 @@ import java.time.Instant;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.util.Objects;
 
 import net.shibboleth.ext.spring.service.AbstractServiceableComponent;
 import net.shibboleth.utilities.java.support.annotation.ParameterName;
@@ -41,7 +42,6 @@ import org.opensaml.saml.saml2.metadata.EntityDescriptor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Objects;
 
 /**
  * This class exists primarily to allow the parsing of relying-party.xml to create a serviceable implementation of
@@ -236,12 +236,12 @@ public class RelyingPartyMetadataProvider extends AbstractServiceableComponent<M
         }
         final RelyingPartyMetadataProvider otherRp = (RelyingPartyMetadataProvider) other;
         
-        return Objects.equal(otherRp.sortKey, sortKey) && Objects.equal(getId(), otherRp.getId());
+        return Objects.equals(otherRp.sortKey, sortKey) && Objects.equals(getId(), otherRp.getId());
     }
 
     /** {@inheritDoc} */
     @Override public int hashCode() {
-        return Objects.hashCode(sortKey, getId());
+        return com.google.common.base.Objects.hashCode(sortKey, getId());
     }
 
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.