Upgrade ErrorProne Core to 2.28.0

alts/src/main/java/io/grpc/alts/internal/ProtectedPromise.java

@@ -78,7 +78,7 @@ public ChannelPromise doneAllocatingPromises() {
     if (!doneAllocating) {
       doneAllocating = true;
       if (successfulCount == expectedCount) {
-        trySuccessInternal(null);
+        trySuccessInternal();
         return super.setSuccess(null);
       }
     }
@@ -117,18 +117,18 @@ private boolean awaitingPromises() {
   }
 
   @Override
-  public ChannelPromise setSuccess(Void result) {
-    trySuccess(result);
+  public ChannelPromise setSuccess(Void unused) {
+    trySuccess(null);
     return this;
   }
 
   @Override
-  public boolean trySuccess(Void result) {
+  public boolean trySuccess(Void unused) {
     if (awaitingPromises()) {
       ++successfulCount;
       if (successfulCount == expectedCount && doneAllocating) {
-        trySuccessInternal(result);
-        return super.trySuccess(result);
+        trySuccessInternal();
+        return super.trySuccess(null);
       }
       // TODO: We break the interface a bit here.
       // Multiple success events can be processed without issue because this is an aggregation.
@@ -137,9 +137,9 @@ public boolean trySuccess(Void result) {
     return false;
   }
 
-  private void trySuccessInternal(Void result) {
+  private void trySuccessInternal() {
     for (int i = 0; i < unprotectedPromises.size(); ++i) {
-      unprotectedPromises.get(i).trySuccess(result);
+      unprotectedPromises.get(i).trySuccess(null);
     }
   }
 

alts/src/test/java/io/grpc/alts/internal/FakeTsiHandshaker.java

@@ -68,6 +68,7 @@ enum State {
     SERVER_FINISHED;
 
     // Returns the next State. In order to advance to sendState=N, receiveState must be N-1.
+    @SuppressWarnings("EnumOrdinal")
     public State next() {
       if (ordinal() + 1 < values().length) {
         return values()[ordinal() + 1];

api/src/main/java/io/grpc/InternalMethodDescriptor.java

@@ -30,10 +30,12 @@ public InternalMethodDescriptor(InternalKnownTransport transport) {
     this.transport = checkNotNull(transport, "transport");
   }
 
+  @SuppressWarnings("EnumOrdinal")
   public Object geRawMethodName(MethodDescriptor<?, ?> descriptor) {
     return descriptor.getRawMethodName(transport.ordinal());
   }
 
+  @SuppressWarnings("EnumOrdinal")
   public void setRawMethodName(MethodDescriptor<?, ?> descriptor, Object o) {
     descriptor.setRawMethodName(transport.ordinal(), o);
   }

api/src/test/java/io/grpc/MetadataTest.java

@@ -21,7 +21,6 @@
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
@@ -30,6 +29,7 @@
 
 import com.google.common.collect.Lists;
 import com.google.common.io.ByteStreams;
+import com.google.common.testing.EqualsTester;
 import io.grpc.internal.GrpcUtil;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -368,14 +368,12 @@ public void removeAllIgnoresMissingValue() {
   @Test
   public void keyEqualsHashNameWorks() {
     Metadata.Key<?> k1 = Metadata.Key.of("case", Metadata.ASCII_STRING_MARSHALLER);
-
     Metadata.Key<?> k2 = Metadata.Key.of("CASE", Metadata.ASCII_STRING_MARSHALLER);
-    assertEquals(k1, k1);
-    assertNotEquals(k1, null);
-    assertNotEquals(k1, new Object(){});
-    assertEquals(k1, k2);
 
-    assertEquals(k1.hashCode(), k2.hashCode());
+    new EqualsTester()
+        .addEqualityGroup(k1, k2)
+        .addEqualityGroup(new Object(){})
+        .testEquals();
     // Check that the casing is preserved.
     assertEquals("CASE", k2.originalName());
     assertEquals("case", k2.name());

core/src/test/java/io/grpc/internal/ManagedChannelImplBuilderTest.java

@@ -22,6 +22,7 @@
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.doReturn;
@@ -169,37 +170,37 @@ public void executor_default() {
   @Test
   public void executor_normal() {
     Executor executor = mock(Executor.class);
-    assertEquals(builder, builder.executor(executor));
-    assertEquals(executor, builder.executorPool.getObject());
+    assertSame(builder, builder.executor(executor));
+    assertSame(executor, builder.executorPool.getObject());
   }
 
   @Test
   public void executor_null() {
     ObjectPool<? extends Executor> defaultValue = builder.executorPool;
     builder.executor(mock(Executor.class));
-    assertEquals(builder, builder.executor(null));
-    assertEquals(defaultValue, builder.executorPool);
+    assertSame(builder, builder.executor(null));
+    assertSame(defaultValue, builder.executorPool);
   }
 
   @Test
   public void directExecutor() {
-    assertEquals(builder, builder.directExecutor());
+    assertSame(builder, builder.directExecutor());
     assertEquals(MoreExecutors.directExecutor(), builder.executorPool.getObject());
   }
 
   @Test
   public void offloadExecutor_normal() {
     Executor executor = mock(Executor.class);
-    assertEquals(builder, builder.offloadExecutor(executor));
-    assertEquals(executor, builder.offloadExecutorPool.getObject());
+    assertSame(builder, builder.offloadExecutor(executor));
+    assertSame(executor, builder.offloadExecutorPool.getObject());
   }
 
   @Test
   public void offloadExecutor_null() {
     ObjectPool<? extends Executor> defaultValue = builder.offloadExecutorPool;
     builder.offloadExecutor(mock(Executor.class));
-    assertEquals(builder, builder.offloadExecutor(null));
-    assertEquals(defaultValue, builder.offloadExecutorPool);
+    assertSame(builder, builder.offloadExecutor(null));
+    assertSame(defaultValue, builder.offloadExecutorPool);
   }
 
   @Test
@@ -212,7 +213,7 @@ public void nameResolverRegistry_default() {
   public void nameResolverFactory_normal() {
     NameResolver.Factory nameResolverFactory = mock(NameResolver.Factory.class);
     doReturn("testscheme").when(nameResolverFactory).getDefaultScheme();
-    assertEquals(builder, builder.nameResolverFactory(nameResolverFactory));
+    assertSame(builder, builder.nameResolverFactory(nameResolverFactory));
     assertNotNull(builder.nameResolverRegistry);
     assertEquals("testscheme", builder.nameResolverRegistry.asFactory().getDefaultScheme());
   }
@@ -242,7 +243,7 @@ public void defaultLoadBalancingPolicy_default() {
 
   @Test
   public void defaultLoadBalancingPolicy_normal() {
-    assertEquals(builder, builder.defaultLoadBalancingPolicy("magic_balancer"));
+    assertSame(builder, builder.defaultLoadBalancingPolicy("magic_balancer"));
     assertEquals("magic_balancer", builder.defaultLbPolicy);
   }
 
@@ -270,14 +271,14 @@ public void decompressorRegistry_default() {
   public void decompressorRegistry_normal() {
     DecompressorRegistry decompressorRegistry = DecompressorRegistry.emptyInstance();
     assertNotEquals(decompressorRegistry, builder.decompressorRegistry);
-    assertEquals(builder, builder.decompressorRegistry(decompressorRegistry));
+    assertSame(builder, builder.decompressorRegistry(decompressorRegistry));
     assertEquals(decompressorRegistry, builder.decompressorRegistry);
   }
 
   @Test
   public void decompressorRegistry_null() {
     DecompressorRegistry defaultValue = builder.decompressorRegistry;
-    assertEquals(builder, builder.decompressorRegistry(DecompressorRegistry.emptyInstance()));
+    assertSame(builder, builder.decompressorRegistry(DecompressorRegistry.emptyInstance()));
     assertNotEquals(defaultValue, builder.decompressorRegistry);
     builder.decompressorRegistry(null);
     assertEquals(defaultValue, builder.decompressorRegistry);
@@ -292,17 +293,17 @@ public void compressorRegistry_default() {
   public void compressorRegistry_normal() {
     CompressorRegistry compressorRegistry = CompressorRegistry.newEmptyInstance();
     assertNotEquals(compressorRegistry, builder.compressorRegistry);
-    assertEquals(builder, builder.compressorRegistry(compressorRegistry));
-    assertEquals(compressorRegistry, builder.compressorRegistry);
+    assertSame(builder, builder.compressorRegistry(compressorRegistry));
+    assertSame(compressorRegistry, builder.compressorRegistry);
   }
 
   @Test
   public void compressorRegistry_null() {
     CompressorRegistry defaultValue = builder.compressorRegistry;
     builder.compressorRegistry(CompressorRegistry.newEmptyInstance());
     assertNotEquals(defaultValue, builder.compressorRegistry);
-    assertEquals(builder, builder.compressorRegistry(null));
-    assertEquals(defaultValue, builder.compressorRegistry);
+    assertSame(builder, builder.compressorRegistry(null));
+    assertSame(defaultValue, builder.compressorRegistry);
   }
 
   @Test
@@ -313,13 +314,13 @@ public void userAgent_default() {
   @Test
   public void userAgent_normal() {
     String userAgent = "user-agent/1";
-    assertEquals(builder, builder.userAgent(userAgent));
-    assertEquals(userAgent, builder.userAgent);
+    assertSame(builder, builder.userAgent(userAgent));
+    assertSame(userAgent, builder.userAgent);
   }
 
   @Test
   public void userAgent_null() {
-    assertEquals(builder, builder.userAgent(null));
+    assertSame(builder, builder.userAgent(null));
     assertNull(builder.userAgent);
 
     builder.userAgent("user-agent/1");
@@ -402,8 +403,8 @@ public void overrideAuthority_default() {
   @Test
   public void overrideAuthority_normal() {
     String overrideAuthority = "best-authority";
-    assertEquals(builder, builder.overrideAuthority(overrideAuthority));
-    assertEquals(overrideAuthority, builder.authorityOverride);
+    assertSame(builder, builder.overrideAuthority(overrideAuthority));
+    assertSame(overrideAuthority, builder.authorityOverride);
   }
 
   @Test(expected = NullPointerException.class)

gradle/libs.versions.toml

@@ -28,7 +28,7 @@ conscrypt = "org.conscrypt:conscrypt-openjdk-uber:2.5.2"
 cronet-api = "org.chromium.net:cronet-api:119.6045.31"
 cronet-embedded = "org.chromium.net:cronet-embedded:119.6045.31"
 errorprone-annotations = "com.google.errorprone:error_prone_annotations:2.28.0"
-errorprone-core = "com.google.errorprone:error_prone_core:2.23.0"
+errorprone-core = "com.google.errorprone:error_prone_core:2.28.0"
 google-api-protos = "com.google.api.grpc:proto-google-common-protos:2.41.0"
 google-auth-credentials = "com.google.auth:google-auth-library-credentials:1.23.0"
 google-auth-oauth2Http = "com.google.auth:google-auth-library-oauth2-http:1.23.0"

util/src/test/java/io/grpc/util/UtilServerInterceptorsTest.java

@@ -43,7 +43,7 @@
 @RunWith(JUnit4.class)
 public class UtilServerInterceptorsTest {
   private static class VoidCallListener extends ServerCall.Listener<Void> {
-    public void onCall(ServerCall<Void, Void> call, Metadata headers) { }
+    public void onCall(ServerCall<Void, Void> unused, Metadata unused2) { }
   }
 
   private MethodDescriptor<Void, Void> flowMethod = TestMethodDescriptors.voidMethod();