[java-identity-provider COMMIT] in /trunk: idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/RequestedPrin...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jan  1 20:16:37 2014
New Revision: 5132

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5132&view=rev
Log:
- Add an interface for profiles that expose default authentication methods
- Action to create RequestedPrincipalContext based on profile defaults

Added:
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/InitializeRequestedPrincipalContext.java   (with props)
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/InitializeRequestedPrincipalContextTest.java   (with props)
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/AuthenticationProfileConfiguration.java   (with props)
    trunk/idp-profile-api/src/test/java/net/shibboleth/idp/relyingparty/MockAuthenticationProfileConfiguration.java   (with props)
Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/RequestedPrincipalContext.java
    trunk/idp-authn-impl/pom.xml
    trunk/idp-profile-api/src/test/java/net/shibboleth/idp/relyingparty/MockProfileConfiguration.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/SelectProfileConfigurationTest.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/saml1/BrowserSSOProfileConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/saml2/BrowserSSOProfileConfiguration.java

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/RequestedPrincipalContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/RequestedPrincipalContext.java?rev=5132&r1=5131&r2=5132&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/RequestedPrincipalContext.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/RequestedPrincipalContext.java Wed Jan  1 20:16:37 2014
@@ -18,7 +18,6 @@
 package net.shibboleth.idp.authn.context;
 
 import java.security.Principal;
-import java.util.ArrayList;
 import java.util.List;
 
 import javax.annotation.Nonnull;
@@ -35,6 +34,7 @@
 import com.google.common.base.Predicates;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
 
 /**
  * A {@link BaseContext} that holds information about an authentication request's
@@ -72,11 +72,10 @@
      */
     public RequestedPrincipalContext(@Nonnull @NotEmpty final String operator,
             @Nonnull @NotEmpty @NonnullElements final List<Principal> principals) {
-        super();
         Constraint.isNotEmpty(principals, "Principal list cannot be null");
         
         operatorString = Constraint.isNotNull(StringSupport.trimOrNull(operator), "Operator cannot be null or empty");
-        requestedPrincipals = new ArrayList(Collections2.filter(principals, Predicates.notNull()));
+        requestedPrincipals = Lists.newArrayList(Collections2.filter(principals, Predicates.notNull()));
     }
 
     /**

Modified: trunk/idp-authn-impl/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/pom.xml?rev=5132&r1=5131&r2=5132&view=diff
==============================================================================
--- trunk/idp-authn-impl/pom.xml (original)
+++ trunk/idp-authn-impl/pom.xml Wed Jan  1 20:16:37 2014
@@ -86,6 +86,14 @@
 
         <dependency>
             <groupId>${project.groupId}</groupId>
+            <artifactId>idp-profile-api</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+            <type>test-jar</type>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
             <artifactId>idp-authn-api</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>

Modified: trunk/idp-profile-api/src/test/java/net/shibboleth/idp/relyingparty/MockProfileConfiguration.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/test/java/net/shibboleth/idp/relyingparty/MockProfileConfiguration.java?rev=5132&r1=5131&r2=5132&view=diff
==============================================================================
--- trunk/idp-profile-api/src/test/java/net/shibboleth/idp/relyingparty/MockProfileConfiguration.java (original)
+++ trunk/idp-profile-api/src/test/java/net/shibboleth/idp/relyingparty/MockProfileConfiguration.java Wed Jan  1 20:16:37 2014
@@ -17,9 +17,12 @@
 
 package net.shibboleth.idp.relyingparty;
 
+import javax.annotation.Nonnull;
+
 import net.shibboleth.idp.profile.config.AbstractProfileConfiguration;
 import net.shibboleth.idp.profile.config.ProfileConfiguration;
 import net.shibboleth.idp.profile.config.SecurityConfiguration;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 
 /** Mock implementation of {@link ProfileConfiguration}. */

[... 241 lines stripped ...]