[java-opensaml COMMIT] in /trunk: opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/Rec...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Jun  6 14:06:37 2014
New Revision: 3920

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3920&view=rev
Log:
Some work on JSPT-45: Implement class and method renames for new naming convention for any remaing components.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandler.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPArtifactEncoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPArtifactEncoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandler.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoderTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandlerTest.java
    trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/ServletRequestScopedStorageService.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandler.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandler.java?rev=3920&r1=3919&r2=3920&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandler.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandler.java Fri Jun  6 14:06:37 2014
@@ -25,9 +25,9 @@
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.net.BasicUrlComparator;
-import net.shibboleth.utilities.java.support.net.UriComparator;
-import net.shibboleth.utilities.java.support.net.UriException;
+import net.shibboleth.utilities.java.support.net.BasicURLComparator;
+import net.shibboleth.utilities.java.support.net.URIComparator;
+import net.shibboleth.utilities.java.support.net.URIException;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.messaging.MessageException;
@@ -49,14 +49,14 @@
     @Nonnull private Logger log = LoggerFactory.getLogger(ReceivedEndpointSecurityHandler.class);
     
     /** The URI comparator to use in performing the validation. */
-    @Nonnull private UriComparator uriComparator;
+    @Nonnull private URIComparator uriComparator;
     
     /** The HttpServletRequest being processed. */
     @NonnullAfterInit private HttpServletRequest httpServletRequest;
 
     /** Constructor. */
     public ReceivedEndpointSecurityHandler() {
-        uriComparator = new BasicUrlComparator();
+        uriComparator = new BasicURLComparator();
     }
 
     /**
@@ -64,7 +64,7 @@
      * 
      * @return the uriComparator.
      */
-    @Nonnull public UriComparator getUriComparator() {
+    @Nonnull public URIComparator getURIComparator() {
         return uriComparator;
     }
 
@@ -73,10 +73,10 @@
      * 
      * @param comparator the new URI comparator to use
      */
-    public void setUriComparator(@Nonnull final UriComparator comparator) {
+    public void setURIComparator(@Nonnull final URIComparator comparator) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         
-        uriComparator = Constraint.isNotNull(comparator, "UriComparator cannot be null");
+        uriComparator = Constraint.isNotNull(comparator, "URIComparator cannot be null");
     }
     
     /**
@@ -105,7 +105,7 @@
         super.doInitialize();
         
         if (uriComparator == null) {
-            throw new ComponentInitializationException("UriComparator cannot be null");
+            throw new ComponentInitializationException("URIComparator cannot be null");
         } else if (httpServletRequest == null) {
             throw new ComponentInitializationException("HttpServletRequest cannot be null");
         }
@@ -114,13 +114,13 @@
     /** {@inheritDoc} */
     @Override
     protected void doInvoke(@Nonnull final MessageContext<SAMLObject> messageContext) throws MessageHandlerException {
-        checkEndpointUri(messageContext, getUriComparator());
+        checkEndpointURI(messageContext, getURIComparator());
     }
     
     /**
      * Compare the message endpoint URI's specified.
      * 
-     * <p>The comparison is performed using the specified instance of {@link UriComparator}.</p>

[... 242 lines stripped ...]