Improve conditions on DataSourcePluginConfiguration

Closes gh-859

Author: rainboyan

grace-plugin-datasource/src/main/groovy/org/grails/plugins/datasource/DataSourcePluginConfiguration.java

@@ -88,7 +88,7 @@ public ConnectionSources<DataSource, DataSourceSettings> dataSourceConnectionSou
     @Bean
     @Primary
     @ConditionalOnMissingBean
-    @ConditionalOnProperty(prefix = "dataSource", name = "url")
+    @ConditionalOnProperty(name = "dataSource.url")
     public DataSource dataSource(ConnectionSources<DataSource, DataSourceSettings> dataSourceConnectionSources) {
         return dataSourceConnectionSources.getDefaultConnectionSource().getSource();
     }
@@ -105,7 +105,7 @@ static final class GrailsDataSourceCondition extends AnyNestedCondition {
             super(ConfigurationPhase.REGISTER_BEAN);
         }
 
-        @ConditionalOnProperty(name = "dataSource")
+        @ConditionalOnProperty(name = "dataSource.url")
         private static final class DataSourceUrlCondition {
 
         }

grace-plugin-datasource/src/test/groovy/org/grails/plugins/datasource/DataSourcePluginConfigurationTests.java

@@ -52,6 +52,13 @@ void defaultDataSource() {
         assertThat(this.context.getBean(DataSource.class)).isNotNull();
     }
 
+    @Test
+    void multiDataSources() {
+        registerAndRefreshContext("dataSources=", "dataSources.moreBooks.url:jdbc:h2:mem:moreBooks;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE",
+                "dataSources.evenMoreBooks.url:jdbc:h2:mem:evenMoreBooks;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE");
+        assertThat(this.context.getBeansOfType(DataSource.class)).hasSize(2);
+    }
+
     private void registerAndRefreshContext(String... env) {
         TestPropertyValues.of(env).applyTo(this.context);
         this.context.registerBean("grailsApplication", TestGrailsApplication.class, this.context);