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

[noreply at shibboleth.net]

Author: dfisher
Date: Tue Jul 14 00:25:10 2015
New Revision: 7628

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7628&view=rev
Log:
Add support for parsing the connectionReadOnly attribute.
See IDP-758.

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParser.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/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-attribute-resolver-spring-context.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-attribute-resolver-spring-props-context.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-attribute-resolver-v2-hybrid.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-attribute-resolver-v2-props.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-attribute-resolver-v2.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-v2.properties
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-v3.properties

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParser.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/rdbms/RDBMSDataConnectorParser.java?rev=7628&r1=7627&r2=7628&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParser.java	(original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParser.java	Tue Jul 14 00:25:10 2015
@@ -80,6 +80,11 @@
 
         builder.addPropertyValue("executableSearchBuilder", v2Parser.createTemplateBuilder());
 
+        final String connectionReadOnly = v2Parser.getConnectionReadOnly();
+        if (connectionReadOnly != null) {
+            builder.addPropertyValue("connectionReadOnly", connectionReadOnly);
+        }
+
         final String mappingStrategyID = v2Parser.getBeanMappingStrategyID();
         if (mappingStrategyID != null) {
             builder.addPropertyReference("mappingStrategy", mappingStrategyID);
@@ -136,6 +141,15 @@
             final ManagedConnectionParser parser = new ManagedConnectionParser(configElement);
             return parser.createDataSource();
         }
+
+        /**
+         * Get the connectionReadOnly attribute value.
+         *
+         * @return  whether connections should be read only
+         */
+        @Nullable public String getConnectionReadOnly() {
+            return AttributeSupport.getAttributeValue(configElement, new QName("readOnlyConnection"));
+         }
 
         /**
          * Get the bean ID of an externally defined data source.

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParserTest.java?rev=7628&r1=7627&r2=7628&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParserTest.java	(original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParserTest.java	Tue Jul 14 00:25:10 2015
@@ -163,6 +163,7 @@
         Assert.assertEquals(300, dataSource.getMaxIdleTime());
         Assert.assertEquals(360, dataSource.getIdleConnectionTestPeriod());
 
+        Assert.assertFalse(dataConnector.isConnectionReadOnly());
         final Validator validator = dataConnector.getValidator();
         Assert.assertNotNull(validator);
 

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-attribute-resolver-spring-context.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/rdbms-attribute-resolver-spring-context.xml?rev=7628&r1=7627&r2=7628&view=diff
==============================================================================

[... 102 lines stripped ...]