[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-api/pom.xml idp-attribute-resolver-api/src/main/jav...

[noreply at shibboleth.net]

Author: rdw
Date: Thu Feb 27 04:34:28 2014
New Revision: 5487

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5487&view=rev
Log:
IDP-358 There is not need to have The LegacyPrincipalDecoder Generically typed.

Modified:
    trunk/idp-attribute-resolver-api/pom.xml
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/LegacyPrincipalDecoder.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/principalconnector/PrinicpalConnectorCanonicalizer.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/LegacyCanonicalization.java

Modified: trunk/idp-attribute-resolver-api/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/pom.xml?rev=5487&r1=5486&r2=5487&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/pom.xml (original)
+++ trunk/idp-attribute-resolver-api/pom.xml Thu Feb 27 04:34:28 2014
@@ -24,6 +24,11 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
+            <artifactId>idp-authn-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
             <artifactId>idp-core</artifactId>
             <version>${project.version}</version>
         </dependency>

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/LegacyPrincipalDecoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/LegacyPrincipalDecoder.java?rev=5487&r1=5486&r2=5487&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/LegacyPrincipalDecoder.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/LegacyPrincipalDecoder.java Thu Feb 27 04:34:28 2014
@@ -20,7 +20,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import org.opensaml.messaging.context.BaseContext;
+import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
 
 /**
  * Definition of the legacy Principal Connectors. <br/>
@@ -29,9 +29,8 @@
  * Code will only be implemented by the legacy parsing of the &lt;PrinicipalConnector&gt; statements and will consume
  * CanonicalizationContexts.
  * 
- * @param <ConsumedContext> The type of context which is expected.
  */
-public interface LegacyPrincipalDecoder<ConsumedContext extends BaseContext> {
+public interface LegacyPrincipalDecoder {
 
     /**
      * Resolve the principal with respect to the provided context. This is expected to strip out the
@@ -43,7 +42,7 @@
      * @throws ResolutionException if we recognise the definition but could not decode it (data out of date and so
      *             forth)
      */
-    @Nullable String canonicalize(@Nonnull final ConsumedContext context) throws ResolutionException;
+    @Nullable String canonicalize(@Nonnull final  SubjectCanonicalizationContext context) throws ResolutionException;
     
     /** 
      * Report on whether this decoder has any configured connectors.

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java?rev=5487&r1=5486&r2=5487&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java Thu Feb 27 04:34:28 2014
@@ -72,7 +72,7 @@
  * */
 @ThreadSafe
 public class AttributeResolverImpl extends AbstractServiceableComponent<AttributeResolver> implements
-        AttributeResolver, LegacyPrincipalDecoder<SubjectCanonicalizationContext> {
+        AttributeResolver, LegacyPrincipalDecoder {
 
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(AttributeResolverImpl.class);
@@ -87,7 +87,7 @@
     @NonnullAfterInit private final String logPrefix;
 
     /** The Principal mapper. */
-    @Nullable private final LegacyPrincipalDecoder<SubjectCanonicalizationContext> principalConnector;

[... 126 lines stripped ...]