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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jan  6 17:32:13 2014
New Revision: 3549

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3549&view=rev
Log:
- General cleanup, annotations
- Conversion of several duration fields to milliseconds

Added:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/package-info.java   (with props)
Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/BaseSAMLSimpleSignatureSecurityHandler.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/BaseSAMLXMLSignatureSecurityHandler.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/EndpointUrlSchemeSecurityHandler.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/MessageLifetimeSecurityHandler.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/MessageReplaySecurityHandler.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/ReceivedEndpointSecurityHandler.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/SAMLMDClientCertAuthSecurityHandler.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/SAMLOutboundProtocolMessageSigningHandler.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/SAMLProtocolMessageXMLSignatureSecurityHandler.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/package.html
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/SAML2HTTPPostSimpleSignSecurityHandler.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/SAML2HTTPRedirectDeflateSignatureSecurityHandler.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/MessageLifetimeSecurityHandlerTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/MessageReplaySecurityHandlerTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/SAMLProtocolMessageXMLSignatureSecurityHandlerTest.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/BaseSAMLSimpleSignatureSecurityHandler.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/BaseSAMLSimpleSignatureSecurityHandler.java?rev=3549&r1=3548&r2=3549&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/BaseSAMLSimpleSignatureSecurityHandler.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/BaseSAMLSimpleSignatureSecurityHandler.java Mon Jan  6 17:32:13 2014
@@ -17,14 +17,21 @@
 
 package org.opensaml.saml.common.binding.security;
 
+import java.util.Collections;
 import java.util.List;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.servlet.http.HttpServletRequest;
 
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.codec.Base64Support;
 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.logic.ConstraintViolationException;
 import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
 
 import org.opensaml.core.criterion.EntityIdCriterion;
@@ -53,26 +60,26 @@
 public abstract class BaseSAMLSimpleSignatureSecurityHandler extends AbstractMessageHandler<SAMLObject>{
 
     /** Logger. */
-    private final Logger log = LoggerFactory.getLogger(BaseSAMLSimpleSignatureSecurityHandler.class);
+    @Nonnull private final Logger log = LoggerFactory.getLogger(BaseSAMLSimpleSignatureSecurityHandler.class);
 
     /** Signature trust engine used to validate raw signatures. */
-    private SignatureTrustEngine trustEngine;
+    @NonnullAfterInit private SignatureTrustEngine trustEngine;
     
     /** The HttpServletRequest being processed. */
-    private HttpServletRequest httpServletRequest;
+    @NonnullAfterInit private HttpServletRequest httpServletRequest;
     
     /** The context representing the SAML peer entity. */
-    private SAMLPeerEntityContext peerContext;
+    @Nullable private SAMLPeerEntityContext peerContext;
     
     /** The SAML protocol context in operation. */
-    private SAMLProtocolContext samlProtocolContext;
+    @Nullable private SAMLProtocolContext samlProtocolContext;
 
     /**
      * Gets the engine used to validate the signature.
      * 

[... 1527 lines stripped ...]