[java-identity-provider] branch maint-4 updated: JSATTR-2 Move PRC lookup strategy into resolution context
Rod Widdowson
rdw at steadingsoftware.com
Tue Aug 16 15:04:33 UTC 2022
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch maint-4
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=15bbfc07affb8fa4dccb1e0002f27a01fc136979
The following commit(s) were added to refs/heads/maint-4 by this push:
new 15bbfc07a JSATTR-2 Move PRC lookup strategy into resolution context
15bbfc07a is described below
commit 15bbfc07affb8fa4dccb1e0002f27a01fc136979
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Aug 16 16:03:30 2022 +0100
JSATTR-2 Move PRC lookup strategy into resolution context
https://shibboleth.atlassian.net/browse/JSATTR-2
Add deprecations for removal warnings.
---
.../filter/policyrule/filtercontext/impl/PredicatePolicyRule.java | 4 ++++
.../filter/policyrule/filtercontext/impl/ProfilePolicyRule.java | 4 ++++
.../attribute/filter/spring/policyrule/impl/PredicateRuleParser.java | 4 ++++
.../shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java | 5 ++++-
.../idp/attribute/resolver/impl/AttributeResolverImpl.java | 4 ++++
5 files changed, 20 insertions(+), 1 deletion(-)
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 df7bf62df..de2a6394d 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
@@ -29,6 +29,8 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterI
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
import org.opensaml.messaging.context.navigate.ParentContextLookup;
import org.opensaml.profile.context.ProfileRequestContext;
@@ -89,6 +91,8 @@ public class PredicatePolicyRule extends AbstractPolicyRule {
* @param strategy what to set.
*/
public void setProfileContextStrategy(final Function<AttributeFilterContext,ProfileRequestContext> strategy) {
+ DeprecationSupport.warnOnce(ObjectType.METHOD, "setProfileContextStrategy",
+ getLogPrefix(), "(will be removed)");
profileContextStrategy = Constraint.isNotNull(strategy, "ProfileContext lookup strategy cannot be null");
}
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProfilePolicyRule.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProfilePolicyRule.java
index 5b00db30a..cca91c8cd 100644
--- a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProfilePolicyRule.java
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/filtercontext/impl/ProfilePolicyRule.java
@@ -26,6 +26,8 @@ import net.shibboleth.idp.attribute.filter.policyrule.impl.AbstractStringPolicyR
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
import org.opensaml.messaging.context.navigate.ParentContextLookup;
import org.opensaml.profile.context.ProfileRequestContext;
@@ -68,6 +70,8 @@ public class ProfilePolicyRule extends AbstractStringPolicyRule {
* @param strategy what to set.
*/
public void setProfileContextStrategy(final Function<AttributeFilterContext,ProfileRequestContext> strategy) {
+ DeprecationSupport.warnOnce(ObjectType.METHOD, "setProfileContextStrategy",
+ getLogPrefix(), "(will be removed)");
profileContextStrategy = Constraint.isNotNull(strategy, "ProfileContext lookup strategy cannot be null");
}
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/PredicateRuleParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/PredicateRuleParser.java
index c4a4e088a..840920a12 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/PredicateRuleParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/impl/PredicateRuleParser.java
@@ -27,7 +27,9 @@ import org.w3c.dom.Element;
import net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl.PredicatePolicyRule;
import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
import net.shibboleth.idp.attribute.filter.spring.policyrule.BasePolicyRuleParser;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
/**
* Bean definition parser for {@link PredicatePolicyRule}.
@@ -51,6 +53,8 @@ public class PredicateRuleParser extends BasePolicyRuleParser {
if (element.hasAttributeNS(null, "contextStrategyRef")) {
builder.addPropertyReference("profileContextStrategy",
StringSupport.trimOrNull(element.getAttributeNS(null, "contextStrategyRef")));
+ DeprecationSupport.warnOnce(ObjectType.ACTION, "profileContextStrategy",
+ parserContext.getReaderContext().getResource().getDescription(), "(removed)");
}
}
}
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 e6e046323..68e9f33c8 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
@@ -48,6 +48,8 @@ import net.shibboleth.utilities.java.support.component.AbstractIdentifiableIniti
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/**
@@ -143,7 +145,8 @@ public abstract class AbstractResolverPlugin<ResolvedType> extends AbstractIdent
public void setProfileContextStrategy(final Function<AttributeResolutionContext, ProfileRequestContext> strategy) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
-
+ DeprecationSupport.warnOnce(ObjectType.METHOD, "setProfileContextStrategy",
+ getLogPrefix(), "(will be removed)");
profileContextStrategy = Constraint.isNotNull(strategy, "Profile Context Strategy cannot be null");
}
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 730096602..2ce471566 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
@@ -67,6 +67,8 @@ import net.shibboleth.utilities.java.support.collection.LazyMap;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
/**
* A component that resolves the attributes for a particular subject.
@@ -215,6 +217,8 @@ public class AttributeResolverImpl extends AbstractServiceableComponent<Attribut
public void setProfileContextLookupStrategy(
@Nonnull final Function<AttributeResolutionContext,ProfileRequestContext> strategy) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+ DeprecationSupport.warnOnce(ObjectType.METHOD, "setProfileContextLookupStrategy",
+ "AttributeResolverImpl", "(will be removed)");
profileContextStrategy = Constraint.isNotNull(strategy, "ProfileRequestContext lookup strategy cannot be null");
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list