[java-identity-provider] 01/02: IDP-1177 Remove duplicate deprecation warning
Rod Widdowson
rdw at steadingsoftware.com
Sun Jul 16 08:29:32 EDT 2017
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=5a81649b57d985308a84e9ce2e6617f564bbf18e
commit 5a81649b57d985308a84e9ce2e6617f564bbf18e
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Jul 16 11:43:29 2017 +0100
IDP-1177 Remove duplicate deprecation warning
https://issues.shibboleth.net/jira/browse/IDP-1177
The SAML rules' namespace is alreadywarned for in the AbstractWarningFilterParser
---
.../AttributeRequesterEntityAttributeExactRuleParser.java | 12 ------------
.../AttributeRequesterEntityAttributeRegexRuleParser.java | 11 -----------
.../saml/impl/AttributeRequesterInEntityGroupRuleParser.java | 11 -----------
.../saml/impl/AttributeRequesterNameIdFormatRuleParser.java | 11 -----------
4 files changed, 45 deletions(-)
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterEntityAttributeExactRuleParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterEntityAttributeExactRuleParser.java
index 880b3ad..0188c73 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterEntityAttributeExactRuleParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterEntityAttributeExactRuleParser.java
@@ -22,10 +22,7 @@ import javax.xml.namespace.QName;
import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeRequesterEntityAttributeExactPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
-import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
@@ -47,10 +44,6 @@ public class AttributeRequesterEntityAttributeExactRuleParser extends AbstractEn
public static final QName SCHEMA_TYPE_AFP = new QName(BaseFilterParser.NAMESPACE,
"EntityAttributeExactMatch");
- /** log. */
- private final Logger log = LoggerFactory.getLogger(AttributeRequesterEntityAttributeExactRuleParser.class);
-
- /** {@inheritDoc} */
@Override @Nonnull protected Class<AttributeRequesterEntityAttributeExactPolicyRule> getNativeBeanClass() {
return AttributeRequesterEntityAttributeExactPolicyRule.class;
@@ -66,11 +59,6 @@ public class AttributeRequesterEntityAttributeExactRuleParser extends AbstractEn
@Nonnull final BeanDefinitionBuilder builder) {
super.doNativeParse(element, parserContext, builder);
- if (SCHEMA_TYPE_V2.equals(DOMTypeSupport.getXSIType(element))) {
- log.info("Filter type '{}' has been deprecated, please use '{}'.", SCHEMA_TYPE_V2.getLocalPart(),
- SCHEMA_TYPE.getLocalPart());
- }
-
builder.addPropertyValue("value", element.getAttributeNS(null, "attributeValue"));
}
}
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterEntityAttributeRegexRuleParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterEntityAttributeRegexRuleParser.java
index 65131f1..f772156 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterEntityAttributeRegexRuleParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterEntityAttributeRegexRuleParser.java
@@ -22,10 +22,7 @@ import javax.xml.namespace.QName;
import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeRequesterEntityAttributeRegexPolicyRule;
import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
-import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
@@ -47,9 +44,6 @@ public class AttributeRequesterEntityAttributeRegexRuleParser extends AbstractEn
public static final QName SCHEMA_TYPE_V2 = new QName(AttributeFilterSAMLNamespaceHandler.NAMESPACE,
"AttributeRequesterEntityAttributeRegexMatch");
- /** log. */
- private final Logger log = LoggerFactory.getLogger(AttributeRequesterEntityAttributeRegexRuleParser.class);
-
/** {@inheritDoc} */
@Override @Nonnull protected Class<AttributeRequesterEntityAttributeRegexPolicyRule> getNativeBeanClass() {
@@ -66,11 +60,6 @@ public class AttributeRequesterEntityAttributeRegexRuleParser extends AbstractEn
@Nonnull final BeanDefinitionBuilder builder) {
super.doNativeParse(element, parserContext, builder);
- if (SCHEMA_TYPE_V2.equals(DOMTypeSupport.getXSIType(element))) {
- log.info("Filter type '{}' has been deprecated, please use '{}'.", SCHEMA_TYPE_V2.getLocalPart(),
- SCHEMA_TYPE.getLocalPart());
- }
-
builder.addPropertyValue("valueRegex", element.getAttributeNS(null, "attributeValueRegex"));
}
}
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterInEntityGroupRuleParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterInEntityGroupRuleParser.java
index c796c9d..03e981b 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterInEntityGroupRuleParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterInEntityGroupRuleParser.java
@@ -24,10 +24,7 @@ import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeRequest
import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
import net.shibboleth.idp.attribute.filter.spring.policyrule.BasePolicyRuleParser;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
@@ -47,9 +44,6 @@ public class AttributeRequesterInEntityGroupRuleParser extends BasePolicyRulePar
public static final QName SCHEMA_TYPE_V2 = new QName(AttributeFilterSAMLNamespaceHandler.NAMESPACE,
"AttributeRequesterInEntityGroup");
- /** log. */
- private final Logger log = LoggerFactory.getLogger(AttributeRequesterInEntityGroupRuleParser.class);
-
/** {@inheritDoc} */
@Override @Nonnull protected Class<AttributeRequesterInEntityGroupPolicyRule> getNativeBeanClass() {
return AttributeRequesterInEntityGroupPolicyRule.class;
@@ -64,11 +58,6 @@ public class AttributeRequesterInEntityGroupRuleParser extends BasePolicyRulePar
@Override protected void doNativeParse(@Nonnull final Element element, @Nonnull final ParserContext parserContext,
@Nonnull final BeanDefinitionBuilder builder) {
- if (SCHEMA_TYPE_V2.equals(DOMTypeSupport.getXSIType(element))) {
- log.info("Filter type '{}' has been deprecated, please use '{}'.", SCHEMA_TYPE_V2.getLocalPart(),
- SCHEMA_TYPE.getLocalPart());
- }
-
builder.addPropertyValue("entityGroup", StringSupport.trimOrNull(element.getAttributeNS(null, "groupID")));
}
}
diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterNameIdFormatRuleParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterNameIdFormatRuleParser.java
index fefc395..41b4ce0 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterNameIdFormatRuleParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/impl/AttributeRequesterNameIdFormatRuleParser.java
@@ -24,10 +24,7 @@ import net.shibboleth.idp.attribute.filter.policyrule.saml.impl.AttributeRequest
import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
import net.shibboleth.idp.attribute.filter.spring.policyrule.BasePolicyRuleParser;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
@@ -49,9 +46,6 @@ public class AttributeRequesterNameIdFormatRuleParser extends BasePolicyRulePars
public static final QName SCHEMA_TYPE_V2 = new QName(AttributeFilterSAMLNamespaceHandler.NAMESPACE,
"AttributeRequesterNameIDFormatExactMatch");
- /** log. */
- private final Logger log = LoggerFactory.getLogger(AttributeRequesterNameIdFormatRuleParser.class);
-
/** {@inheritDoc} */
@Override @Nonnull protected Class<AttributeRequesterNameIDFormatExactPolicyRule> getNativeBeanClass() {
return AttributeRequesterNameIDFormatExactPolicyRule.class;
@@ -66,11 +60,6 @@ public class AttributeRequesterNameIdFormatRuleParser extends BasePolicyRulePars
@Override protected void doNativeParse(@Nonnull final Element element, @Nonnull final ParserContext parserContext,
@Nonnull final BeanDefinitionBuilder builder) {
- if (SCHEMA_TYPE_V2.equals(DOMTypeSupport.getXSIType(element))) {
- log.info("Filter type '{}' has been deprecated, please use '{}'.", SCHEMA_TYPE_V2.getLocalPart(),
- SCHEMA_TYPE.getLocalPart());
- }
-
builder.addPropertyValue("nameIdFormat",
StringSupport.trimOrNull(element.getAttributeNS(null, "nameIdFormat")));
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list