[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/re...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Sep 13 09:03:03 2016
New Revision: 8387

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8387&view=rev
Log:
IDP-813 Log deprecated element types

https://issues.shibboleth.net/jira/browse/IDP-813

Do a one-off warning when we meet dc: enc: or ad: namespaces.

Warn every time we parse a file with <PrincipalConnectors>

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/AbstractDataConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/BaseComputedIDDataConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverParser.java

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java?rev=8387&r1=8386&r2=8387&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java	(original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java	Tue Sep 13 09:03:03 2016
@@ -30,6 +30,7 @@
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.xml.AttributeSupport;
+import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
 import net.shibboleth.utilities.java.support.xml.ElementSupport;
 
 import org.slf4j.Logger;
@@ -55,6 +56,11 @@
     @Nonnull public static final QName ATTRIBUTE_ENCODER_ELEMENT_NAME =
             new QName(AttributeResolverNamespaceHandler.NAMESPACE, "AttributeEncoder");
 
+    /**
+     * Whether we have ever warned because of ad: content.
+     */
+    private static boolean warned;
+
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(BaseAttributeDefinitionParser.class);
 
@@ -64,6 +70,23 @@
             @Nonnull final BeanDefinitionBuilder builder) {
         super.doParse(config, parserContext, builder);
 
+        final QName suppliedQname = DOMTypeSupport.getXSIType(config);
+        
+        if (!AttributeResolverNamespaceHandler.NAMESPACE.equals(suppliedQname.getNamespaceURI())) {
+            if (!warned) {
+                warned = true;
+                log.warn("{} Configuration contains at least one element in the deprecated '{}' namespace.",
+                         getLogPrefix(), AttributeResolverNamespaceHandler.NAMESPACE);
+            }
+            if (log.isDebugEnabled()) {
+                final QName otherQname =
+                        new QName(AttributeResolverNamespaceHandler.NAMESPACE,suppliedQname.getLocalPart(), "ad:");
+            log.debug("{} Deprecated Namespace element '{}' in {}, consider using '{}'",
+                    getLogPrefix(), suppliedQname.toString(),
+                    parserContext.getReaderContext().getResource().getDescription(), otherQname.toString());
+            }
+        } 
+        
         final List<Element> displayNames =
                 ElementSupport.getChildElements(config, new QName(AttributeResolverNamespaceHandler.NAMESPACE,
                         "DisplayName"));

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/AbstractDataConnectorParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/AbstractDataConnectorParser.java?rev=8387&r1=8386&r2=8387&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/AbstractDataConnectorParser.java	(original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/AbstractDataConnectorParser.java	Tue Sep 13 09:03:03 2016
@@ -68,6 +68,11 @@
     @Nonnull public static final QName FAILOVER_DATA_CONNECTOR_ELEMENT_NAME = new QName(
             AttributeResolverNamespaceHandler.NAMESPACE, "FailoverDataConnector");
 
+    /**
+     * Whether we have ever warned because of dc: content.
+     */
+    private static boolean warned;
+
     /** Log4j logger. */

[... 206 lines stripped ...]