[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/reso...

[noreply at shibboleth.net]

Author: scantor
Date: Wed May  7 17:27:54 2014
New Revision: 5872

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5872&view=rev
Log:
Refactor and relocate some lookup functions.

Added:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/navigate/
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/navigate/AbstractAttributeResolutionLookupFunction.java   (with props)
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/navigate/package-info.java   (with props)
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/context/
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/context/navigate/
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/context/navigate/AttributeIssuerIdLookupFunction.java
      - copied, changed from r5870, trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeIssuerIdLookupFunction.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/context/navigate/AttributePrincipalLookupFunction.java
      - copied, changed from r5870, trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributePrincipalLookupFunction.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/context/navigate/AttributeRecipientIdLookupFunction.java
      - copied, changed from r5870, trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeRecipientIdLookupFunction.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/context/navigate/package-info.java   (with props)
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolutionContextTest.java
      - copied, changed from r5870, trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionContextTest.java
Modified:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeIssuerIdLookupFunction.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributePrincipalLookupFunction.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeRecipientIdLookupFunction.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionContextTest.java

Copied: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/context/navigate/AttributeIssuerIdLookupFunction.java (from r5870, trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeIssuerIdLookupFunction.java)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/context/navigate/AttributeIssuerIdLookupFunction.java?p2=trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/context/navigate/AttributeIssuerIdLookupFunction.java&p1=trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeIssuerIdLookupFunction.java&r1=5870&r2=5872&rev=5872&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/context/AttributeIssuerIdLookupFunction.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/context/navigate/AttributeIssuerIdLookupFunction.java Wed May  7 17:27:54 2014
@@ -15,66 +15,25 @@
  * limitations under the License.
  */
 
-package net.shibboleth.idp.attribute.resolver.context;
+package net.shibboleth.idp.attribute.resolver.context.navigate;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import net.shibboleth.utilities.java.support.logic.Constraint;
-
-import org.opensaml.messaging.context.navigate.ChildContextLookup;
-import org.opensaml.profile.context.ProfileRequestContext;
-
-import com.google.common.base.Function;
+import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
 
 /**
  * A function that returns {@link AttributeResolutionContext#getAttributeIssuerID()} if available from a
- * {@link AttributeResolutionContext} obtained via a lookup function, by default a child of the
- * {@link ProfileRequestContext}.
+ * {@link AttributeResolutionContext} obtained via a lookup function defined on the base class.
  * 
- * <p>
- * If a specific setting is unavailable, a null value is returned.
- * </p>
+ * <p>If a specific setting is unavailable, a null value is returned.</p>
  */

[... 235 lines stripped ...]