[java-identity-provider] branch master updated: Add class parameter to function c'tor, and fix warnings.
Scott Cantor
cantor.2 at osu.edu
Wed Jul 31 13:59:45 EDT 2019
This is an automated email from the git hooks/post-receive script.
scantor 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=5778e71989eea1d33782bfb6dcce3c024d00dfef
The following commit(s) were added to refs/heads/master by this push:
new 5778e71 Add class parameter to function c'tor, and fix warnings.
5778e71 is described below
commit 5778e71989eea1d33782bfb6dcce3c024d00dfef
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Jul 31 13:59:42 2019 -0400
Add class parameter to function c'tor, and fix warnings.
---
.../filter/matcher/impl/ScriptedMatcher.java | 4 +--
.../filtercontext/impl/PredicatePolicyRule.java | 4 +--
.../filter/policyrule/impl/ScriptedPolicyRule.java | 6 ++--
.../attribute/resolver/AbstractResolverPlugin.java | 36 +++++++++++++---------
.../resolver/AttributeResolutionLookupTest.java | 2 +-
.../ad/impl/ContextDerivedAttributeDefinition.java | 2 +-
.../ad/impl/ScriptedAttributeDefinition.java | 2 +-
.../resolver/dc/impl/ScriptedDataConnector.java | 2 +-
.../resolver/impl/AttributeResolverImpl.java | 2 +-
.../impl/AttributeResolutionContextTest.java | 6 ++--
.../resolver/spring/predicates-navigate.xml | 3 +-
.../src/main/resources/system/conf/soap-client.xml | 2 +-
12 files changed, 39 insertions(+), 32 deletions(-)
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcher.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcher.java
index d375065..35c6800 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcher.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/impl/ScriptedMatcher.java
@@ -85,8 +85,8 @@ public class ScriptedMatcher extends AbstractIdentifiableInitializableComponent
public ScriptedMatcher() {
// Defaults to ProfileRequestContext -> RelyingPartyContext -> AttributeContext.
prcLookupStrategy =
- new ParentContextLookup<RelyingPartyContext,ProfileRequestContext>().compose(
- new ParentContextLookup<AttributeFilterContext,RelyingPartyContext>());
+ new ParentContextLookup<>(ProfileRequestContext.class).compose(
+ new ParentContextLookup<>(RelyingPartyContext.class));
scLookupStrategy = new ChildContextLookup<>(SubjectContext.class);
}
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PredicatePolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PredicatePolicyRule.java
index ef23a49..39890ff 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PredicatePolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/PredicatePolicyRule.java
@@ -52,8 +52,8 @@ public class PredicatePolicyRule extends AbstractPolicyRule {
/** Constructor. */
public PredicatePolicyRule() {
profileContextStrategy =
- new ParentContextLookup<RelyingPartyContext,ProfileRequestContext>().compose(
- new ParentContextLookup<AttributeFilterContext,RelyingPartyContext>());
+ new ParentContextLookup<>(ProfileRequestContext.class).compose(
+ new ParentContextLookup<>(RelyingPartyContext.class));
}
/**
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRule.java
index 4d26222..62deb64 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/ScriptedPolicyRule.java
@@ -79,9 +79,9 @@ public class ScriptedPolicyRule extends AbstractIdentifiableInitializableCompone
public ScriptedPolicyRule() {
// Defaults to ProfileRequestContext -> RelyingPartyContext -> AttributeContext.
prcLookupStrategy =
- new ParentContextLookup<RelyingPartyContext,ProfileRequestContext>().compose(
- new ParentContextLookup<AttributeFilterContext,RelyingPartyContext>());
- scLookupStrategy = new ChildContextLookup<ProfileRequestContext,SubjectContext>(SubjectContext.class);
+ new ParentContextLookup<>(ProfileRequestContext.class).compose(
+ new ParentContextLookup<>(RelyingPartyContext.class));
+ scLookupStrategy = new ChildContextLookup<>(SubjectContext.class);
}
/**
diff --git a/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java b/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java
index 224ec43..bb24830 100644
--- a/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java
+++ b/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java
@@ -65,20 +65,23 @@ public abstract class AbstractResolverPlugin<ResolvedType> extends AbstractIdent
private boolean propagateResolutionExceptions = true;
/** Strategy to get the {@link ProfileRequestContext}. */
- @Nonnull private Function<AttributeResolutionContext, ProfileRequestContext> profileContextStrategy =
- new ParentContextLookup<>();
+ @Nonnull private Function<AttributeResolutionContext, ProfileRequestContext> profileContextStrategy;
/** Criterion that must be met for this plugin to be active for the given request. */
@Nullable private Predicate<ProfileRequestContext> activationCondition;
/** The {@link ResolverAttributeDefinitionDependency}s this plug-in depends on. */
- @Nonnull @NonnullElements private Set<ResolverAttributeDefinitionDependency> attributeDependencies =
- Collections.emptySet();
+ @Nonnull @NonnullElements private Set<ResolverAttributeDefinitionDependency> attributeDependencies;
/** The {@link ResolverDataConnectorDependency}s this plug-in depends on. */
- @Nonnull @NonnullElements private Set<ResolverDataConnectorDependency> dataConnectorDependencies =
- Collections.emptySet();
+ @Nonnull @NonnullElements private Set<ResolverDataConnectorDependency> dataConnectorDependencies;
+ /** Constructor. */
+ public AbstractResolverPlugin() {
+ profileContextStrategy = new ParentContextLookup<>(ProfileRequestContext.class);
+ attributeDependencies = Collections.emptySet();
+ dataConnectorDependencies = Collections.emptySet();
+ }
/** {@inheritDoc} */
@Override public boolean isPropagateResolutionExceptions() {
@@ -99,22 +102,24 @@ public abstract class AbstractResolverPlugin<ResolvedType> extends AbstractIdent
}
/**
- * Sets the mechanism to find out the {@link ProfileRequestContext}.
+ * Gets the mechanism to find out the {@link ProfileRequestContext}.
*
- * @param strategy the mechanism
+ * @return the mechanism
*/
- public void setProfileContextStrategy(final Function<AttributeResolutionContext, ProfileRequestContext> strategy) {
- ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
- profileContextStrategy = Constraint.isNotNull(strategy, "Profile Context Strategy cannot be null");
+ public Function<AttributeResolutionContext, ProfileRequestContext> getProfileContextStrategy() {
+ return profileContextStrategy;
}
/**
- * Gets the mechanism to find out the {@link ProfileRequestContext}.
+ * Sets the mechanism to find out the {@link ProfileRequestContext}.
*
- * @return the mechanism
+ * @param strategy the mechanism
*/
- public Function<AttributeResolutionContext, ProfileRequestContext> getProfileContextStrategy() {
- return profileContextStrategy;
+ public void setProfileContextStrategy(final Function<AttributeResolutionContext, ProfileRequestContext> strategy) {
+ ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
+
+ profileContextStrategy = Constraint.isNotNull(strategy, "Profile Context Strategy cannot be null");
}
/** {@inheritDoc} */
@@ -130,6 +135,7 @@ public abstract class AbstractResolverPlugin<ResolvedType> extends AbstractIdent
public void setActivationCondition(@Nonnull final Predicate<ProfileRequestContext> pred) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
+
activationCondition = Constraint.isNotNull(pred, "Activation condition cannot be null");
}
diff --git a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionLookupTest.java b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionLookupTest.java
index 6aeb144..fb1209c 100644
--- a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionLookupTest.java
+++ b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolutionLookupTest.java
@@ -47,7 +47,7 @@ public class AttributeResolutionLookupTest {
parent.setAttributeIssuerID("parent");
final TestClass what = new TestClass();
- what.setAttributeResolutionContextLookupStrategy(new ParentContextLookup<ProfileRequestContext, AttributeResolutionContext>());
+ what.setAttributeResolutionContextLookupStrategy(new ParentContextLookup<>(AttributeResolutionContext.class));
Assert.assertEquals(what.apply(pfc), "parent");
}
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ContextDerivedAttributeDefinition.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ContextDerivedAttributeDefinition.java
index 0ad7b19..feb48ca 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ContextDerivedAttributeDefinition.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ContextDerivedAttributeDefinition.java
@@ -60,7 +60,7 @@ public class ContextDerivedAttributeDefinition extends AbstractAttributeDefiniti
/** Constructor. */
public ContextDerivedAttributeDefinition() {
- prcLookupStrategy = new ParentContextLookup<>();
+ prcLookupStrategy = new ParentContextLookup<>(ProfileRequestContext.class);
}
/**
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java
index 65f580e..e8d5aef 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java
@@ -97,7 +97,7 @@ public class ScriptedAttributeDefinition extends AbstractAttributeDefinition {
/** Constructor. */
public ScriptedAttributeDefinition() {
// Defaults to ProfileRequestContext -> AttributeContext.
- prcLookupStrategy = new ParentContextLookup<>();
+ prcLookupStrategy = new ParentContextLookup<>(ProfileRequestContext.class);
scLookupStrategy = new ChildContextLookup<>(SubjectContext.class);
}
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnector.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnector.java
index 8a0f388..3775b90 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnector.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnector.java
@@ -84,7 +84,7 @@ public class ScriptedDataConnector extends AbstractDataConnector {
/** Constructor. */
public ScriptedDataConnector() {
// Defaults to ProfileRequestContext -> RelyingPartyContext -> AttributeContext.
- prcLookupStrategy = new ParentContextLookup<>();
+ prcLookupStrategy = new ParentContextLookup<>(ProfileRequestContext.class);
scLookupStrategy = new ChildContextLookup<>(SubjectContext.class);
}
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
index 31ff44d..56559bc 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
@@ -101,7 +101,7 @@ public class AttributeResolverImpl extends AbstractServiceableComponent<Attribut
/** Constructor. */
public AttributeResolverImpl() {
- profileContextStrategy = new ParentContextLookup<>();
+ profileContextStrategy = new ParentContextLookup<>(ProfileRequestContext.class);
}
/** Sets the attribute definitions for this resolver.
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolutionContextTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolutionContextTest.java
index 6cc2164..7b65825 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolutionContextTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolutionContextTest.java
@@ -150,9 +150,9 @@ public class AttributeResolutionContextTest {
assertNull(issuerFn.apply(profileCtx), THE_ISSUER);
assertNull(recipientFn.apply(profileCtx), THE_RECIPIENT);
- principalFn.setAttributeResolutionContextLookupStrategy(new ParentContextLookup<ProfileRequestContext, AttributeResolutionContext>());
- recipientFn.setAttributeResolutionContextLookupStrategy(new ParentContextLookup<ProfileRequestContext, AttributeResolutionContext>());
- issuerFn.setAttributeResolutionContextLookupStrategy(new ParentContextLookup<ProfileRequestContext, AttributeResolutionContext>());
+ principalFn.setAttributeResolutionContextLookupStrategy(new ParentContextLookup<>(AttributeResolutionContext.class));
+ recipientFn.setAttributeResolutionContextLookupStrategy(new ParentContextLookup<>(AttributeResolutionContext.class));
+ issuerFn.setAttributeResolutionContextLookupStrategy(new ParentContextLookup<>(AttributeResolutionContext.class));
assertSame(principalFn.apply(profileCtx), THE_PRINCIPAL);
assertSame(issuerFn.apply(profileCtx), THE_ISSUER);
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/predicates-navigate.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/predicates-navigate.xml
index 71a39de..ca54681 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/predicates-navigate.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/predicates-navigate.xml
@@ -11,7 +11,8 @@
c:type="org.opensaml.profile.context.ProfileRequestContext" />
<bean id="findAttributeCtx"
- class="org.opensaml.messaging.context.navigate.ParentContextLookup" />
+ class="org.opensaml.messaging.context.navigate.ParentContextLookup"
+ c:type="net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext" />
<bean id="principalFn"
class="net.shibboleth.idp.attribute.resolver.context.navigate.AttributePrincipalLookupFunction"
diff --git a/idp-conf/src/main/resources/system/conf/soap-client.xml b/idp-conf/src/main/resources/system/conf/soap-client.xml
index 7db69f2..ac5d0b4 100644
--- a/idp-conf/src/main/resources/system/conf/soap-client.xml
+++ b/idp-conf/src/main/resources/system/conf/soap-client.xml
@@ -149,7 +149,7 @@
<bean id="SOAPClient.OperationContextLookup"
class="org.opensaml.messaging.context.navigate.RecursiveTypedParentContextLookup"
- c:targetClass="#{T(org.opensaml.messaging.context.InOutOperationContext)}" />
+ c:targetClass="org.opensaml.messaging.context.InOutOperationContext" />
<bean id="SOAPClient.OperationContextEntityIDLookup"
class="org.opensaml.saml.common.binding.security.impl.OperationContextEntityIDLookup" />
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list