(groovy) branch master updated: Trivial refactor: use pattern variable

[sunlan]

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

sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
     new 8e008d0819 Trivial refactor: use pattern variable
8e008d0819 is described below

commit 8e008d0819a86b4b81ebc5aaa981f1972d09cb4c
Author: Daniel Sun <sun...@apache.org>
AuthorDate: Mon Apr 13 02:16:06 2026 +0900

    Trivial refactor: use pattern variable
---
 src/main/java/groovy/lang/ExpandoMetaClass.java                       | 4 ++--
 src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java   | 2 +-
 .../java/org/codehaus/groovy/transform/BuilderASTTransformation.java  | 2 +-
 .../org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java  | 2 +-
 .../groovy/ginq/provider/collection/runtime/QueryableCollection.java  | 4 +---
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/groovy/lang/ExpandoMetaClass.java 
b/src/main/java/groovy/lang/ExpandoMetaClass.java
index 4ceee629b7..893f82d7ca 100644
--- a/src/main/java/groovy/lang/ExpandoMetaClass.java
+++ b/src/main/java/groovy/lang/ExpandoMetaClass.java
@@ -1381,7 +1381,7 @@ public class ExpandoMetaClass extends MetaClassImpl 
implements GroovyObject {
                 if (obj instanceof Object[] args) {
                     if (STATIC_QUALIFIER.equals(name)) {
                         final StaticDefiningClosure staticDef = new 
StaticDefiningClosure();
-                        var c = (Closure<?>) ((Object[]) obj)[0];
+                        var c = (Closure<?>) args[0];
                         c.setDelegate(staticDef);
                         c.setResolveStrategy(Closure.DELEGATE_ONLY);
                         c.call((Object)null);
@@ -1392,7 +1392,7 @@ public class ExpandoMetaClass extends MetaClassImpl 
implements GroovyObject {
                     } else if (args.length == 2 && args[0] instanceof Class 
clazz && args[1] instanceof Closure closure)
                         registerSubclassInstanceMethod(name, clazz, closure);
                     else
-                        ExpandoMetaClass.this.setProperty(name, ((Object[]) 
obj)[0]);
+                        ExpandoMetaClass.this.setProperty(name, args[0]);
 
                     return null;
                 }
diff --git 
a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java 
b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
index fd95313737..0044eaf6b6 100644
--- a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
@@ -6717,7 +6717,7 @@ public class DefaultGroovyMethods extends 
DefaultGroovyMethodsSupport {
                                     returnedSelf = true;
                                 }
                                 if (!returnedSelf) {
-                                    cache.push(flatten((Collection<?>) 
transformed, flattenOptionals).iterator());
+                                    cache.push(flatten(c, 
flattenOptionals).iterator());
                                     flattenUsingStack.push(null);
                                     continue outer;
                                 }
diff --git 
a/src/main/java/org/codehaus/groovy/transform/BuilderASTTransformation.java 
b/src/main/java/org/codehaus/groovy/transform/BuilderASTTransformation.java
index 78843a53a0..d5337d643b 100644
--- a/src/main/java/org/codehaus/groovy/transform/BuilderASTTransformation.java
+++ b/src/main/java/org/codehaus/groovy/transform/BuilderASTTransformation.java
@@ -84,7 +84,7 @@ public class BuilderASTTransformation extends 
AbstractASTTransformation implemen
 
         if (parent instanceof ClassNode || parent instanceof MethodNode) {
             if (parent instanceof ClassNode cn) {
-                if (!checkNotInterface((ClassNode) parent, MY_TYPE_NAME)) {
+                if (!checkNotInterface(cn, MY_TYPE_NAME)) {
                     return;
                 }
                 if (hasAnnotation(cn, RECORD_TYPE)) {
diff --git 
a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
 
b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
index 5e2eaa5a65..859bb2cf34 100644
--- 
a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
+++ 
b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java
@@ -5284,7 +5284,7 @@ trying: for (ClassNode[] signature : signatures) {
                     storeType(vexp, type);
                     return type;
                 }
-                return getType((Parameter) variable);
+                return getType(parameter);
             }
             return vexp.getOriginType();
         }
diff --git 
a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/QueryableCollection.java
 
b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/QueryableCollection.java
index 124aa10f11..deba75f769 100644
--- 
a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/QueryableCollection.java
+++ 
b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/QueryableCollection.java
@@ -598,9 +598,7 @@ class QueryableCollection<T> implements Queryable<T>, 
Serializable {
     public List<T> toList() {
         writeLock.lock();
         try {
-            if (sourceIterable instanceof List) {
-                @SuppressWarnings("unchecked")
-                List<T> list = (List<T>) sourceIterable;
+            if (sourceIterable instanceof 
@SuppressWarnings("unchecked")List<T> list) {
                 return list;
             }