[java-identity-provider] branch maint-3.4 updated: IDP-1414 IDP-1375 Use stamdard mechanism to mark deprecation of xxxFileCredetials

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch maint-3.4
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=debd863b3fbab9166f808077476873f7bffe24c3

The following commit(s) were added to refs/heads/maint-3.4 by this push:
       new  debd863   IDP-1414 IDP-1375 Use stamdard mechanism to mark deprecation of xxxFileCredetials
debd863 is described below

commit debd863b3fbab9166f808077476873f7bffe24c3
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Mar 20 11:38:14 2019 +0000

    IDP-1414 IDP-1375 Use stamdard mechanism to mark deprecation of xxxFileCredetials
    
    https://issues.shibboleth.net/jira/browse/IDP-1414
    https://issues.shibboleth.net/jira/browse/IDP-1375
---
 .../impl/BasicResourceCredentialParser.java         | 20 ++++++++++----------
 .../impl/X509ResourceCredentialParser.java          | 21 +++++++++++----------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/BasicResourceCredentialParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/BasicResourceCredentialParser.java
index 8d1548a..eefd55f 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/BasicResourceCredentialParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/BasicResourceCredentialParser.java
@@ -19,15 +19,15 @@ package net.shibboleth.idp.profile.spring.relyingparty.security.credential.impl;
 
 import javax.xml.namespace.QName;
 
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.w3c.dom.Element;
+
 import net.shibboleth.idp.profile.spring.factory.BasicResourceCredentialFactoryBean;
 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.xml.DOMTypeSupport;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.w3c.dom.Element;
-
 /**
  * Parser for BasicFilesystem and BasicResourceBacked Credentials.
  */
@@ -41,9 +41,6 @@ public class BasicResourceCredentialParser extends AbstractBasicCredentialParser
     public static final QName TYPE_NAME_RESOURCE = new QName(AbstractMetadataProviderParser.SECURITY_NAMESPACE,
             "BasicResourceBacked");
 
-    /** log. */
-    private final Logger log = LoggerFactory.getLogger(BasicResourceCredentialParser.class);
-
     /** {@inheritDoc} */
     @Override protected Class<?> getBeanClass(final Element element) {
         return BasicResourceCredentialFactoryBean.class;
@@ -52,8 +49,11 @@ public class BasicResourceCredentialParser extends AbstractBasicCredentialParser
     /** {@inheritDoc} */
     @Override protected void doParse(final Element element, final BeanDefinitionBuilder builder) {
         if (TYPE_NAME_FILESYSTEM.equals(DOMTypeSupport.getXSIType(element))) {
-            log.warn("Credential type '{}' has been deprecated; use the compatible Credential type '{}'",
-                    TYPE_NAME_FILESYSTEM.getLocalPart(), TYPE_NAME_RESOURCE.getLocalPart());
+            DeprecationSupport.warnOnce(
+                    ObjectType.ELEMENT,
+                    TYPE_NAME_FILESYSTEM.getLocalPart(),
+                    null,
+                    TYPE_NAME_RESOURCE.getLocalPart());
         }
         super.doParse(element, builder);
     }
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/X509ResourceCredentialParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/X509ResourceCredentialParser.java
index 627467a..a3328f3 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/X509ResourceCredentialParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/credential/impl/X509ResourceCredentialParser.java
@@ -19,15 +19,15 @@ package net.shibboleth.idp.profile.spring.relyingparty.security.credential.impl;
 
 import javax.xml.namespace.QName;
 
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.w3c.dom.Element;
+
 import net.shibboleth.idp.profile.spring.factory.BasicX509CredentialFactoryBean;
 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.xml.DOMTypeSupport;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.w3c.dom.Element;
-
 /**
  * Parser for X509Filesystem credentials.
  */
@@ -41,9 +41,6 @@ public class X509ResourceCredentialParser extends AbstractX509CredentialParser {
     public static final QName TYPE_NAME_RESOURCE = new QName(AbstractMetadataProviderParser.SECURITY_NAMESPACE,
             "X509ResourceBacked");
 
-    /** log. */
-    private final Logger log = LoggerFactory.getLogger(X509ResourceCredentialParser.class);
-
     @Override protected Class<?> getBeanClass(final Element element) {
         return BasicX509CredentialFactoryBean.class;
     }
@@ -51,8 +48,12 @@ public class X509ResourceCredentialParser extends AbstractX509CredentialParser {
     /** {@inheritDoc} */
     @Override protected void doParse(final Element element, final BeanDefinitionBuilder builder) {
         if (TYPE_NAME_FILESYSTEM.equals(DOMTypeSupport.getXSIType(element))) {
-            log.warn("Credential type '{}' has been deprecated; use the compatible Credential type '{}'",
-                    TYPE_NAME_FILESYSTEM.getLocalPart(), TYPE_NAME_RESOURCE.getLocalPart());
+            DeprecationSupport.warnOnce(
+                    ObjectType.ELEMENT,
+                    TYPE_NAME_FILESYSTEM.getLocalPart(),
+                    null,
+                    TYPE_NAME_RESOURCE.getLocalPart());
+
         }
         super.doParse(element, builder);
     }

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