[java-identity-provider] branch maint-4 updated: JSATTR-4 Remove springResources from data connector

[Rod Widdowson]

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

The following commit(s) were added to refs/heads/maint-4 by this push:
     new f18513212 JSATTR-4 Remove springResources from data connector
f18513212 is described below

commit f185132121aaf1d2479300455bc0fa6403c3fc4a
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Oct 24 16:25:34 2022 +0100

    JSATTR-4 Remove springResources from data connector
    
    https://shibboleth.atlassian.net/browse/JSATTR-4
    
    Deprecate
            springResources
            springResourcesRef
            factoryPostProcessorsRef
            postProcessorsRef
    in the V4 parser
---
 .../resolver/spring/dc/AbstractDataConnectorParser.java          | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java
index 269449405..eb573b824 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/AbstractDataConnectorParser.java
@@ -78,6 +78,7 @@ public abstract class AbstractDataConnectorParser extends BaseResolverPluginPars
 
     /**
      * Whether to export all attributes.
+     *
      */
     @Nonnull @NotEmpty public static final String ATTR_EXPORT_ALL = "exportAllAttributes";
 
@@ -174,17 +175,23 @@ public abstract class AbstractDataConnectorParser extends BaseResolverPluginPars
             builder.setInitMethodName(null);
             builder.setDestroyMethodName(null);
             if (config.hasAttributeNS(null, ATTR_SPRING_RESOURCE)) {
+                DeprecationSupport.warnOnce(ObjectType.ATTRIBUTE, ATTR_SPRING_RESOURCE,
+                        parserContext.getReaderContext().getResource().getDescription(), "<will be removed>");
                 final String[] resources =
                         StringSupport.trimOrNull(config.getAttributeNS(null, ATTR_SPRING_RESOURCE)).split(";");
                 log.debug("{} Native configuration from {}", getLogPrefix(), resources);
                 builder.addPropertyValue("resources", resources);
             } else {
+                DeprecationSupport.warnOnce(ObjectType.ATTRIBUTE, ATTR_SPRING_RESOURCE_REF,
+                        parserContext.getReaderContext().getResource().getDescription(), "<will be removed>");
                 final String resourceRef =
                         StringSupport.trimOrNull(config.getAttributeNS(null, ATTR_SPRING_RESOURCE_REF));
                 log.debug("{} Native configuration from bean {}", getLogPrefix(), resourceRef);
                 builder.addPropertyReference("resources", resourceRef);
             }
             if (config.hasAttributeNS(null, ATTR_FACTORY_POSTPROCESSORS_REF)) {
+                DeprecationSupport.warnOnce(ObjectType.ATTRIBUTE, ATTR_FACTORY_POSTPROCESSORS_REF,
+                        parserContext.getReaderContext().getResource().getDescription(), "<will be removed>");
                 final String factoryPostProcessorsRef =
                         StringSupport.trimOrNull(config.getAttributeNS(null, ATTR_FACTORY_POSTPROCESSORS_REF));
                 log.debug("{} Factory Bean Post Processors {}", getLogPrefix(), factoryPostProcessorsRef);
@@ -196,6 +203,8 @@ public abstract class AbstractDataConnectorParser extends BaseResolverPluginPars
                         "shibboleth.PropertySourcesPlaceholderConfigurer");
             }
             if (config.hasAttributeNS(null, ATTR_POSTPROCESSORS_REF)) {
+                DeprecationSupport.warnOnce(ObjectType.ATTRIBUTE, ATTR_POSTPROCESSORS_REF,
+                        parserContext.getReaderContext().getResource().getDescription(), "<will be removed>");
                 final String postProcessorsRef =
                         StringSupport.trimOrNull(config.getAttributeNS(null, ATTR_POSTPROCESSORS_REF));
                 log.debug("{} Bean Post Processors {}", getLogPrefix(), postProcessorsRef);

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