(groovy) branch master updated: trivial refactor: fix spotbug warnings

[paulk]

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 50f10bcaf9 trivial refactor: fix spotbug warnings
50f10bcaf9 is described below

commit 50f10bcaf942b01b6b958724aa5a2580034337d4
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sun Mar 10 13:32:41 2024 +1000

    trivial refactor: fix spotbug warnings
---
 .../src/main/java/org/apache/groovy/contracts/ViolationTracker.java    | 2 +-
 .../contracts/ast/visitor/AnnotationContractParameterVisitor.java      | 2 +-
 .../groovy/org/apache/groovy/ginq/dsl/expression/JoinExpression.java   | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git 
a/subprojects/groovy-contracts/src/main/java/org/apache/groovy/contracts/ViolationTracker.java
 
b/subprojects/groovy-contracts/src/main/java/org/apache/groovy/contracts/ViolationTracker.java
index 85230f9134..1857a14d11 100644
--- 
a/subprojects/groovy-contracts/src/main/java/org/apache/groovy/contracts/ViolationTracker.java
+++ 
b/subprojects/groovy-contracts/src/main/java/org/apache/groovy/contracts/ViolationTracker.java
@@ -31,7 +31,7 @@ import java.util.TreeMap;
  */
 public class ViolationTracker {
 
-    public static ThreadLocal<ViolationTracker> INSTANCE = new 
ThreadLocal<ViolationTracker>();
+    public static final ThreadLocal<ViolationTracker> INSTANCE = new 
ThreadLocal<>();
 
     public static void init() {
         INSTANCE.set(new ViolationTracker());
diff --git 
a/subprojects/groovy-contracts/src/main/java/org/apache/groovy/contracts/ast/visitor/AnnotationContractParameterVisitor.java
 
b/subprojects/groovy-contracts/src/main/java/org/apache/groovy/contracts/ast/visitor/AnnotationContractParameterVisitor.java
index a0dc2fe8dc..9a2a861dc9 100644
--- 
a/subprojects/groovy-contracts/src/main/java/org/apache/groovy/contracts/ast/visitor/AnnotationContractParameterVisitor.java
+++ 
b/subprojects/groovy-contracts/src/main/java/org/apache/groovy/contracts/ast/visitor/AnnotationContractParameterVisitor.java
@@ -64,6 +64,6 @@ public class AnnotationContractParameterVisitor extends 
BaseVisitor {
     @Override
     public void visitAnnotations(AnnotatedNode node) {
         if (!(node instanceof Parameter) || currentMethodNode == null) return;
-        List<AnnotationNode> annotationNodes = 
AnnotationUtils.hasMetaAnnotations(node, 
"org.apache.groovy.contracts.annotations.meta.ContractElement");
+        AnnotationUtils.hasMetaAnnotations(node, 
"org.apache.groovy.contracts.annotations.meta.ContractElement");
     }
 }
diff --git 
a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/dsl/expression/JoinExpression.java
 
b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/dsl/expression/JoinExpression.java
index 7baa5058a5..7bada2bfaa 100644
--- 
a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/dsl/expression/JoinExpression.java
+++ 
b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/dsl/expression/JoinExpression.java
@@ -21,7 +21,6 @@ package org.apache.groovy.ginq.dsl.expression;
 import org.apache.groovy.ginq.dsl.GinqAstVisitor;
 import org.codehaus.groovy.ast.expr.Expression;
 
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -37,7 +36,7 @@ public class JoinExpression extends DataSourceExpression 
implements DataSourceHo
     public static final String LEFT_HASH_JOIN = "lefthashjoin";
     private static final String CROSS_JOIN = "crossjoin";
     public static final List<String> JOIN_NAME_LIST =
-            Arrays.asList(SMART_INNER_JOIN, INNER_JOIN, INNER_HASH_JOIN, 
LEFT_JOIN, LEFT_HASH_JOIN, "rightjoin", "righthashjoin", "fulljoin", 
"fullhashjoin", CROSS_JOIN);
+            List.of(SMART_INNER_JOIN, INNER_JOIN, INNER_HASH_JOIN, LEFT_JOIN, 
LEFT_HASH_JOIN, "rightjoin", "righthashjoin", "fulljoin", "fullhashjoin", 
CROSS_JOIN);
 
     private final String joinName;
     private OnExpression onExpression;