[java-identity-provider COMMIT] in /trunk: idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relying...

[noreply at shibboleth.net]

Author: scantor
Date: Sat Oct 31 16:22:45 2015
New Revision: 7912

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7912&view=rev
Log:
IDP-847 - Fix additional SAML audience property

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/BaseSAMLProfileConfigurationParser.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractSAMLProfileConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/navigate/AudienceRestrictionsLookupFunction.java

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/BaseSAMLProfileConfigurationParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/BaseSAMLProfileConfigurationParser.java?rev=7912&r1=7911&r2=7912&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/BaseSAMLProfileConfigurationParser.java	(original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/saml/impl/BaseSAMLProfileConfigurationParser.java	Sat Oct 31 16:22:45 2015
@@ -250,7 +250,7 @@
             builder.addPropertyValue("signResponses",
                     predicateForSigning(StringSupport.trimOrNull(element.getAttributeNS(null, "signResponses"))));
         }
-        builder.addPropertyValue("additionalAudienceForAssertion", getAudiences(element));
+        builder.addPropertyValue("additionalAudiencesForAssertion", getAudiences(element));
     }
 
     // Checkstyle: CyclomaticComplexity ON

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractSAMLProfileConfiguration.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractSAMLProfileConfiguration.java?rev=7912&r1=7911&r2=7912&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractSAMLProfileConfiguration.java	(original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/AbstractSAMLProfileConfiguration.java	Sat Oct 31 16:22:45 2015
@@ -161,21 +161,31 @@
      * which an assertion may be shared.
      * 
      * @param audiences the additional audiences
+     * 
+     * @deprecated
      */
     public void setAdditionalAudienceForAssertion(@Nonnull @NonnullElements final Collection<String> audiences) {
+        setAdditionalAudiencesForAssertion(audiences);
+    }
+
+    /**
+     * Set the set of audiences, in addition to the relying party(ies) to which the IdP is issuing the assertion, with
+     * which an assertion may be shared.
+     * 
+     * @param audiences the additional audiences
+     */
+    public void setAdditionalAudiencesForAssertion(@Nonnull @NonnullElements final Collection<String> audiences) {
         if (audiences == null || audiences.isEmpty()) {
             assertionAudiences = Collections.emptySet();
             return;
         }
 
         assertionAudiences = new HashSet<>();
-        String trimmedAudience;
-        for (String audience : audiences) {
-            trimmedAudience = StringSupport.trimOrNull(audience);
+        for (final String audience : audiences) {
+            final String trimmedAudience = StringSupport.trimOrNull(audience);
             if (trimmedAudience != null) {
                 assertionAudiences.add(trimmedAudience);
             }
         }
     }
-
 }

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/navigate/AudienceRestrictionsLookupFunction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/navigate/AudienceRestrictionsLookupFunction.java?rev=7912&r1=7911&r2=7912&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/navigate/AudienceRestrictionsLookupFunction.java	(original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/navigate/AudienceRestrictionsLookupFunction.java	Sat Oct 31 16:22:45 2015
@@ -56,11 +56,11 @@
             final ProfileConfiguration pc = rpc.getProfileConfig();
             if (pc != null && pc instanceof SAMLProfileConfiguration
                     && !((SAMLProfileConfiguration) pc).getAdditionalAudiencesForAssertion().isEmpty()) {
-                final Builder builder = ImmutableList.builder();
+                final Builder<String> builder = ImmutableList.builder();
                 if (id != null) {
                     builder.add(rpc.getRelyingPartyId());
                 }
-                builder.add(((SAMLProfileConfiguration) pc).getAdditionalAudiencesForAssertion());

[... 5 lines stripped ...]