[java-identity-provider] 01/03: IDP-1434 Tests
Rod Widdowson
rdw at steadingsoftware.com
Wed May 1 05:02:16 EDT 2019
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=0f20a22a9d865f2fc3b5bfb0f6d136e44ae7a2d4
commit 0f20a22a9d865f2fc3b5bfb0f6d136e44ae7a2d4
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Apr 30 15:34:21 2019 +0100
IDP-1434 Tests
https://issues.shibboleth.net/jira/browse/IDP-1434
Make the parameters to FilterByQueriedAttributes and
FilterByQueriedAttributeDesignators an api (not impl) class
so as to enable easier test injection.
squash! IDP-1434 Tests
---
.../impl/FilterByQueriedAttributeDesignators.java | 28 ++++++++++---------
.../profile/impl/FilterByQueriedAttributes.java | 31 +++++++++++-----------
2 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/FilterByQueriedAttributeDesignators.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/FilterByQueriedAttributeDesignators.java
index 6c97e94..d6bba98 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/FilterByQueriedAttributeDesignators.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml1/profile/impl/FilterByQueriedAttributeDesignators.java
@@ -24,18 +24,11 @@ import java.util.function.Function;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.idp.attribute.IdPAttribute;
-import net.shibboleth.idp.attribute.context.AttributeContext;
-import net.shibboleth.idp.profile.AbstractProfileAction;
-import net.shibboleth.idp.profile.context.RelyingPartyContext;
-import net.shibboleth.idp.saml.attribute.mapping.impl.SAML1AttributeDesignatorsMapperService;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-
import org.opensaml.messaging.context.navigate.ChildContextLookup;
import org.opensaml.messaging.context.navigate.MessageLookup;
import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.profile.context.navigate.InboundMessageContextLookup;
+import org.opensaml.saml.saml1.core.AttributeDesignator;
import org.opensaml.saml.saml1.core.AttributeQuery;
import org.opensaml.saml.saml1.core.Request;
import org.slf4j.Logger;
@@ -43,6 +36,14 @@ import org.slf4j.LoggerFactory;
import com.google.common.collect.Multimap;
+import net.shibboleth.idp.attribute.IdPAttribute;
+import net.shibboleth.idp.attribute.context.AttributeContext;
+import net.shibboleth.idp.profile.AbstractProfileAction;
+import net.shibboleth.idp.profile.context.RelyingPartyContext;
+import net.shibboleth.idp.saml.attribute.mapping.AttributesMapper;
+import net.shibboleth.utilities.java.support.component.ComponentSupport;
+import net.shibboleth.utilities.java.support.logic.Constraint;
+
/**
* Action that filters a set of attributes against the {@link org.opensaml.saml.saml1.core.AttributeDesignator}
* objects in an {@link AttributeQuery}.
@@ -54,8 +55,8 @@ public class FilterByQueriedAttributeDesignators extends AbstractProfileAction {
/** Class logger. */
@Nonnull private final Logger log = LoggerFactory.getLogger(FilterByQueriedAttributeDesignators.class);
- /** Service used to get the engine used to filter attributes. */
- @Nonnull private final SAML1AttributeDesignatorsMapperService mapperService;
+ /** Mapper used to get the engine used to filter attributes. */
+ @Nonnull private final AttributesMapper<AttributeDesignator,IdPAttribute> map;
/** Strategy used to locate the {@link Request} containing the query to filter against. */
@Nonnull private Function<ProfileRequestContext,Request> requestLookupStrategy;
@@ -74,8 +75,9 @@ public class FilterByQueriedAttributeDesignators extends AbstractProfileAction {
*
* @param mapper mapper used to consume designators
*/
- public FilterByQueriedAttributeDesignators(@Nonnull final SAML1AttributeDesignatorsMapperService mapper) {
- mapperService = Constraint.isNotNull(mapper, "MapperService cannot be null");
+ public FilterByQueriedAttributeDesignators(@Nonnull final
+ AttributesMapper<AttributeDesignator,IdPAttribute> mapper) {
+ map = Constraint.isNotNull(mapper, "Mapper cannot be null");
attributeContextLookupStrategy = new ChildContextLookup<>(AttributeContext.class).compose(
new ChildContextLookup<>(RelyingPartyContext.class));
@@ -146,7 +148,7 @@ public class FilterByQueriedAttributeDesignators extends AbstractProfileAction {
final Collection<IdPAttribute> keepers = new ArrayList<>(query.getAttributeDesignators().size());
- final Multimap<String,IdPAttribute> mapped = mapperService.mapAttributes(query.getAttributeDesignators());
+ final Multimap<String,IdPAttribute> mapped = map.mapAttributes(query.getAttributeDesignators());
log.debug("Query content mapped to attribute IDs: {}", mapped.keySet());
for (final IdPAttribute attribute : attributeContext.getIdPAttributes().values()) {
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/FilterByQueriedAttributes.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/FilterByQueriedAttributes.java
index 6a0b268..f2c303f 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/FilterByQueriedAttributes.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/FilterByQueriedAttributes.java
@@ -24,26 +24,27 @@ import java.util.function.Function;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.idp.attribute.IdPAttribute;
-import net.shibboleth.idp.attribute.IdPAttributeValue;
-import net.shibboleth.idp.attribute.context.AttributeContext;
-import net.shibboleth.idp.profile.AbstractProfileAction;
-import net.shibboleth.idp.profile.context.RelyingPartyContext;
-import net.shibboleth.idp.saml.attribute.mapping.impl.SAML2AttributesMapperService;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-
import org.opensaml.messaging.context.navigate.ChildContextLookup;
import org.opensaml.messaging.context.navigate.MessageLookup;
import org.opensaml.profile.context.ProfileRequestContext;
import org.opensaml.profile.context.navigate.InboundMessageContextLookup;
+import org.opensaml.saml.saml2.core.Attribute;
import org.opensaml.saml.saml2.core.AttributeQuery;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.collect.Multimap;
+import net.shibboleth.idp.attribute.IdPAttribute;
+import net.shibboleth.idp.attribute.IdPAttributeValue;
+import net.shibboleth.idp.attribute.context.AttributeContext;
+import net.shibboleth.idp.profile.AbstractProfileAction;
+import net.shibboleth.idp.profile.context.RelyingPartyContext;
+import net.shibboleth.idp.saml.attribute.mapping.AttributesMapper;
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.utilities.java.support.component.ComponentSupport;
+import net.shibboleth.utilities.java.support.logic.Constraint;
+
/**
* Action that filters a set of attributes against the {@link org.opensaml.saml.saml2.core.Attribute} objects in
* an {@link AttributeQuery}.
@@ -56,7 +57,7 @@ public class FilterByQueriedAttributes extends AbstractProfileAction {
@Nonnull private final Logger log = LoggerFactory.getLogger(FilterByQueriedAttributes.class);
/** Service used to get the engine used to filter attributes. */
- @Nonnull private final SAML2AttributesMapperService mapperService;
+ @Nonnull private final AttributesMapper<Attribute, IdPAttribute> mapper;
/** Strategy used to locate the {@link AttributeQuery} to filter against. */
@Nonnull private Function<ProfileRequestContext,AttributeQuery> queryLookupStrategy;
@@ -73,10 +74,10 @@ public class FilterByQueriedAttributes extends AbstractProfileAction {
/**
* Constructor.
*
- * @param mapper mapper used to consume designators
+ * @param theMapper mapper used to consume designators
*/
- public FilterByQueriedAttributes(@Nonnull final SAML2AttributesMapperService mapper) {
- mapperService = Constraint.isNotNull(mapper, "MapperService cannot be null");
+ public FilterByQueriedAttributes(@Nonnull final AttributesMapper<Attribute, IdPAttribute> theMapper) {
+ mapper = Constraint.isNotNull(theMapper, "Mapper cannot be null");
attributeContextLookupStrategy = new ChildContextLookup<>(AttributeContext.class).compose(
new ChildContextLookup<>(RelyingPartyContext.class));
@@ -144,7 +145,7 @@ public class FilterByQueriedAttributes extends AbstractProfileAction {
final Collection<IdPAttribute> keepers = new ArrayList<>(query.getAttributes().size());
- final Multimap<String,IdPAttribute> mapped = mapperService.mapAttributes(query.getAttributes());
+ final Multimap<String,IdPAttribute> mapped = mapper.mapAttributes(query.getAttributes());
log.debug("{} Query content mapped to attribute IDs: {}", getLogPrefix(), mapped.keySet());
for (final IdPAttribute attribute : attributeContext.getIdPAttributes().values()) {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list