[java-identity-provider] branch master updated: IDP-1244 Clarify some deprecations

[Rod Widdowson]

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=7a3f3283263e5b6d98029c22fe11d2555a05261e

The following commit(s) were added to refs/heads/master by this push:
       new  7a3f328   IDP-1244 Clarify some deprecations
7a3f328 is described below

commit 7a3f3283263e5b6d98029c22fe11d2555a05261e
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon May 7 14:56:14 2018 +0100

    IDP-1244 Clarify some deprecations
    
    Mostly changes to logging.
---
 .../spring/impl/AttributeFilterPolicyParser.java       | 18 +++++++++---------
 .../resolver/ResolverDataConnectorDependency.java      |  2 +-
 .../metadata/filter/impl/SchemaValidationParser.java   | 15 ++++++++-------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeFilterPolicyParser.java b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeFilterPolicyParser.java
index 4801db9..664c122 100644
--- a/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeFilterPolicyParser.java
+++ b/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/impl/AttributeFilterPolicyParser.java
@@ -22,14 +22,6 @@ import java.util.List;
 import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
-import net.shibboleth.ext.spring.util.SpringSupport;
-import net.shibboleth.idp.attribute.filter.AttributeFilterPolicy;
-import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanMetadataElement;
@@ -41,6 +33,14 @@ import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
 
+import net.shibboleth.ext.spring.util.SpringSupport;
+import net.shibboleth.idp.attribute.filter.AttributeFilterPolicy;
+import net.shibboleth.idp.attribute.filter.spring.BaseFilterParser;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.utilities.java.support.xml.ElementSupport;
+
 /** Bean definition parser for an {@link AttributeFilterPolicy}. */
 public class AttributeFilterPolicyParser extends BaseFilterParser {
 
@@ -97,7 +97,7 @@ public class AttributeFilterPolicyParser extends BaseFilterParser {
             final List<Element> policyRequirementsRef =
                     ElementSupport.getChildElements(config, POLICY_REQUIREMENT_RULE_REF);
             if (policyRequirementsRef != null && policyRequirementsRef.size() > 0) {
-                    DeprecationSupport.warnOnce(ObjectType.ELEMENT, POLICY_REQUIREMENT_RULE.toString(),
+                    DeprecationSupport.warnOnce(ObjectType.ELEMENT, POLICY_REQUIREMENT_RULE_REF.toString(),
                         parserContext.getReaderContext().getResource().getDescription(),  null);
 
                 final String referenceText = getReferenceText(policyRequirementsRef.get(0));
diff --git a/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolverDataConnectorDependency.java b/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolverDataConnectorDependency.java
index a7485d5..e81f656 100644
--- a/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolverDataConnectorDependency.java
+++ b/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolverDataConnectorDependency.java
@@ -99,7 +99,7 @@ public final class ResolverDataConnectorDependency extends ResolverPluginDepende
     @Override @Deprecated public void setDependencyAttributeId(@Nullable final String attributeId) {
         DeprecationSupport.warn(ObjectType.METHOD,
                 "ResolverDataConnectorDependency#setDependencyAttributeId(String)",
-                null, null);
+                null, "#setAttributeNames(Collection<String>)");
         super.setDependencyAttributeId(attributeId);
     }
 
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SchemaValidationParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SchemaValidationParser.java
index e7621cb..e490c2e 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SchemaValidationParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SchemaValidationParser.java
@@ -22,11 +22,6 @@ import java.util.List;
 import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
-import net.shibboleth.ext.spring.util.SpringSupport;
-import net.shibboleth.idp.profile.spring.relyingparty.metadata.AbstractMetadataProviderParser;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
 import org.opensaml.saml.metadata.resolver.filter.impl.SchemaValidationFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,6 +30,13 @@ import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
 
+import net.shibboleth.ext.spring.util.SpringSupport;
+import net.shibboleth.idp.profile.spring.relyingparty.metadata.AbstractMetadataProviderParser;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.utilities.java.support.xml.ElementSupport;
+
 /**
  * Parser for a <SchemaValidation> filter.
  */
@@ -68,8 +70,7 @@ public class SchemaValidationParser extends AbstractSingleBeanDefinitionParser {
             builder.addConstructorArgReference("shibboleth.SchemaBuilder");
         }
         if (null != schemaNameElements && !schemaNameElements.isEmpty()) {
-
-            log.warn("The <ExtensionSchema> element is DEPRECATED and will be removed in the next major version.");
+            DeprecationSupport.warn(ObjectType.ELEMENT, "ExtensionSchema", null, null);
             builder.addConstructorArgValue(SpringSupport.getElementTextContentAsManagedList(schemaNameElements));
         }
     }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.