Removes superfluous generic parameter from DynamicCodec, allowing it to be used

with CodecRegisterer.

PiperOrigin-RevId: 190780559

1 files changed, 13 insertions, 16 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/DynamicCodec.java b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/DynamicCodec.java
index 48bc8223c6..4128092f1e 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/DynamicCodec.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/DynamicCodec.java
@@ -33,18 +33,18 @@ import sun.reflect.ReflectionFactory;
  *
  * <p>TODO(shahan): replace Unsafe with VarHandle once it's available.
  */
-public class DynamicCodec<T> implements ObjectCodec<T> {
+public class DynamicCodec implements ObjectCodec<Object> {
 
-  private final Class<T> type;
-  private final Constructor<T> constructor;
+  private final Class<?> type;
+  private final Constructor<?> constructor;
   private final ImmutableSortedMap<Field, Long> offsets;
   private final ObjectCodec.MemoizationStrategy strategy;
 
-  public DynamicCodec(Class<T> type) throws ReflectiveOperationException {
+  public DynamicCodec(Class<?> type) throws ReflectiveOperationException {
     this(type, ObjectCodec.MemoizationStrategy.MEMOIZE_BEFORE);
   }
 
-  public DynamicCodec(Class<T> type, ObjectCodec.MemoizationStrategy strategy)
+  public DynamicCodec(Class<?> type, ObjectCodec.MemoizationStrategy strategy)
       throws ReflectiveOperationException {
     this.type = type;
     this.constructor = getConstructor(type);
@@ -53,7 +53,7 @@ public class DynamicCodec<T> implements ObjectCodec<T> {
   }
 
   @Override
-  public Class<T> getEncodedClass() {
+  public Class<?> getEncodedClass() {
     return type;
   }
 
@@ -63,7 +63,7 @@ public class DynamicCodec<T> implements ObjectCodec<T> {
   }
 
   @Override
-  public void serialize(SerializationContext context, T obj, CodedOutputStream codedOut)
+  public void serialize(SerializationContext context, Object obj, CodedOutputStream codedOut)
       throws SerializationException, IOException {
     for (Map.Entry<Field, Long> entry : offsets.entrySet()) {
       serializeField(context, codedOut, obj, entry.getKey().getType(), entry.getValue());
@@ -133,9 +133,9 @@ public class DynamicCodec<T> implements ObjectCodec<T> {
   }
 
   @Override
-  public T deserialize(DeserializationContext context, CodedInputStream codedIn)
+  public Object deserialize(DeserializationContext context, CodedInputStream codedIn)
       throws SerializationException, IOException {
-    T instance;
+    Object instance;
     try {
       instance = constructor.newInstance();
     } catch (ReflectiveOperationException e) {
@@ -225,13 +225,10 @@ public class DynamicCodec<T> implements ObjectCodec<T> {
     return offsets.build();
   }
 
-  @SuppressWarnings("unchecked")
-  private static <T> Constructor<T> getConstructor(Class<T> type)
-      throws ReflectiveOperationException {
-    Constructor<T> constructor =
-        (Constructor<T>)
-            ReflectionFactory.getReflectionFactory()
-                .newConstructorForSerialization(type, Object.class.getDeclaredConstructor());
+  private static Constructor<?> getConstructor(Class<?> type) throws ReflectiveOperationException {
+    Constructor<?> constructor =
+        ReflectionFactory.getReflectionFactory()
+            .newConstructorForSerialization(type, Object.class.getDeclaredConstructor());
     constructor.setAccessible(true);
     return constructor;
   }