Make ObjectCodecTester more convenient

Add a safe varargs annotation. Use more precise type signature for ObjectCodecTester#verifyDeserialized and AbstractObjectCodecTest#verifyDeserialization.

RELNOTES: None
PiperOrigin-RevId: 179460437

2 files changed, 5 insertions, 4 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/AbstractObjectCodecTest.java b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/AbstractObjectCodecTest.java
index 08f675c5dd..6be8562d4f 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/AbstractObjectCodecTest.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/AbstractObjectCodecTest.java
@@ -86,7 +86,7 @@ public abstract class AbstractObjectCodecTest<T> {
     return TestUtils.toBytes(underTest, subject);
   }
 
-  protected void verifyDeserialization(Object deserialized, T subject) {
+  protected void verifyDeserialization(T deserialized, T subject) {
     assertThat(deserialized).isEqualTo(subject);
   }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/ObjectCodecTester.java b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/ObjectCodecTester.java
index baa1f280d3..3251364461 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/ObjectCodecTester.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/ObjectCodecTester.java
@@ -37,7 +37,7 @@ public class ObjectCodecTester<T> {
      *
      * @throws Exception on verification failure
      */
-    void verifyDeserialized(T original, Object deserialized) throws Exception;
+    void verifyDeserialized(T original, T deserialized) throws Exception;
   }
 
   /**
@@ -77,7 +77,7 @@ public class ObjectCodecTester<T> {
   void testSerializeDeserialize() throws Exception {
     for (T subject : subjects) {
       byte[] serialized = toBytes(subject);
-      Object deserialized = fromBytes(serialized);
+      T deserialized = fromBytes(serialized);
       verificationFunction.verifyDeserialized(subject, deserialized);
     }
   }
@@ -123,7 +123,8 @@ public class ObjectCodecTester<T> {
     }
 
     /** Add subjects to be tested for serialization/deserialization. */
-    public Builder<T> addSubjects(@SuppressWarnings("unchecked") T... subjects) {
+    @SafeVarargs
+    public final Builder<T> addSubjects(@SuppressWarnings("unchecked") T... subjects) {
       return addSubjects(ImmutableList.copyOf(subjects));
     }