Add serialization codec for SkylarkImports. This is needed to serialize SkylarkAspectLoadingKey.

Also add a @VisibleForSerialization annotation to @AutoCodec, since we're going to need to increase serialization visibility a lot here, and clean up some unnecessary modifiers.

PiperOrigin-RevId: 182389162

1 files changed, 12 insertions, 1 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkImportsTest.java b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkImportsTest.java
index 7aa1474fb2..e3269f63b0 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkImportsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkImportsTest.java
@@ -17,9 +17,9 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.hamcrest.CoreMatchers.startsWith;
 
 import com.google.devtools.build.lib.cmdline.Label;
+import com.google.devtools.build.lib.skyframe.serialization.testutils.ObjectCodecTester;
 import com.google.devtools.build.lib.syntax.SkylarkImports.SkylarkImportSyntaxException;
 import com.google.devtools.build.lib.vfs.PathFragment;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -229,4 +229,15 @@ public class SkylarkImportsTest {
     // tab character is invalid
     invalidImportTest("\tfile", SkylarkImports.INVALID_FILENAME_PREFIX);
   }
+
+  @Test
+  public void serialization() throws Exception {
+    ObjectCodecTester.newBuilder(SkylarkImport.CODEC)
+        .addSubjects(
+            SkylarkImports.create("//some/skylark:file.bzl"),
+            SkylarkImports.create("/some/skylark/file"),
+            SkylarkImports.create(":subdirectory/containing/file.bzl"),
+            SkylarkImports.create("file"))
+        .buildAndRunTests();
+  }
 }