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

[noreply at shibboleth.net]

Author: lajoie
Date: Wed Sep 21 13:41:59 2011
New Revision: 2896

URL: http://svn.shibboleth.net/view/java-opensaml?rev=2896&view=rev
Log:
Move from using DatatypeHelper fileToByteArray to using the corresponding method on FileSupport
Move from using DatatypeHelper safeEquals to using corresponding method on ObjectSupport
Move from DatatypeHelper.inToByteArray to SAML2ArtifactType0004Builder as that was the only class using it
Remove DatatypeHelper.inputstreamToString as nothing uses it

Modified:
    trunk/opensaml-core/src/main/java/org/opensaml/xml/AbstractXMLObject.java
    trunk/opensaml-core/src/main/java/org/opensaml/xml/Namespace.java
    trunk/opensaml-core/src/main/java/org/opensaml/xml/NamespaceManager.java
    trunk/opensaml-core/src/main/java/org/opensaml/xml/io/AbstractXMLObjectMarshaller.java
    trunk/opensaml-core/src/main/java/org/opensaml/xml/io/AbstractXMLObjectUnmarshaller.java
    trunk/opensaml-core/src/main/java/org/opensaml/xml/util/AttributeMap.java
    trunk/opensaml-core/src/main/java/org/opensaml/xml/util/DatatypeHelper.java
    trunk/opensaml-core/src/main/java/org/opensaml/xml/util/XMLHelper.java
    trunk/opensaml-core/src/main/java/org/opensaml/xml/util/XMLObjectHelper.java
    trunk/opensaml-core/src/test/java/org/opensaml/xml/NamespaceManagerTest.java
    trunk/opensaml-core/src/test/java/org/opensaml/xml/util/AttributeMapTest.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml2/binding/AuthnResponseEndpointSelector.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml2/binding/artifact/SAML2ArtifactType0004Builder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml1/binding/decoding/HTTPSOAP11Decoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml2/binding/decoding/HTTPSOAP11Decoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml2/metadata/provider/AbstractMetadataProvider.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml2/metadata/provider/FileBackedHTTPMetadataProvider.java
    trunk/opensaml-soap-api/src/main/java/org/opensaml/ws/soap/util/SOAPHelper.java
    trunk/opensaml-soap-api/src/main/java/org/opensaml/ws/wsaddressing/util/WSAddressingHelper.java
    trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/provider/BaseObligationHandler.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xml/encryption/SimpleRetrievalMethodEncryptedKeyResolver.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xml/signature/impl/CryptoBinaryImpl.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xml/signature/impl/X509CRLImpl.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xml/signature/impl/X509CertificateImpl.java

Modified: trunk/opensaml-core/src/main/java/org/opensaml/xml/AbstractXMLObject.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/main/java/org/opensaml/xml/AbstractXMLObject.java?rev=2896&r1=2895&r2=2896&view=diff
==============================================================================
--- trunk/opensaml-core/src/main/java/org/opensaml/xml/AbstractXMLObject.java (original)
+++ trunk/opensaml-core/src/main/java/org/opensaml/xml/AbstractXMLObject.java Wed Sep 21 13:41:59 2011
@@ -23,6 +23,7 @@
 
 import javax.xml.namespace.QName;
 
+import org.opensaml.util.ObjectSupport;
 import org.opensaml.xml.schema.XSBooleanValue;
 import org.opensaml.xml.util.DatatypeHelper;
 import org.opensaml.xml.util.IDIndex;
@@ -292,7 +293,7 @@
     protected String prepareForAssignment(String oldValue, String newValue) {
         String newString = DatatypeHelper.safeTrimOrNullString(newValue);
 
-        if (!DatatypeHelper.safeEquals(oldValue, newString)) {
+        if (!ObjectSupport.equals(oldValue, newString)) {
             releaseThisandParentDOM();
         }
 
@@ -388,7 +389,7 @@
     protected void registerOwnID(String oldID, String newID) {
         String newString = DatatypeHelper.safeTrimOrNullString(newID);
 
-        if (!DatatypeHelper.safeEquals(oldID, newString)) {
+        if (!ObjectSupport.equals(oldID, newString)) {
             if (oldID != null) {
                 idIndex.deregisterIDMapping(oldID);
             }

Modified: trunk/opensaml-core/src/main/java/org/opensaml/xml/Namespace.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/main/java/org/opensaml/xml/Namespace.java?rev=2896&r1=2895&r2=2896&view=diff
==============================================================================
--- trunk/opensaml-core/src/main/java/org/opensaml/xml/Namespace.java (original)
+++ trunk/opensaml-core/src/main/java/org/opensaml/xml/Namespace.java Wed Sep 21 13:41:59 2011
@@ -17,6 +17,7 @@
 
 package org.opensaml.xml;
 
+import org.opensaml.util.ObjectSupport;
 import org.opensaml.xml.util.DatatypeHelper;
 import org.opensaml.xml.util.XMLConstants;
 
@@ -150,8 +151,8 @@
         
         if (obj instanceof Namespace) {
             Namespace otherNamespace = (Namespace) obj;
-            if (DatatypeHelper.safeEquals(otherNamespace.getNamespaceURI(), getNamespaceURI())){

[... 832 lines stripped ...]