[java-identity-provider] 03/06: IDP-1457 Remove Legacy (V2) scripting support for attribute resolver.

[Rod Widdowson]

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

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

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

commit 882db5b752875001af14186d2a79177804e99c6b
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Jun 1 14:30:27 2022 +0100

    IDP-1457 Remove Legacy (V2) scripting support for attribute resolver.
    
    https://shibboleth.atlassian.net/browse/IDP-1457
    
    Stop using legacy (V2) templated Builders
---
 .../resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java       | 6 ++----
 .../resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java     | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
index 691e4af1d..f26eeb1b1 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
@@ -64,9 +64,9 @@ import org.w3c.dom.Element;
 
 import net.shibboleth.ext.spring.util.SpringSupport;
 import net.shibboleth.idp.attribute.resolver.dc.ldap.StringAttributeValueMappingStrategy;
+import net.shibboleth.idp.attribute.resolver.dc.ldap.TemplatedExecutableSearchFilterBuilder;
 import net.shibboleth.idp.attribute.resolver.dc.ldap.impl.ConnectionFactoryValidator;
 import net.shibboleth.idp.attribute.resolver.dc.ldap.impl.LDAPDataConnector;
-import net.shibboleth.idp.attribute.resolver.dc.ldap.impl.V2CompatibleTemplatedExecutableSearchFilterBuilder;
 import net.shibboleth.idp.attribute.resolver.spring.dc.AbstractDataConnectorParser;
 import net.shibboleth.idp.attribute.resolver.spring.dc.impl.CacheConfigParser;
 import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
@@ -450,7 +450,7 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
          */
         @Nonnull public BeanDefinition createTemplateBuilder() {
             final BeanDefinitionBuilder templateBuilder = BeanDefinitionBuilder.genericBeanDefinition(
-                    V2CompatibleTemplatedExecutableSearchFilterBuilder.class);
+                    TemplatedExecutableSearchFilterBuilder.class);
             templateBuilder.setInitMethodName("initialize");
 
             String velocityEngineRef = StringSupport.trimOrNull(configElement.getAttribute("templateEngine"));
@@ -459,8 +459,6 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
             }
             templateBuilder.addPropertyReference("velocityEngine", velocityEngineRef);
 
-            templateBuilder.addPropertyValue("v2Compatibility", true);
-
             templateBuilder.addPropertyValue("templateText", getFilterText());
 
             return templateBuilder.getBeanDefinition();
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java
index 4d1215a51..51f2e8ade 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java
@@ -33,9 +33,9 @@ import org.w3c.dom.Element;
 
 import net.shibboleth.ext.spring.util.SpringSupport;
 import net.shibboleth.idp.attribute.resolver.dc.rdbms.StringResultMappingStrategy;
+import net.shibboleth.idp.attribute.resolver.dc.rdbms.TemplatedExecutableStatementBuilder;
 import net.shibboleth.idp.attribute.resolver.dc.rdbms.impl.DataSourceValidator;
 import net.shibboleth.idp.attribute.resolver.dc.rdbms.impl.RDBMSDataConnector;
-import net.shibboleth.idp.attribute.resolver.dc.rdbms.impl.V2CompatibleTemplatedExecutableStatementBuilder;
 import net.shibboleth.idp.attribute.resolver.spring.dc.AbstractDataConnectorParser;
 import net.shibboleth.idp.attribute.resolver.spring.dc.impl.CacheConfigParser;
 import net.shibboleth.idp.attribute.resolver.spring.dc.impl.ManagedConnectionParser;
@@ -193,7 +193,7 @@ public class RDBMSDataConnectorParser extends AbstractDataConnectorParser {
          */
         @Nonnull public BeanDefinition createTemplateBuilder() {
             final BeanDefinitionBuilder templateBuilder =
-                    BeanDefinitionBuilder.genericBeanDefinition(V2CompatibleTemplatedExecutableStatementBuilder.class);
+                    BeanDefinitionBuilder.genericBeanDefinition(TemplatedExecutableStatementBuilder.class);
             templateBuilder.setInitMethodName("initialize");
             templateBuilder.setDestroyMethodName("destroy");
 
@@ -203,8 +203,6 @@ public class RDBMSDataConnectorParser extends AbstractDataConnectorParser {
             }
             templateBuilder.addPropertyReference("velocityEngine", velocityEngineRef);
 
-            templateBuilder.addPropertyValue("v2Compatibility", true);
-
             final String queryTimeout = AttributeSupport.getAttributeValue(configElement, new QName("queryTimeout"));
             if (queryTimeout != null) {
                 templateBuilder.addPropertyValue("queryTimeout", queryTimeout);

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