Splits the iterableMarshaller into runtime codecs.

Makes NestedSetCodec into a runtime codec instead of a Marshaller.

PiperOrigin-RevId: 189110883

2 files changed, 23 insertions, 44 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD
index 438a480860..e487d55123 100644
--- a/src/test/java/com/google/devtools/build/lib/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/BUILD
@@ -222,7 +222,6 @@ java_test(
         "//src/main/java/com/google/devtools/build/lib/actions:commandline_item",
         "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
         "//src/main/java/com/google/devtools/build/lib/collect/nestedset:fingerprint_cache",
-        "//src/main/java/com/google/devtools/build/lib/collect/nestedset:serialization",
         "//src/main/java/com/google/devtools/build/lib/skyframe/serialization",
         "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils",
     ],
@@ -778,7 +777,6 @@ java_test(
         "//src/main/java/com/google/devtools/build/lib/collect",
         "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
         "//src/main/java/com/google/devtools/build/lib/rules/cpp",
-        "//src/main/java/com/google/devtools/build/lib/skyframe/serialization",
         "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec",
         "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils",
         "//src/main/java/com/google/devtools/build/lib/vfs",
diff --git a/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetCodecTest.java b/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetCodecTest.java
index 57f0a4ac1c..da9702abca 100644
--- a/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetCodecTest.java
+++ b/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetCodecTest.java
@@ -15,9 +15,7 @@ package com.google.devtools.build.lib.collect.nestedset;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.common.collect.ImmutableList;
-import com.google.devtools.build.lib.skyframe.serialization.testutils.ObjectCodecTester;
-import com.google.devtools.build.lib.skyframe.serialization.testutils.SerializerTester;
+import com.google.devtools.build.lib.skyframe.serialization.testutils.SerializationTester;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -29,47 +27,30 @@ public class NestedSetCodecTest {
   private static final NestedSet<String> SHARED_NESTED_SET =
       NestedSetBuilder.<String>stableOrder().add("e").build();
 
-  private static final ImmutableList<NestedSet<String>> SUBJECTS =
-      ImmutableList.of(
-          NestedSetBuilder.emptySet(Order.STABLE_ORDER),
-          NestedSetBuilder.emptySet(Order.NAIVE_LINK_ORDER),
-          NestedSetBuilder.create(Order.STABLE_ORDER, "a"),
-          NestedSetBuilder.create(Order.STABLE_ORDER, "a", "b", "c"),
-          NestedSetBuilder.<String>stableOrder()
-              .add("a")
-              .add("b")
-              .addTransitive(
-                  NestedSetBuilder.<String>stableOrder()
-                      .add("c")
-                      .addTransitive(SHARED_NESTED_SET)
-                      .build())
-              .addTransitive(
-                  NestedSetBuilder.<String>stableOrder()
-                      .add("d")
-                      .addTransitive(SHARED_NESTED_SET)
-                      .build())
-              .addTransitive(NestedSetBuilder.emptySet(Order.STABLE_ORDER))
-              .build());
-
   @Test
   public void testCodec() throws Exception {
-    ObjectCodecTester.newBuilder(new NestedSetCodec<String>())
-        .addSubjects(SUBJECTS)
-        .verificationFunction(NestedSetCodecTest::verifyDeserialization)
-        .buildAndRunTests();
-  }
-
-  @SuppressWarnings({"rawtypes", "unchecked"})
-  @Test
-  public void testSerializer() throws Exception {
-    SerializerTester.Builder<NestedSet, NestedSet> builder =
-        SerializerTester.newBuilder(NestedSet.class)
-            .visitKryo(NestedSetSerializer::registerSerializers)
-            .setVerificationFunction(NestedSetCodecTest::verifyDeserialization);
-    for (NestedSet<String> subject : SUBJECTS) {
-      builder.addSubjects(subject);
-    }
-    builder.buildAndRunTests();
+    new SerializationTester(
+            NestedSetBuilder.emptySet(Order.STABLE_ORDER),
+            NestedSetBuilder.emptySet(Order.NAIVE_LINK_ORDER),
+            NestedSetBuilder.create(Order.STABLE_ORDER, "a"),
+            NestedSetBuilder.create(Order.STABLE_ORDER, "a", "b", "c"),
+            NestedSetBuilder.<String>stableOrder()
+                .add("a")
+                .add("b")
+                .addTransitive(
+                    NestedSetBuilder.<String>stableOrder()
+                        .add("c")
+                        .addTransitive(SHARED_NESTED_SET)
+                        .build())
+                .addTransitive(
+                    NestedSetBuilder.<String>stableOrder()
+                        .add("d")
+                        .addTransitive(SHARED_NESTED_SET)
+                        .build())
+                .addTransitive(NestedSetBuilder.emptySet(Order.STABLE_ORDER))
+                .build())
+        .setVerificationFunction(NestedSetCodecTest::verifyDeserialization)
+        .runTests();
   }
 
   private static void verifyDeserialization(