[groovy] branch danielsun/tweak-build updated: Trivial refactoring

[su...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch danielsun/tweak-build
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/danielsun/tweak-build by this push:
     new e1736cf  Trivial refactoring
e1736cf is described below

commit e1736cf375b248312432ae40456454a304727742
Author: Daniel Sun <su...@apache.org>
AuthorDate: Mon Jun 14 16:25:53 2021 +0800

    Trivial refactoring
---
 src/main/java/org/codehaus/groovy/vmplugin/v16/Java16.java          | 6 +++---
 .../v16/{ProxyMethodHandle.java => ProxyDefaultMethodHandle.java}   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/vmplugin/v16/Java16.java b/src/main/java/org/codehaus/groovy/vmplugin/v16/Java16.java
index 8d2e1bb..c0a9aa1 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/v16/Java16.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v16/Java16.java
@@ -81,7 +81,7 @@ public class Java16 extends Java10 {
         final Class<?> receiverType = receiver.getClass();
         try {
             if (method.isDefault() && Proxy.isProxyClass(receiverType)) {
-                return new ProxyMethodHandle((Proxy) receiver, method);
+                return new ProxyDefaultMethodHandle((Proxy) receiver, method);
             }
 
             MethodHandles.Lookup lookup = newLookup(receiverType);
@@ -96,8 +96,8 @@ public class Java16 extends Java10 {
 
     @Override
     public Object invokeHandle(Object handle, Object[] args) throws Throwable {
-        if (handle instanceof ProxyMethodHandle) {
-            return ((ProxyMethodHandle) handle).invokeWithArguments(args);
+        if (handle instanceof ProxyDefaultMethodHandle) {
+            return ((ProxyDefaultMethodHandle) handle).invokeWithArguments(args);
         }
         if (handle instanceof Throwable) throw (Throwable) handle;
         MethodHandle mh = (MethodHandle) handle;
diff --git a/src/main/java/org/codehaus/groovy/vmplugin/v16/ProxyMethodHandle.java b/src/main/java/org/codehaus/groovy/vmplugin/v16/ProxyDefaultMethodHandle.java
similarity index 93%
rename from src/main/java/org/codehaus/groovy/vmplugin/v16/ProxyMethodHandle.java
rename to src/main/java/org/codehaus/groovy/vmplugin/v16/ProxyDefaultMethodHandle.java
index 90afca2..b1fbd5d 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/v16/ProxyMethodHandle.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v16/ProxyDefaultMethodHandle.java
@@ -9,7 +9,7 @@ import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 
-class ProxyMethodHandle {
+class ProxyDefaultMethodHandle {
     private static final MethodHandle INVOKE_DEFAULT_METHOD_HANDLE;
     static {
         try {
@@ -26,7 +26,7 @@ class ProxyMethodHandle {
     private final Proxy proxy;
     private final Method method;
 
-    ProxyMethodHandle(Proxy proxy, Method method) {
+    ProxyDefaultMethodHandle(Proxy proxy, Method method) {
         this.proxy = proxy;
         this.method = method;
     }