[groovy] 09/11: minor refactor: remove style warnings

[pa...@apache.org]

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

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

commit 9aabb72817bf2311eb8dc746f966c0489055ed81
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Apr 18 22:10:03 2022 +1000

    minor refactor: remove style warnings
---
 .../org/codehaus/groovy/classgen/asm/util/LoggableTextifier.java | 9 +++++----
 .../java/org/codehaus/groovy/control/CompilerConfiguration.java  | 2 +-
 .../groovy/org/apache/groovy/macrolib/MacroLibGroovyMethods.java | 3 +++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/util/LoggableTextifier.java b/src/main/java/org/codehaus/groovy/classgen/asm/util/LoggableTextifier.java
index 3d29b6054c..0da008d90b 100644
--- a/src/main/java/org/codehaus/groovy/classgen/asm/util/LoggableTextifier.java
+++ b/src/main/java/org/codehaus/groovy/classgen/asm/util/LoggableTextifier.java
@@ -312,8 +312,8 @@ public class LoggableTextifier extends Textifier {
     }
 
     @Override
-    public void visitVarInsn(int opcode, int var) {
-        super.visitVarInsn(opcode, var);
+    public void visitVarInsn(int opcode, int varIndex) {
+        super.visitVarInsn(opcode, varIndex);
         log();
     }
 
@@ -330,6 +330,7 @@ public class LoggableTextifier extends Textifier {
     }
 
     @Override
+    @Deprecated
     public void visitMethodInsn(int opcode, String owner, String name, String desc) {
         super.visitMethodInsn(opcode, owner, name, desc);
         log();
@@ -366,8 +367,8 @@ public class LoggableTextifier extends Textifier {
     }
 
     @Override
-    public void visitIincInsn(int var, int increment) {
-        super.visitIincInsn(var, increment);
+    public void visitIincInsn(int varIndex, int increment) {
+        super.visitIincInsn(varIndex, increment);
         log();
     }
 
diff --git a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
index f3739f7262..1654281f6a 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -512,7 +512,7 @@ public class CompilerConfiguration {
     public CompilerConfiguration(final CompilerConfiguration configuration) {
         setWarningLevel(configuration.getWarningLevel());
         setTargetDirectory(configuration.getTargetDirectory());
-        setClasspathList(new LinkedList<String>(configuration.getClasspath()));
+        setClasspathList(new LinkedList<>(configuration.getClasspath()));
         setVerbose(configuration.getVerbose());
         setDebug(configuration.getDebug());
         setParameters(configuration.getParameters());
diff --git a/subprojects/groovy-macro-library/src/main/groovy/org/apache/groovy/macrolib/MacroLibGroovyMethods.java b/subprojects/groovy-macro-library/src/main/groovy/org/apache/groovy/macrolib/MacroLibGroovyMethods.java
index f34bab5315..933e0ce5db 100644
--- a/subprojects/groovy-macro-library/src/main/groovy/org/apache/groovy/macrolib/MacroLibGroovyMethods.java
+++ b/subprojects/groovy-macro-library/src/main/groovy/org/apache/groovy/macrolib/MacroLibGroovyMethods.java
@@ -40,6 +40,8 @@ import static org.codehaus.groovy.ast.tools.GeneralUtils.ctorX;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.listX;
 
 public class MacroLibGroovyMethods {
+    private MacroLibGroovyMethods() {}
+
     private static final ClassNode NAMED_VALUE = ClassHelper.make(NamedValue.class);
 
     @Macro
@@ -98,6 +100,7 @@ public class MacroLibGroovyMethods {
         return listX(Arrays.stream(exps).map(exp -> namedValueExpr(exp)).collect(Collectors.toList()));
     }
 
+    @SuppressWarnings("unchecked")
     public static <T> List<NamedValue<T>> NVL(Object self, T... args) {
         throw new IllegalStateException("MacroLibGroovyMethods.NVL(Object...) should never be called at runtime. Are you sure you are using it correctly?");
     }