[java-identity-provider] 06/06: IDP-1121 Remove never-present mergeResult LDAP attribute

[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=25a7c01eaf254ece3043c90995e6e331f6804ba8

commit 25a7c01eaf254ece3043c90995e6e331f6804ba8
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Apr 2 16:46:02 2019 +0100

    IDP-1121 Remove never-present mergeResult LDAP attribute
    
    https://issues.shibboleth.net/jira/browse/IDP-1121
---
 .../resolver/spring/dc/ldap/impl/CredentialConfigFactoryBean.java   | 6 ++----
 .../resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java       | 6 ------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/CredentialConfigFactoryBean.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/CredentialConfigFactoryBean.java
index 32065a6..e92d9b4 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/CredentialConfigFactoryBean.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/CredentialConfigFactoryBean.java
@@ -23,10 +23,6 @@ import java.security.cert.X509Certificate;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import net.shibboleth.ext.spring.factory.AbstractComponentAwareFactoryBean;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
-
 import org.ldaptive.ssl.CredentialConfig;
 import org.ldaptive.ssl.CredentialConfigFactory;
 import org.opensaml.security.credential.Credential;
@@ -35,6 +31,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.BeanCreationException;
 
+import net.shibboleth.ext.spring.factory.AbstractComponentAwareFactoryBean;
+
 /**
  * A Factory bean to summon up {@link CredentialConfig} from supplied <Credential> statements.
  */
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 1c40a39..4c467cb 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
@@ -65,8 +65,6 @@ 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;
@@ -249,10 +247,6 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
             Constraint.isNotNull(config, "LDAPDirectory element cannot be null");
             configElement = config;
             logPrefix = prefix; 
-            // warn about deprecated (removed?) attribute
-            if (AttributeSupport.hasAttribute(config, new QName("mergeResults"))) {
-                DeprecationSupport.warn(ObjectType.ATTRIBUTE,  "mergeResults", prefix, null);
-            }
         }
 
         /**

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