[java-identity-provider COMMIT] in /trunk/idp-saml-impl/src: main/java/net/shibboleth/idp/saml/profile/impl/BaseAddAt...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Sep 28 21:33:47 2014
New Revision: 6602

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6602&view=rev
Log:
Some fixes, and apply action refactor to auth statements.

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/BaseAddAuthenticationStatementToAssertion.java   (with props)
Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/BaseAddAttributeStatementToAssertion.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertion.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAuthenticationStatementToAssertion.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAttributeStatementToAssertion.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertion.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAuthenticationStatementToAssertionTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/AddAuthnStatementToAssertionTest.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/BaseAddAttributeStatementToAssertion.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/BaseAddAttributeStatementToAssertion.java?rev=6602&r1=6601&r2=6602&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/BaseAddAttributeStatementToAssertion.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/BaseAddAttributeStatementToAssertion.java Sun Sep 28 21:33:47 2014
@@ -70,7 +70,7 @@
     @NonnullAfterInit private Function<ProfileRequestContext,IdentifierGenerationStrategy> idGeneratorLookupStrategy;
 
     /** Strategy used to obtain the assertion issuer value. */
-    @Nullable private Function<ProfileRequestContext,String> issuerLookupStrategy;
+    @Nonnull private Function<ProfileRequestContext,String> issuerLookupStrategy;
 
     /**
      * Strategy used to locate the {@link AttributeContext} associated with a given {@link ProfileRequestContext}.
@@ -199,7 +199,7 @@
      * @return the ID generation strategy
      */
     @Nonnull public IdentifierGenerationStrategy getIdGenerator() {
-        Constraint.isNotNull(attributeCtx, "IdentifierGenerationStrategy has not been initialized yet");
+        Constraint.isNotNull(idGenerator, "IdentifierGenerationStrategy has not been initialized yet");
         return idGenerator;
     }
 
@@ -209,7 +209,7 @@
      * @return the issuer name
      */
     @Nonnull public String getIssuerId() {
-        Constraint.isNotNull(attributeCtx, "Issuer name has not been initialized yet");
+        Constraint.isNotNull(issuerId, "Issuer name has not been initialized yet");
         return issuerId;
     }
 

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertion.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertion.java?rev=6602&r1=6601&r2=6602&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertion.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/AddAttributeStatementToAssertion.java Sun Sep 28 21:33:47 2014
@@ -56,10 +56,10 @@
 import com.google.common.collect.Lists;
 
 /**
- * Action that builds an {@link AttributeStatement} and adds it to an {@link Assertion} in the {@link Response}
- * returned by a lookup strategy, by default the message in {@link ProfileRequestContext#getOutboundMessageContext()}.
+ * Action that builds an {@link AttributeStatement} and adds it to an {@link Assertion} returned by a lookup
+ * strategy, by default in the {@link ProfileRequestContext#getOutboundMessageContext()}.
  * 
- * <p>If no {@link Response} exists, then either an {@link Assertion} directly in the outbound message context will
+ * <p>If no {@link Response} exists, then an {@link Assertion} directly in the outbound message context will
  * be used or created</p>
 
  * <p>The {@link IdPAttribute} set to be encoded is drawn from an {@link AttributeContext} returned from a
@@ -106,7 +106,7 @@
 
             final Assertion assertion = assertionLookupStrategy.apply(profileRequestContext);
             if (assertion == null) {
-                log.error("Unable to obtain assertion to modify");
+                log.error("Unable to obtain Assertion to modify");
                 ActionSupport.buildEvent(profileRequestContext, EventIds.INVALID_MSG_CTX);
                 return;
             }


[... 691 lines stripped ...]