[java-identity-provider] 37/51: IDP-1121 Remove Deprecated Constructors from LDAP support classes

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

commit c1796e533ade59dd6e2f369c88b8516934bfaedb
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Jan 27 14:24:52 2019 +0000

    IDP-1121 Remove Deprecated Constructors from LDAP support classes
    
    https://issues.shibboleth.net/jira/browse/IDP-1121
    
    	ConnectionFactoryValidator and
    	ParameterizedExecutableSearchFilterBuilder
---
 .../dc/ldap/impl/ConnectionFactoryValidator.java   | 43 +---------------------
 ...ParameterizedExecutableSearchFilterBuilder.java | 20 ----------
 2 files changed, 1 insertion(+), 62 deletions(-)

diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/ConnectionFactoryValidator.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/ConnectionFactoryValidator.java
index 48cb8a8..5e752fe 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/ConnectionFactoryValidator.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/ConnectionFactoryValidator.java
@@ -30,9 +30,6 @@ import net.shibboleth.idp.attribute.resolver.dc.Validator;
 import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
 
 /**
  * Validator implementation that invokes {@link Connection#open()} to determine if the ConnectionFactory is properly
@@ -48,45 +45,7 @@ public class ConnectionFactoryValidator extends AbstractInitializableComponent i
     
     /** Whether validate should throw, default value is <code>true</code>. */
     private boolean throwOnValidateError = true;
-    
-    /**
-     * Creates a new connection factory validator.
-     *
-     * @param factory to validate
-     * @deprecated - use the property setters
-     */
-    @Deprecated public ConnectionFactoryValidator(@Nonnull final ConnectionFactory factory) {
-        DeprecationSupport.warn(ObjectType.METHOD, "ConnectionFactoryValidator(ConnectionFactory)", 
-                null, "ConnectionFactoryValidator()");
-        setConnectionFactory(factory);
-        setThrowValidateError(true);
-        try {
-            initialize();
-        } catch (final ComponentInitializationException e) {
-            throw new ConstraintViolationException("Invalid parameterization to deprecated structure");
-        }
-    }
-
-    /**
-     * Creates a new connection factory validator.
-     * 
-     * @param factory to validate
-     * @param throwOnError whether {@link #validate()} should throw or log errors
-     * @deprecated - use the property setters
-     */
-    @Deprecated public ConnectionFactoryValidator(@Nonnull final ConnectionFactory factory, 
-            final boolean throwOnError) {
-        DeprecationSupport.warn(ObjectType.METHOD, "ConnectionFactoryValidator(ConnectionFactory, boolean)",
-                null, "ConnectionFactoryValidator()");
-        setConnectionFactory(factory);
-        setThrowValidateError(throwOnError);
-        try {
-            initialize();
-        } catch (final ComponentInitializationException e) {
-            throw new ConstraintViolationException("Invalid parameterization to deprecated structure");
-        }
-    }
-    
+       
     /**
      * Constructor.  
      *
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/ParameterizedExecutableSearchFilterBuilder.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/ParameterizedExecutableSearchFilterBuilder.java
index f5efc3d..6b1305c 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/ParameterizedExecutableSearchFilterBuilder.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/ParameterizedExecutableSearchFilterBuilder.java
@@ -31,9 +31,6 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterI
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
 
 /**
  * An {@link net.shibboleth.idp.attribute.resolver.dc.impl.ExecutableSearchBuilder} that generates the search filter to
@@ -46,23 +43,6 @@ public class ParameterizedExecutableSearchFilterBuilder extends AbstractExecutab
     @NonnullAfterInit private String searchFilter;
 
     /**
-     * Constructor.
-     * 
-     * @param filter used for the LDAP search
-     * @deprecated - use the property setters
-     */
-    @Deprecated public ParameterizedExecutableSearchFilterBuilder(@Nonnull final String filter) {
-        DeprecationSupport.warn(ObjectType.METHOD, "ParameterizedExecutableSearchFilterBuilder(String)",
-                null, "ParameterizedExecutableSearchFilterBuilder()");
-        setSearchFilter(filter);
-        try {
-            initialize();
-        } catch (final ComponentInitializationException e) {
-            throw new ConstraintViolationException("Invalid parameterization.");
-        }
-    }
-    
-    /**
      * Constructor.  
      *
      */

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