This is an automated email from the ASF dual-hosted git repository. borinquenkid pushed a commit to branch test/abstract-datastore-initializer in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit ca684d47124a77185efc7a72f44c5f2f98f503de Author: Walter Duque de Estrada <[email protected]> AuthorDate: Thu Aug 13 17:03:55 2026 -0500 Remove dead registerApplicationIfNotPresent property Git archaeology (3eb036d4cc, "Simplify AbstractDatastoreInitializer", Nov 2018) shows this flag gated registration of a legacy grailsApplication Spring bean needed for pre-3.3 Grails compatibility - and that logic's own first line already made it a no-op for Grails 3.3+ (released 2017). The 2018 commit correctly deleted the dead logic but left the now-meaningless field behind, and the four plugins that set it were never updated. Removes the field and all four call sites (Hibernate5, Hibernate7, MongoDB, and the already-unbuildable Neo4j module, fixed for source-tree consistency). Co-Authored-By: Claude Sonnet 5 <[email protected]> --- .../src/main/groovy/grails/plugin/hibernate/HibernateGrailsPlugin.groovy | 1 - .../src/main/groovy/grails/plugin/hibernate/HibernateGrailsPlugin.groovy | 1 - .../src/main/groovy/grails/plugins/mongodb/MongodbGrailsPlugin.groovy | 1 - .../main/groovy/org/grails/datastore/gorm/neo4j/Neo4jGrailsPlugin.groovy | 1 - .../grails/datastore/gorm/bootstrap/AbstractDatastoreInitializer.groovy | 1 - .../datastore/gorm/bootstrap/AbstractDatastoreInitializerSpec.groovy | 1 - 6 files changed, 6 deletions(-) diff --git a/grails-data-hibernate5/grails-plugin/src/main/groovy/grails/plugin/hibernate/HibernateGrailsPlugin.groovy b/grails-data-hibernate5/grails-plugin/src/main/groovy/grails/plugin/hibernate/HibernateGrailsPlugin.groovy index 366da3bc46..552eadfd0f 100644 --- a/grails-data-hibernate5/grails-plugin/src/main/groovy/grails/plugin/hibernate/HibernateGrailsPlugin.groovy +++ b/grails-data-hibernate5/grails-plugin/src/main/groovy/grails/plugin/hibernate/HibernateGrailsPlugin.groovy @@ -88,7 +88,6 @@ class HibernateGrailsPlugin extends Plugin { def springInitializer = new HibernateDatastoreSpringInitializer((PropertyResolver) config, domainClasses) springInitializer.enableReload = Environment.isDevelopmentMode() - springInitializer.registerApplicationIfNotPresent = false springInitializer.grailsPlugin = true dataSourceNames = springInitializer.dataSources def beans = springInitializer.getBeanDefinitions((BeanDefinitionRegistry) applicationContext) diff --git a/grails-data-hibernate7/grails-plugin/src/main/groovy/grails/plugin/hibernate/HibernateGrailsPlugin.groovy b/grails-data-hibernate7/grails-plugin/src/main/groovy/grails/plugin/hibernate/HibernateGrailsPlugin.groovy index b758e72302..5b99ed5a06 100644 --- a/grails-data-hibernate7/grails-plugin/src/main/groovy/grails/plugin/hibernate/HibernateGrailsPlugin.groovy +++ b/grails-data-hibernate7/grails-plugin/src/main/groovy/grails/plugin/hibernate/HibernateGrailsPlugin.groovy @@ -88,7 +88,6 @@ class HibernateGrailsPlugin extends Plugin { def springInitializer = new HibernateDatastoreSpringInitializer((PropertyResolver) config, domainClasses) springInitializer.enableReload = Environment.isDevelopmentMode() - springInitializer.registerApplicationIfNotPresent = false springInitializer.grailsPlugin = true dataSourceNames = springInitializer.dataSources def beans = springInitializer.getBeanDefinitions((BeanDefinitionRegistry) applicationContext) diff --git a/grails-data-mongodb/grails-plugin/src/main/groovy/grails/plugins/mongodb/MongodbGrailsPlugin.groovy b/grails-data-mongodb/grails-plugin/src/main/groovy/grails/plugins/mongodb/MongodbGrailsPlugin.groovy index 638db71d3d..971c137789 100644 --- a/grails-data-mongodb/grails-plugin/src/main/groovy/grails/plugins/mongodb/MongodbGrailsPlugin.groovy +++ b/grails-data-mongodb/grails-plugin/src/main/groovy/grails/plugins/mongodb/MongodbGrailsPlugin.groovy @@ -53,7 +53,6 @@ class MongodbGrailsPlugin extends Plugin { Closure doWithSpring() { ConfigSupport.prepareConfig(config, (ConfigurableApplicationContext) applicationContext) def initializer = new MongoDbDataStoreSpringInitializer((PropertyResolver) config, grailsApplication.getArtefacts(DomainClassArtefactHandler.TYPE).collect() { GrailsClass cls -> cls.clazz }) - initializer.registerApplicationIfNotPresent = false def applicationName = Metadata.getCurrent().getApplicationName() if (!applicationName.contains('@')) { diff --git a/grails-data-neo4j/grails-plugin/src/main/groovy/org/grails/datastore/gorm/neo4j/Neo4jGrailsPlugin.groovy b/grails-data-neo4j/grails-plugin/src/main/groovy/org/grails/datastore/gorm/neo4j/Neo4jGrailsPlugin.groovy index fd0d7b5908..7ca307fda0 100644 --- a/grails-data-neo4j/grails-plugin/src/main/groovy/org/grails/datastore/gorm/neo4j/Neo4jGrailsPlugin.groovy +++ b/grails-data-neo4j/grails-plugin/src/main/groovy/org/grails/datastore/gorm/neo4j/Neo4jGrailsPlugin.groovy @@ -65,7 +65,6 @@ class Neo4jGrailsPlugin extends Plugin { Closure doWithSpring() { ConfigSupport.prepareConfig(config, (ConfigurableApplicationContext) applicationContext) def initializer = new Neo4jDataStoreSpringInitializer((PropertyResolver) config, grailsApplication.getArtefacts(DomainClassArtefactHandler.TYPE).collect() { GrailsClass cls -> cls.clazz }) - initializer.registerApplicationIfNotPresent = false initializer.setSecondaryDatastore(hasHibernatePlugin()) return initializer.getBeanDefinitions((BeanDefinitionRegistry)applicationContext) } diff --git a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/bootstrap/AbstractDatastoreInitializer.groovy b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/bootstrap/AbstractDatastoreInitializer.groovy index 5eb8112edc..5c24120da2 100644 --- a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/bootstrap/AbstractDatastoreInitializer.groovy +++ b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/bootstrap/AbstractDatastoreInitializer.groovy @@ -77,7 +77,6 @@ abstract class AbstractDatastoreInitializer implements ResourceLoaderAware { Collection<Class> persistentClasses = [] Collection<String> packages = [] PropertyResolver configuration = new StandardEnvironment() - boolean registerApplicationIfNotPresent = true Object originalConfiguration protected ClassLoader classLoader = Thread.currentThread().contextClassLoader diff --git a/grails-datamapping-core/src/test/groovy/org/grails/datastore/gorm/bootstrap/AbstractDatastoreInitializerSpec.groovy b/grails-datamapping-core/src/test/groovy/org/grails/datastore/gorm/bootstrap/AbstractDatastoreInitializerSpec.groovy index 076f2445bb..547f8c527d 100644 --- a/grails-datamapping-core/src/test/groovy/org/grails/datastore/gorm/bootstrap/AbstractDatastoreInitializerSpec.groovy +++ b/grails-datamapping-core/src/test/groovy/org/grails/datastore/gorm/bootstrap/AbstractDatastoreInitializerSpec.groovy @@ -47,7 +47,6 @@ class AbstractDatastoreInitializerSpec extends Specification { initializer.persistentClasses == [] initializer.configuration instanceof StandardEnvironment initializer.originalConfiguration == null - initializer.registerApplicationIfNotPresent } void 'a package-name constructor records the given packages'() {
