From 08dbb8c29845b363e59295f1df121edff22cd47a Mon Sep 17 00:00:00 2001
From: Stephan Schroevers <stephan.schroevers@teampicnic.com>
Date: Sat, 4 May 2024 16:08:58 +0200
Subject: [PATCH] Upgrade Error Prone 2.26.1 -> 2.27.1 (#1155)

See:
- https://github.com/google/error-prone/releases/tag/v2.27.0
- https://github.com/google/error-prone/releases/tag/v2.27.1
- https://github.com/google/error-prone/compare/v2.26.1...v2.27.1
- https://github.com/PicnicSupermarket/error-prone/compare/v2.26.1-picnic-2...v2.27.1-picnic-1
---
 .../picnic/errorprone/bugpatterns/JUnitValueSource.java   | 2 +-
 .../LexicographicalAnnotationAttributeListing.java        | 6 +++---
 .../picnic/errorprone/bugpatterns/NonStaticImport.java    | 2 +-
 pom.xml                                                   | 4 ++--
 .../refaster/plugin/RefasterRuleCompilerTaskListener.java | 2 +-
 website/_data/compatibility.yml                           | 8 ++++++++
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/JUnitValueSource.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/JUnitValueSource.java
index 6327e392..5a873263 100644
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/JUnitValueSource.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/JUnitValueSource.java
@@ -232,7 +232,7 @@ public final class JUnitValueSource extends BugChecker implements MethodTreeMatc
       @Override
       public @Nullable Void visitReturn(ReturnTree node, @Nullable Void unused) {
         returnExpressions.add(node.getExpression());
-        return super.visitReturn(node, unused);
+        return super.visitReturn(node, null);
       }
 
       @Override
diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/LexicographicalAnnotationAttributeListing.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/LexicographicalAnnotationAttributeListing.java
index e4812e17..62577e94 100644
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/LexicographicalAnnotationAttributeListing.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/LexicographicalAnnotationAttributeListing.java
@@ -192,7 +192,7 @@ public final class LexicographicalAnnotationAttributeListing extends BugChecker
       @Override
       public @Nullable Void visitIdentifier(IdentifierTree node, @Nullable Void unused) {
         nodes.add(ImmutableList.of(node.getName().toString()));
-        return super.visitIdentifier(node, unused);
+        return super.visitIdentifier(node, null);
       }
 
       @Override
@@ -203,13 +203,13 @@ public final class LexicographicalAnnotationAttributeListing extends BugChecker
                 ? STRING_ARGUMENT_SPLITTER.splitToStream(str).collect(toImmutableList())
                 : ImmutableList.of(String.valueOf(value)));
 
-        return super.visitLiteral(node, unused);
+        return super.visitLiteral(node, null);
       }
 
       @Override
       public @Nullable Void visitPrimitiveType(PrimitiveTypeTree node, @Nullable Void unused) {
         nodes.add(ImmutableList.of(node.getPrimitiveTypeKind().toString()));
-        return super.visitPrimitiveType(node, unused);
+        return super.visitPrimitiveType(node, null);
       }
     }.scan(array, null);
 
diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/NonStaticImport.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/NonStaticImport.java
index adbd88f7..eba7253b 100644
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/NonStaticImport.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/NonStaticImport.java
@@ -210,7 +210,7 @@ public final class NonStaticImport extends BugChecker implements CompilationUnit
           }
         }
 
-        return super.visitIdentifier(node, unused);
+        return super.visitIdentifier(node, null);
       }
     }.scan(tree, null);
   }
diff --git a/pom.xml b/pom.xml
index 064f2ef1..555f39d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -207,8 +207,8 @@
         <version.auto-service>1.1.1</version.auto-service>
         <version.auto-value>1.10.4</version.auto-value>
         <version.error-prone>${version.error-prone-orig}</version.error-prone>
-        <version.error-prone-fork>v${version.error-prone-orig}-picnic-2</version.error-prone-fork>
-        <version.error-prone-orig>2.26.1</version.error-prone-orig>
+        <version.error-prone-fork>v${version.error-prone-orig}-picnic-1</version.error-prone-fork>
+        <version.error-prone-orig>2.27.1</version.error-prone-orig>
         <version.error-prone-slf4j>0.1.24</version.error-prone-slf4j>
         <version.guava-beta-checker>1.0</version.guava-beta-checker>
         <version.jdk>17</version.jdk>
diff --git a/refaster-compiler/src/main/java/tech/picnic/errorprone/refaster/plugin/RefasterRuleCompilerTaskListener.java b/refaster-compiler/src/main/java/tech/picnic/errorprone/refaster/plugin/RefasterRuleCompilerTaskListener.java
index f62efde1..dbef9d0e 100644
--- a/refaster-compiler/src/main/java/tech/picnic/errorprone/refaster/plugin/RefasterRuleCompilerTaskListener.java
+++ b/refaster-compiler/src/main/java/tech/picnic/errorprone/refaster/plugin/RefasterRuleCompilerTaskListener.java
@@ -112,7 +112,7 @@ final class RefasterRuleCompilerTaskListener implements TaskListener {
             return (sym != null
                     && sym.getQualifiedName()
                         .contentEquals(BeforeTemplate.class.getCanonicalName()))
-                || super.visitAnnotation(node, unused);
+                || super.visitAnnotation(node, null);
           }
 
           @Override
diff --git a/website/_data/compatibility.yml b/website/_data/compatibility.yml
index 29ddbe66..716f64ea 100644
--- a/website/_data/compatibility.yml
+++ b/website/_data/compatibility.yml
@@ -3,6 +3,8 @@
 releases:
   - version: 0.16.1
     compatible:
+      - "2.27.1"
+      - "2.27.0"
       - "2.26.1"
       - "2.26.0"
       - "2.25.0"
@@ -11,6 +13,8 @@ releases:
       - "2.23.0"
   - version: 0.16.0
     compatible:
+      - "2.27.1"
+      - "2.27.0"
       - "2.26.1"
       - "2.26.0"
       - "2.25.0"
@@ -19,6 +23,8 @@ releases:
       - "2.23.0"
   - version: 0.15.0
     compatible:
+      - "2.27.1"
+      - "2.27.0"
       - "2.26.1"
       - "2.26.0"
       - "2.25.0"
@@ -27,6 +33,8 @@ releases:
       - "2.23.0"
   - version: 0.14.0
     compatible:
+      - "2.27.1"
+      - "2.27.0"
       - "2.26.1"
       - "2.26.0"
       - "2.25.0"