[java-identity-provider] 04/05: IDP-1181 Deprecate failFastInitialize on ConnectionPool

[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=e0d2683589d18e13dcaed026e974fccc96331334

commit e0d2683589d18e13dcaed026e974fccc96331334
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Sep 25 16:39:39 2019 +0100

    IDP-1181 Deprecate failFastInitialize on ConnectionPool
    
    https://issues.shibboleth.net/jira/browse/IDP-1181
---
 .../resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 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 5aba401..1d49f05 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
@@ -29,7 +29,6 @@ import org.ldaptive.BindConnectionInitializer;
 import org.ldaptive.ConnectionConfig;
 import org.ldaptive.Credential;
 import org.ldaptive.DefaultConnectionFactory;
-import org.ldaptive.DerefAliases;
 import org.ldaptive.SearchExecutor;
 import org.ldaptive.SearchFilter;
 import org.ldaptive.SearchRequest;
@@ -66,6 +65,8 @@ import net.shibboleth.idp.attribute.resolver.spring.dc.impl.CacheConfigParser;
 import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
 import net.shibboleth.idp.profile.spring.factory.BasicX509CredentialFactoryBean;
 import net.shibboleth.utilities.java.support.logic.Constraint;
+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.AttributeSupport;
 import net.shibboleth.utilities.java.support.xml.ElementSupport;
@@ -456,7 +457,7 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
          *
          * @return search executor bean definition
          */
-        // CheckStyle: CyclomaticComplexity OFF
+        // CheckStyle: CyclomaticComplexity|MethodLength OFF
         @Nonnull public BeanDefinition createSearchExecutor(final ManagedMap<String, String> props) {
             final String baseDn = AttributeSupport.getAttributeValue(configElement, new QName("baseDN"));
             final String searchScope = AttributeSupport.getAttributeValue(configElement, new QName("searchScope"));
@@ -540,6 +541,7 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
 
             return searchExecutor.getBeanDefinition();
         }
+        // CheckStyle: CyclomaticComplexity|MethodLength ON
 
         /** Get the Pool configuration <ConnectionPool> element contents, warning if there is more than one.
          * @return the <ConnectionPool> or null if there isn't one.
@@ -621,6 +623,9 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
             final String failFastInitialize =
                     AttributeSupport.getAttributeValue(poolConfigElement, new QName("failFastInitialize"));
             if (failFastInitialize != null) {
+                // V4 Deprecations
+                DeprecationSupport.warnOnce(ObjectType.ATTRIBUTE, "failfastInitialize (on a ConnectionPool element)", 
+                        null, "failfastInitialize (on a DataConnector)");
                 pool.addPropertyValue("failFastInitialize", failFastInitialize);
             }
             pool.setInitMethodName("initialize");

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