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

[noreply at shibboleth.net]

Author: rdw
Date: Tue Oct 21 06:33:14 2014
New Revision: 6755

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6755&view=rev
Log:
IDP-203 Move default from the parser

Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/AbstractExecutableStatementBuilder.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParser.java

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/AbstractExecutableStatementBuilder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/AbstractExecutableStatementBuilder.java?rev=6755&r1=6754&r2=6755&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/AbstractExecutableStatementBuilder.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/AbstractExecutableStatementBuilder.java Tue Oct 21 06:33:14 2014
@@ -40,7 +40,7 @@
         ExecutableSearchBuilder<ExecutableStatement> {
 
     /** Query timeout. */
-    private int queryTimeout;
+    private int queryTimeout = 5000;
 
     /**
      * Gets the timeout of the SQL query.
@@ -80,19 +80,19 @@
         return new ExecutableStatement() {
 
             /** {@inheritDoc} */
-            @Nonnull public String getResultCacheKey() {
+            @Override @Nonnull public String getResultCacheKey() {
                 return query;
             }
 
             /** {@inheritDoc} */
-            @Nonnull public ResultSet execute(@Nonnull Connection connection) throws SQLException {
+            @Override @Nonnull public ResultSet execute(@Nonnull Connection connection) throws SQLException {
                 final Statement stmt = connection.createStatement();
                 stmt.setQueryTimeout(queryTimeout);
                 return stmt.executeQuery(query);
             }
 
             /** {@inheritDoc} */
-            public String toString() {
+            @Override public String toString() {
                 return query;
             }
         };

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=6755&r1=6754&r2=6755&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 Oct 21 06:33:14 2014
@@ -123,7 +123,6 @@
     /**
      * Utility class for parsing v2 schema configuration.
      * 
-     * TODO(rdw) Move defaults into the bean
      */
     protected static class V2Parser {
 
@@ -176,8 +175,6 @@
                 duration.addConstructorArgValue(queryTimeout);
                 duration.addConstructorArgValue(1);
                 templateBuilder.addPropertyValue("queryTimeout", duration.getBeanDefinition());
-            } else {
-                templateBuilder.addPropertyValue("queryTimeout", 5000);
             }
 
             final Element queryTemplate =