You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2020/02/29 14:33:54 UTC
[groovy] branch danielsun/fix-illegal-access-warning-get-property
created (now 3655ef1)
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a change to branch danielsun/fix-illegal-access-warning-get-property
in repository https://gitbox.apache.org/repos/asf/groovy.git.
at 3655ef1 Fix more illegal access warnings when getting property
This branch includes the following new commits:
new 3655ef1 Fix more illegal access warnings when getting property
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[groovy] 01/01: Fix more illegal access warnings when getting
property
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch danielsun/fix-illegal-access-warning-get-property
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 3655ef1addee61238f403293a55b2a65ceace501
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Feb 29 22:33:26 2020 +0800
Fix more illegal access warnings when getting property
---
src/main/java/groovy/lang/MetaClassImpl.java | 24 +++++++++++++++--------
src/test/groovy/bugs/groovy9081/Groovy9081.groovy | 5 +++++
2 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/main/java/groovy/lang/MetaClassImpl.java b/src/main/java/groovy/lang/MetaClassImpl.java
index 7bd3adb..141deab 100644
--- a/src/main/java/groovy/lang/MetaClassImpl.java
+++ b/src/main/java/groovy/lang/MetaClassImpl.java
@@ -77,6 +77,7 @@ import org.codehaus.groovy.runtime.wrappers.Wrapper;
import org.codehaus.groovy.util.ComplexKeyHashMap;
import org.codehaus.groovy.util.FastArray;
import org.codehaus.groovy.util.SingleKeyHashMap;
+import org.codehaus.groovy.vmplugin.VMPlugin;
import org.codehaus.groovy.vmplugin.VMPluginFactory;
import javax.annotation.Nullable;
@@ -138,6 +139,7 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
private static final MetaMethod AMBIGUOUS_LISTENER_METHOD = new DummyMetaMethod();
private static final Comparator<CachedClass> CACHED_CLASS_NAME_COMPARATOR = Comparator.comparing(CachedClass::getName);
private static final boolean PERMISSIVE_PROPERTY_ACCESS = SystemUtil.getBooleanSafe("groovy.permissive.property.access");
+ private static final VMPlugin VM_PLUGIN = VMPluginFactory.getPlugin();
protected final Class theClass;
protected final CachedClass theCachedClass;
@@ -1256,7 +1258,7 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
}
if (method != null) {
- MetaMethod transformedMetaMethod = VMPluginFactory.getPlugin().transformMetaMethod(this, method);
+ MetaMethod transformedMetaMethod = VM_PLUGIN.transformMetaMethod(this, method);
return transformedMetaMethod.doMethodInvoke(object, arguments);
} else {
return invokePropertyOrMissing(object, methodName, originalArguments, fromInsideClass, isCallToSuper);
@@ -1912,7 +1914,7 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
//----------------------------------------------------------------------
// executing the getter method
//----------------------------------------------------------------------
- MetaMethod transformedMetaMethod = VMPluginFactory.getPlugin().transformMetaMethod(this, method);
+ MetaMethod transformedMetaMethod = VM_PLUGIN.transformMetaMethod(this, method);
return transformedMetaMethod.doMethodInvoke(object, arguments);
}
@@ -1973,8 +1975,10 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
//----------------------------------------------------------------------
// field
//----------------------------------------------------------------------
- if (method != null)
- return new GetBeanMethodMetaProperty(name, method);
+ if (method != null) {
+ MetaMethod transformedMetaMethod = VM_PLUGIN.transformMetaMethod(this, method);
+ return new GetBeanMethodMetaProperty(name, transformedMetaMethod);
+ }
if (mp != null) {
return mp;
@@ -1992,15 +1996,19 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
// check for a generic get method provided through a category
if (!useSuper && !isStatic && GroovyCategorySupport.hasCategoryInCurrentThread()) {
method = getCategoryMethodGetter(sender, "get", true);
- if (method != null)
- return new GetMethodMetaProperty(name, method);
+ if (method != null) {
+ MetaMethod transformedMetaMethod = VM_PLUGIN.transformMetaMethod(this, method);
+ return new GetMethodMetaProperty(name, transformedMetaMethod);
+ }
+
}
// the generic method is valid, if available (!=null), if static or
// if it is not static and we do no static access
if (genericGetMethod != null && !(!genericGetMethod.isStatic() && isStatic)) {
method = genericGetMethod;
- return new GetMethodMetaProperty(name, method);
+ MetaMethod transformedMetaMethod = VM_PLUGIN.transformMetaMethod(this, method);
+ return new GetMethodMetaProperty(name, transformedMetaMethod);
}
//----------------------------------------------------------------------
@@ -2811,7 +2819,7 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
arguments[1] = newValue;
}
- MetaMethod transformedMetaMethod = VMPluginFactory.getPlugin().transformMetaMethod(this, method);
+ MetaMethod transformedMetaMethod = VM_PLUGIN.transformMetaMethod(this, method);
transformedMetaMethod.doMethodInvoke(object, arguments);
return;
}
diff --git a/src/test/groovy/bugs/groovy9081/Groovy9081.groovy b/src/test/groovy/bugs/groovy9081/Groovy9081.groovy
index 4762d24..25f7784 100644
--- a/src/test/groovy/bugs/groovy9081/Groovy9081.groovy
+++ b/src/test/groovy/bugs/groovy9081/Groovy9081.groovy
@@ -83,4 +83,9 @@ final class Groovy9081 {
BigDecimal c = a * b
assert c == 666
}
+
+ @Test
+ void testGetProperty() {
+ java.awt.Toolkit.defaultToolkit.systemClipboard
+ }
}