[java-shib-attribute] branch main updated: JSATTR-11 - Removal of deprecated features
Scott Cantor
cantor.2 at osu.edu
Tue Jan 24 15:18:21 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-shib-attribute.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=2277c9ad58b80158f8e3a4c8b440a55b2c772056
The following commit(s) were added to refs/heads/main by this push:
new 2277c9ad5 JSATTR-11 - Removal of deprecated features
2277c9ad5 is described below
commit 2277c9ad58b80158f8e3a4c8b440a55b2c772056
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jan 24 10:18:18 2023 -0500
JSATTR-11 - Removal of deprecated features
https://shibboleth.atlassian.net/browse/JSATTR-11
---
.../policyrule/impl/AbstractStringPolicyRule.java | 24 ----------------------
.../resolver/AbstractAttributeDefinition.java | 2 +-
.../dc/impl/StoredIdDataConnectorParser.java | 9 --------
.../dc/ldap/impl/LDAPDataConnectorParser.java | 11 +---------
.../schema/shibboleth-attribute-resolver.xsd | 15 --------------
5 files changed, 2 insertions(+), 59 deletions(-)
diff --git a/shib-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/AbstractStringPolicyRule.java b/shib-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/AbstractStringPolicyRule.java
index 0d96da0d1..961dc1958 100644
--- a/shib-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/AbstractStringPolicyRule.java
+++ b/shib-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/policyrule/impl/AbstractStringPolicyRule.java
@@ -20,8 +20,6 @@ package net.shibboleth.idp.attribute.filter.policyrule.impl;
import javax.annotation.Nullable;
import net.shibboleth.idp.attribute.filter.PolicyRequirementRule;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
/**
* General {@link PolicyRequirementRule} for {@link String} comparison of strings in Attribute Filters.
@@ -51,28 +49,6 @@ public abstract class AbstractStringPolicyRule extends AbstractPolicyRule implem
public void setMatchString(@Nullable final String match) {
matchString = match;
}
-
- /**
- * Gets whether the policy evaluation is case insensitive.
- *
- * @return whether the policy evaluation is case insensitive
- * @deprecated in V4: Use isCaseSensitive
- */
- @Deprecated public boolean isIgnoreCase() {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "isIgnoreCase", null, "isCaseSensitive");
- return !isCaseSensitive();
- }
-
- /**
- * Sets whether the policy evaluation is case insensitive.
- *
- * @param isCaseInsensitive whether the policy evaluation is case insensitive
- * @deprecated in V4: Use setCaseSensitive
- */
- @Deprecated public void setIgnoreCase(final boolean isCaseInsensitive) {
- DeprecationSupport.warnOnce(ObjectType.METHOD, "setIgnoreCase", null, "setCaseSensitive");
- setCaseSensitive(!isCaseInsensitive);
- }
/**
* Gets whether the policy evaluation is case sensitive.
diff --git a/shib-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinition.java b/shib-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinition.java
index d3c492cc3..8a2dc8a20 100644
--- a/shib-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinition.java
+++ b/shib-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractAttributeDefinition.java
@@ -107,7 +107,7 @@ public abstract class AbstractAttributeDefinition extends AbstractResolverPlugin
"Use of AttributeDefinition id with invalid characters",
getLogPrefix(),
null);
- log.debug("{} : Deprecated characters in AttributeDefintion id", getLogPrefix());
+ log.debug("{} Deprecated characters in AttributeDefintion id", getLogPrefix());
}
}
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StoredIdDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StoredIdDataConnectorParser.java
index 26f2443b7..a3978b9d6 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StoredIdDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StoredIdDataConnectorParser.java
@@ -28,8 +28,6 @@ import org.w3c.dom.Element;
import net.shibboleth.idp.attribute.impl.JDBCPairwiseIdStore;
import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.spring.util.SpringSupport;
@@ -90,13 +88,6 @@ public class StoredIdDataConnectorParser extends ComputedIdDataConnectorParser {
StringSupport.trimOrNull(config.getAttributeNS(null, "tableName")));
}
- if (config.hasAttributeNS(null, "failFast")) {
- // V4 Deprecation
- DeprecationSupport.warnOnce(ObjectType.ATTRIBUTE, "failFast",
- parserContext.getReaderContext().getResource().getDescription(), "failFastInitialize");
- builder.addPropertyValue("verifyDatabase",
- StringSupport.trimOrNull(config.getAttributeNS(null, "failFast")));
- }
if (config.hasAttributeNS(null, "failFastInitialize")) {
builder.addPropertyValue("verifyDatabase",
StringSupport.trimOrNull(config.getAttributeNS(null, "failFastInitialize")));
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
index 66f94a333..f6cbc50a2 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
@@ -69,8 +69,6 @@ import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamesp
import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.logic.Constraint;
-import net.shibboleth.shared.primitive.DeprecationSupport;
-import net.shibboleth.shared.primitive.DeprecationSupport.ObjectType;
import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.spring.util.SpringSupport;
@@ -631,14 +629,7 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
AttributeSupport.getAttributeValue(poolConfigElement, new QName("validateTimerPeriod")));
connectionFactory.addPropertyValue("validator", validator.getBeanDefinition());
- final String failFastInitialize =
- AttributeSupport.getAttributeValue(poolConfigElement, new QName("failFastInitialize"));
- if (failFastInitialize != null) {
- // V4 Deprecation
- DeprecationSupport.warnOnce(ObjectType.ATTRIBUTE, "failfastInitialize (on a ConnectionPool element)",
- null, "failfastInitialize (on a DataConnector)");
- connectionFactory.addPropertyValue("failFastInitialize", failFastInitialize);
- } else if (configElement.hasAttributeNS(null, ATTR_FAIL_FAST)) {
+ if (configElement.hasAttributeNS(null, ATTR_FAIL_FAST)) {
connectionFactory.addPropertyValue("failFastInitialize",
StringSupport.trimOrNull(configElement.getAttributeNS(null, ATTR_FAIL_FAST)));
}
diff --git a/shib-attribute-resolver-spring/src/main/resources/schema/shibboleth-attribute-resolver.xsd b/shib-attribute-resolver-spring/src/main/resources/schema/shibboleth-attribute-resolver.xsd
index 1f90cf4b1..8a57d8433 100644
--- a/shib-attribute-resolver-spring/src/main/resources/schema/shibboleth-attribute-resolver.xsd
+++ b/shib-attribute-resolver-spring/src/main/resources/schema/shibboleth-attribute-resolver.xsd
@@ -1633,13 +1633,6 @@
</documentation>
</annotation>
</attribute>
- <attribute name="failFast" type="resolver:string">
- <annotation>
- <documentation>
- Deprecated, use failFastInitialize
- </documentation>
- </annotation>
- </attribute>
<attribute name="failFastInitialize" type="resolver:string">
<annotation>
<documentation>
@@ -1888,14 +1881,6 @@
</documentation>
</annotation>
</attribute>
- <attribute name="failFastInitialize" type="resolver:string">
- <annotation>
- <documentation>
- Deprecated: A boolean flag indicating whether pool initialization should fail if configuration criteria is not met.
- Default value is true.
- </documentation>
- </annotation>
- </attribute>
</complexType>
<complexType name="CacheConfigType">
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list