[java-identity-provider COMMIT] in /trunk: idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/Abst...

[noreply at shibboleth.net]

Author: scantor
Date: Tue May  6 12:52:29 2014
New Revision: 5853

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5853&view=rev
Log:
IDP-377: apply condition to AttributeEncoder use, plus factor out markers for encoders

Added:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/SAML1AttributeEncoder.java   (with props)
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/SAML2AttributeEncoder.java   (with props)
Modified:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML1AttributeEncoder.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML2AttributeEncoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/LegacyNameIdentifierGenerator.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/saml2/profile/impl/AddAttributeStatementToAssertion.java

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML1AttributeEncoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML1AttributeEncoder.java?rev=5853&r1=5852&r2=5853&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML1AttributeEncoder.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML1AttributeEncoder.java Tue May  6 12:52:29 2014
@@ -47,7 +47,7 @@
  * @param <EncodedType> the type of data that can be encoded by the encoder
  */
 public abstract class AbstractSAML1AttributeEncoder<EncodedType extends IdPAttributeValue> extends
-        AbstractSAMLAttributeEncoder<Attribute, EncodedType> {
+        AbstractSAMLAttributeEncoder<Attribute, EncodedType> implements SAML1AttributeEncoder<EncodedType> {
 
     /** Builder used to construct {@link Attribute} objects. */
     @Nonnull private final SAMLObjectBuilder<Attribute> attributeBuilder;

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML2AttributeEncoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML2AttributeEncoder.java?rev=5853&r1=5852&r2=5853&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML2AttributeEncoder.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSAML2AttributeEncoder.java Tue May  6 12:52:29 2014
@@ -45,7 +45,7 @@
  * @param <EncodedType> the type of data that can be encoded by the encoder
  */
 public abstract class AbstractSAML2AttributeEncoder<EncodedType extends IdPAttributeValue> extends
-        AbstractSAMLAttributeEncoder<Attribute, EncodedType> {
+        AbstractSAMLAttributeEncoder<Attribute, EncodedType> implements SAML2AttributeEncoder<EncodedType> {
 
     /** Builder used to construct {@link Attribute} objects. */
     @Nonnull private final SAMLObjectBuilder<Attribute> attributeBuilder;

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/LegacyNameIdentifierGenerator.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/LegacyNameIdentifierGenerator.java?rev=5853&r1=5852&r2=5853&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/LegacyNameIdentifierGenerator.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/LegacyNameIdentifierGenerator.java Tue May  6 12:52:29 2014
@@ -110,6 +110,7 @@
                 "AttributeContext lookup strategy cannot be null");
     }
     
+// Checkstyle: CyclomaticComplexity OFF
     /** {@inheritDoc} */
     @Override
     @Nullable public NameIdType generate(@Nonnull final ProfileRequestContext profileRequestContext,
@@ -132,7 +133,8 @@
                 continue;
             }
             for (final AttributeEncoder encoder : idpAttribute.getEncoders()) {
-                if (encoderType.isInstance(encoder) && ((NameIdentifierAttributeEncoder) encoder).apply(format)) {
+                if (encoderType.isInstance(encoder) && ((NameIdentifierAttributeEncoder) encoder).apply(format)
+                        && encoder.getActivationCondition().apply(profileRequestContext)) {
                     try {
                         // The encoders throw unless they return an object.
                         final NameIdType nameId = (NameIdType) encoder.encode(idpAttribute);
@@ -149,5 +151,6 @@

[... 180 lines stripped ...]