This is an automated email from the ASF dual-hosted git repository. borinquenkid pushed a commit to branch chore/jdbc-package-cleanup in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 73aac3de406007fef406396bd5b012fa812bec56 Author: Walter Duque de Estrada <[email protected]> AuthorDate: Sat Aug 15 13:28:08 2026 -0500 Rename shadowed local variable in DataSourceSettings.toProperties() The local variable was named 'properties', identical to the properties field and to the fluent properties(Map) setter that @Builder(prefix = '') generates for it, which confused IntelliJ's definite-assignment analysis into flagging it as possibly unassigned. Renaming it to 'props' removes the shadowing. Co-Authored-By: Claude Sonnet 5 <[email protected]> --- .../gorm/jdbc/connections/DataSourceSettings.groovy | 16 ++++++++-------- .../SpringDataSourceConnectionSourceFactory.java | 4 +++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/DataSourceSettings.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/DataSourceSettings.groovy index 466ad78f1a..06ed509a4f 100644 --- a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/DataSourceSettings.groovy +++ b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/DataSourceSettings.groovy @@ -138,21 +138,21 @@ class DataSourceSettings extends ConnectionSourceSettings { */ @CompileStatic Map<String,String> toProperties() { - Map<String,String> properties = new LinkedHashMap<>() - properties.putAll(this.properties) - properties.put('url', url) + Map<String,String> props = new LinkedHashMap<>() + props.putAll(this.properties) + props.put('url', url) if (driverClassName) { - properties.put('driverClassName', driverClassName) + props.put('driverClassName', driverClassName) } if (username) { - properties.put('username', username) + props.put('username', username) } if (password) { - properties.put('password', password) + props.put('password', password) } if (readOnly) { - properties.put('defaultReadOnly', String.valueOf(readOnly)) + props.put('defaultReadOnly', String.valueOf(readOnly)) } - return properties + return props } } diff --git a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/SpringDataSourceConnectionSourceFactory.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/SpringDataSourceConnectionSourceFactory.java index 19c89c2441..d2aa0a5177 100644 --- a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/SpringDataSourceConnectionSourceFactory.java +++ b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/SpringDataSourceConnectionSourceFactory.java @@ -21,6 +21,8 @@ package org.grails.datastore.gorm.jdbc.connections; import javax.sql.DataSource; +import org.jspecify.annotations.NonNull; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.context.ApplicationContext; @@ -39,7 +41,7 @@ public class SpringDataSourceConnectionSourceFactory extends DataSourceConnectio private ApplicationContext applicationContext; @Override - public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { + public void setApplicationContext(@NonNull ApplicationContext applicationContext) throws BeansException { this.applicationContext = applicationContext; }
