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

[noreply at shibboleth.net]

Author: scantor
Date: Fri Dec 11 14:31:08 2015
New Revision: 8030

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8030&view=rev
Log:
IDP-880 - Expose newer StoredID features on deprecated connector

Added:
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StoredIDDataConnectorParserTest.java   (with props)
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/stored.xml   (with props)
Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StoredIDDataConnectorParser.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/StoredIDDataConnector.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/JDBCPersistentIdStoreEx.java
    trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver-dc.xsd

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StoredIDDataConnectorParser.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/StoredIDDataConnectorParser.java?rev=8030&r1=8029&r2=8030&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StoredIDDataConnectorParser.java	(original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/StoredIDDataConnectorParser.java	Fri Dec 11 14:31:08 2015
@@ -23,6 +23,7 @@
 import javax.xml.namespace.QName;
 
 import net.shibboleth.ext.spring.context.FilesystemGenericApplicationContext;
+import net.shibboleth.ext.spring.util.SpringSupport;
 import net.shibboleth.idp.saml.attribute.resolver.impl.StoredIDDataConnector;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.xml.AttributeSupport;
@@ -75,6 +76,21 @@
         if (config.hasAttributeNS(null, "queryTimeout")) {
             builder.addPropertyValue("queryTimeout",
                     StringSupport.trimOrNull(config.getAttributeNS(null, "queryTimeout")));
+        }
+
+        if (config.hasAttributeNS(null, "transactionRetries")) {
+            builder.addPropertyValue("transactionRetries",
+                    StringSupport.trimOrNull(config.getAttributeNS(null, "transactionRetries")));
+        }
+
+        if (config.hasAttributeNS(null, "failFast")) {
+            builder.addPropertyValue("failFast",
+                    StringSupport.trimOrNull(config.getAttributeNS(null, "failFast")));
+        }
+
+        if (config.hasAttributeNS(null, "retryableErrors")) {
+            builder.addPropertyValue("retryableErrors",
+                    SpringSupport.getAttributeValueAsManagedList(config.getAttributeNodeNS(null, "retryableErrors")));
         }
     }
 

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/StoredIDDataConnector.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/StoredIDDataConnector.java?rev=8030&r1=8029&r2=8030&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/StoredIDDataConnector.java	(original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/StoredIDDataConnector.java	Fri Dec 11 14:31:08 2015
@@ -17,6 +17,7 @@
 
 package net.shibboleth.idp.saml.attribute.resolver.impl;
 
+import java.util.Collection;
 import java.util.Map;
 
 import javax.annotation.Nonnull;
@@ -32,6 +33,7 @@
 import net.shibboleth.utilities.java.support.annotation.Duration;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonNegative;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 
@@ -50,15 +52,16 @@
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(StoredIDDataConnector.class);
 
-    /** The {@link JDBCPersistentIdStore} used to manage IDs. */
+    /** The {@link JDBCPersistentIdStoreEx} used to manage IDs. */
     @Nonnull private final JDBCPersistentIdStoreEx idStore;
 
-    /** Persistent ID data store. */
+    /** Persistent ID generation mechanism. */
     @Nonnull private final StoredPersistentIdGenerationStrategy storedIdStrategy;
     
     /** Constructor. */
     public StoredIDDataConnector() {
         idStore = new JDBCPersistentIdStoreEx();
+        idStore.setVerifyDatabase(false);

[... 199 lines stripped ...]