[java-opensaml COMMIT] in /trunk: opensaml-core/src/main/java/org/opensaml/core/xml/AbstractXMLObject.java opensaml-c...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Oct  9 23:07:20 2014
New Revision: 4105

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4105&view=rev
Log:
Replace deprecated and unneeded Guava Objects methods.

Modified:
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/AbstractXMLObject.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/Namespace.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/io/AbstractXMLObjectMarshaller.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/io/AbstractXMLObjectUnmarshaller.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/util/AttributeMap.java
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/util/XMLObjectSupport.java
    trunk/opensaml-core/src/test/java/org/opensaml/core/xml/NamespaceManagerTest.java
    trunk/opensaml-core/src/test/java/org/opensaml/core/xml/util/AttributeMapTest.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/AbstractNameIdentifierGenerator.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AffiliationNameIDPolicyPredicate.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/EndpointCriterion.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/profile/SAML1ObjectSupport.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/profile/SAML2ObjectSupport.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/DefaultEndpointResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/VerifyChannelBindings.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddSubjectConfirmationToSubjects.java
    trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/util/SOAPSupport.java
    trunk/opensaml-soap-api/src/main/java/org/opensaml/soap/wsaddressing/util/WSAddressingSupport.java
    trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/provider/BaseObligationHandler.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/AlgorithmRegistry.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/SimpleRetrievalMethodEncryptedKeyResolver.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/CryptoBinaryImpl.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CRLImpl.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509CertificateImpl.java

Modified: trunk/opensaml-core/src/main/java/org/opensaml/core/xml/AbstractXMLObject.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/main/java/org/opensaml/core/xml/AbstractXMLObject.java?rev=4105&r1=4104&r2=4105&view=diff
==============================================================================
--- trunk/opensaml-core/src/main/java/org/opensaml/core/xml/AbstractXMLObject.java (original)
+++ trunk/opensaml-core/src/main/java/org/opensaml/core/xml/AbstractXMLObject.java Thu Oct  9 23:07:20 2014
@@ -18,6 +18,7 @@
 package org.opensaml.core.xml;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 import javax.annotation.Nonnull;
@@ -36,8 +37,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Element;
-
-import com.google.common.base.Objects;
 
 /**
  * An abstract implementation of XMLObject.
@@ -261,7 +260,7 @@
     @Nullable protected String prepareForAssignment(@Nullable final String oldValue, @Nullable final String newValue) {
         String newString = StringSupport.trimOrNull(newValue);
 
-        if (!Objects.equal(oldValue, newString)) {
+        if (!Objects.equals(oldValue, newString)) {
             releaseThisandParentDOM();
         }
 
@@ -359,7 +358,7 @@
     protected void registerOwnID(@Nullable final String oldID, @Nullable final String newID) {
         String newString = StringSupport.trimOrNull(newID);
 
-        if (!Objects.equal(oldID, newString)) {
+        if (!Objects.equals(oldID, newString)) {
             if (oldID != null) {
                 idIndex.deregisterIDMapping(oldID);
             }

Modified: trunk/opensaml-core/src/main/java/org/opensaml/core/xml/Namespace.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/main/java/org/opensaml/core/xml/Namespace.java?rev=4105&r1=4104&r2=4105&view=diff
==============================================================================
--- trunk/opensaml-core/src/main/java/org/opensaml/core/xml/Namespace.java (original)
+++ trunk/opensaml-core/src/main/java/org/opensaml/core/xml/Namespace.java Thu Oct  9 23:07:20 2014
@@ -17,12 +17,12 @@
 
 package org.opensaml.core.xml;
 
+import java.util.Objects;
+
 import javax.annotation.Nullable;
 
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.xml.XMLConstants;
-
-import com.google.common.base.Objects;
 
 /** Data structure for representing XML namespace attributes. */
 public class Namespace {

[... 940 lines stripped ...]