This is an automated email from the ASF dual-hosted git repository.
paulk 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 d95ee6e21b minor refactor: avoid deprecated method usage
d95ee6e21b is described below
commit d95ee6e21b2fdcc9d7f75b76ea4aff0122326982
Author: Paul King <[email protected]>
AuthorDate: Sun Feb 8 16:25:35 2026 +1000
minor refactor: avoid deprecated method usage
---
src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java | 3 ++-
src/main/java/org/codehaus/groovy/classgen/EnumVisitor.java | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
b/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
index 635f8dfe2f..2bd997c6a2 100644
--- a/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
+++ b/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
@@ -126,6 +126,7 @@ import
org.codehaus.groovy.control.CompilationFailedException;
import org.codehaus.groovy.control.CompilePhase;
import org.codehaus.groovy.control.SourceUnit;
import org.codehaus.groovy.control.messages.SyntaxErrorMessage;
+import org.codehaus.groovy.runtime.ArrayGroovyMethods;
import org.codehaus.groovy.runtime.StringGroovyMethods;
import org.codehaus.groovy.syntax.Numbers;
import org.codehaus.groovy.syntax.SyntaxException;
@@ -3971,7 +3972,7 @@ public class AstBuilder extends
GroovyParserBaseVisitor<Object> {
GenericsType[] generics =
this.visitTypeArguments(ctx.typeArguments());
classNode.setGenericsTypes(generics);
if (isTrue(ctx, IS_INSIDE_INSTANCEOF_EXPR) &&
Arrays.stream(generics).anyMatch(gt ->
- !gt.isWildcard() || asBoolean(gt.getLowerBound()) ||
asBoolean(gt.getUpperBounds()))) { // GROOVY-11585
+ !gt.isWildcard() || asBoolean(gt.getLowerBound()) ||
ArrayGroovyMethods.asBoolean(gt.getUpperBounds()))) { // GROOVY-11585
throw this.createParsingFailedException("Cannot perform
instanceof check against parameterized type " + classNode, ctx);
}
}
diff --git a/src/main/java/org/codehaus/groovy/classgen/EnumVisitor.java
b/src/main/java/org/codehaus/groovy/classgen/EnumVisitor.java
index 4126342336..d7d7d536f8 100644
--- a/src/main/java/org/codehaus/groovy/classgen/EnumVisitor.java
+++ b/src/main/java/org/codehaus/groovy/classgen/EnumVisitor.java
@@ -18,6 +18,7 @@
*/
package org.codehaus.groovy.classgen;
+import org.apache.groovy.ast.tools.MethodNodeUtils;
import org.codehaus.groovy.ast.AnnotatedNode;
import org.codehaus.groovy.ast.ClassCodeVisitorSupport;
import org.codehaus.groovy.ast.ClassHelper;
@@ -25,7 +26,6 @@ import org.codehaus.groovy.ast.ClassNode;
import org.codehaus.groovy.ast.ConstructorNode;
import org.codehaus.groovy.ast.EnumConstantClassNode;
import org.codehaus.groovy.ast.FieldNode;
-import org.codehaus.groovy.ast.InnerClassNode;
import org.codehaus.groovy.ast.MethodNode;
import org.codehaus.groovy.ast.Parameter;
import org.codehaus.groovy.ast.expr.ArgumentListExpression;
@@ -282,7 +282,7 @@ public class EnumVisitor extends ClassCodeVisitorSupport {
if (!methodNode.isAbstract()) continue;
MethodNode enumConstMethod =
inner.getMethod(methodNode.getName(), methodNode.getParameters());
if (enumConstMethod == null ||
enumConstMethod.isAbstract()) {
- addError(field, "Can't have an abstract method
in enum constant " + field.getName() + ". Implement method '" +
methodNode.getTypeDescriptor(true) + "'.");
+ addError(field, "Can't have an abstract method
in enum constant " + field.getName() + ". Implement method '" +
MethodNodeUtils.methodDescriptor(methodNode,true) + "'.");
}
}
if (inner.getVariableScope() == null) {
