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

[noreply at shibboleth.net]

Author: rdw
Date: Wed Sep  7 04:54:14 2016
New Revision: 8375

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8375&view=rev
Log:
IDP-813  Collapse dc: into resolver: RelationalDataBase

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

Schema change and code change, plus tests.  Include some abstraction of code which
is shared with LDAP

Added:
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/resolver/rdbms-attribute-resolver-v2.xml   (with props)
Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/DataConnectorNamespaceHandler.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ManagedConnectionParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StoredIDDataConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/impl/RDBMSDataConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverNamespaceHandler.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParserTest.java
    trunk/idp-attribute-resolver-spring/src/test/resources/logback-test.xml
    trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.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/CacheConfigParser.java?rev=8375&r1=8374&r2=8375&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.java	(original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.java	Wed Sep  7 04:54:14 2016
@@ -28,6 +28,7 @@
 import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
 import net.shibboleth.utilities.java.support.logic.Constraint;
+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;
@@ -44,6 +45,22 @@
 /** Utility class for parsing v2 cache configuration. */
 public class CacheConfigParser {
 
+    /** ResultCache name - dc: (Legacy). */
+    @Nonnull public static final QName RESULT_CACHE_DC =
+            new QName(DataConnectorNamespaceHandler.NAMESPACE, "ResultCache");
+
+    /** ResultCacheBean name - dc: (Legacy). */
+    @Nonnull public static final QName RESULT_CACHE_BEAN_DC =
+            new QName(DataConnectorNamespaceHandler.NAMESPACE, "ResultCacheBean");
+
+    /** ResultCache name - resolver:. */
+    @Nonnull public static final QName RESULT_CACHE_RESOLVER =
+            new QName(AttributeResolverNamespaceHandler.NAMESPACE, "ResultCache");
+    
+    /** ResultCacheBean name - resolver:. */
+    @Nonnull public static final QName RESULT_CACHE_BEAN_RESOLVER =
+            new QName(AttributeResolverNamespaceHandler.NAMESPACE, "ResultCacheBean");
+    
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(CacheConfigParser.class);
 
@@ -73,10 +90,8 @@
             return null;
         }
         
-        final List<Element> cacheElements = ElementSupport.getChildElements(configElement,
-                new QName(DataConnectorNamespaceHandler.NAMESPACE, "ResultCache"));
-        cacheElements.addAll(ElementSupport.getChildElements(configElement,
-                new QName(AttributeResolverNamespaceHandler.NAMESPACE, "ResultCache")));
+        final List<Element> cacheElements = ElementSupport.getChildElements(configElement, RESULT_CACHE_DC);
+        cacheElements.addAll(ElementSupport.getChildElements(configElement, RESULT_CACHE_RESOLVER));
         if (cacheElements.isEmpty()) {
             return null;
         }
@@ -111,4 +126,36 @@
                         : 4 * 60 * 60 * 1000L, TimeUnit.MILLISECONDS).build();
     }
     
+    /**
+     * Get the bean ID of an externally defined result cache.
+     * 

[... 717 lines stripped ...]