This is an automated email from the ASF dual-hosted git repository.
borinquenkid pushed a commit to branch chore/lint-proxy-package
in repository https://gitbox.apache.org/repos/asf/grails-core.git
The following commit(s) were added to refs/heads/chore/lint-proxy-package by
this push:
new d6de7de7d9 Revert GroovyProxyFactory helper methods to instance methods
d6de7de7d9 is described below
commit d6de7de7d9b7903b9f67217f91ccecab68ba5ab7
Author: Walter Duque de Estrada <[email protected]>
AuthorDate: Sat Aug 15 19:36:40 2026 -0500
Revert GroovyProxyFactory helper methods to instance methods
Making protected getIdDynamic/setMetaClassDynamic/unwrapHandleMetaClass
static would silently break binary compatibility for any subclass
overriding them, since static methods aren't polymorphic. Suppress the
IntelliJ inspection instead, matching the existing
@SuppressWarnings('GrMethodMayBeStatic') convention used elsewhere in
the repo.
Co-Authored-By: Claude Sonnet 5 <[email protected]>
---
.../org/grails/datastore/gorm/proxy/GroovyProxyFactory.groovy | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git
a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/proxy/GroovyProxyFactory.groovy
b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/proxy/GroovyProxyFactory.groovy
index d3a1a3f0ae..0e12422c7f 100644
---
a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/proxy/GroovyProxyFactory.groovy
+++
b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/proxy/GroovyProxyFactory.groovy
@@ -72,7 +72,8 @@ class GroovyProxyFactory implements ProxyFactory {
}
@CompileDynamic
- protected static Serializable getIdDynamic(obj) {
+ @SuppressWarnings('GrMethodMayBeStatic')
+ protected Serializable getIdDynamic(obj) {
if (obj.respondsTo('getId')) {
return (Serializable)obj.invokeMethod('getId', null)
}
@@ -123,7 +124,8 @@ class GroovyProxyFactory implements ProxyFactory {
}
@CompileDynamic
- protected static void setMetaClassDynamic(Object proxy, MetaClass proxyMc)
{
+ @SuppressWarnings('GrMethodMayBeStatic')
+ protected void setMetaClassDynamic(Object proxy, MetaClass proxyMc) {
proxy.setMetaClass(proxyMc)
}
@@ -162,7 +164,8 @@ class GroovyProxyFactory implements ProxyFactory {
return object
}
- protected static MetaClass unwrapHandleMetaClass(MetaClass mc) {
+ @SuppressWarnings('GrMethodMayBeStatic')
+ protected MetaClass unwrapHandleMetaClass(MetaClass mc) {
if (mc instanceof HandleMetaClass) {
return ((HandleMetaClass) mc).getAdaptee()
}