1 files changed, 6 insertions, 8 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/cmdline/RepositoryName.java b/src/main/java/com/google/devtools/build/lib/cmdline/RepositoryName.java
index 7cd9102ca0..b637cf6d84 100644
--- a/src/main/java/com/google/devtools/build/lib/cmdline/RepositoryName.java
+++ b/src/main/java/com/google/devtools/build/lib/cmdline/RepositoryName.java
@@ -18,7 +18,7 @@ import com.google.common.base.Throwables;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
-import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec;
+import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.devtools.build.lib.util.Pair;
 import com.google.devtools.build.lib.util.StringCanonicalizer;
 import com.google.devtools.build.lib.util.StringUtilities;
@@ -31,13 +31,12 @@ import java.io.Serializable;
 import java.util.concurrent.ExecutionException;
 import java.util.regex.Pattern;
 
-/**
- * A human-readable name for the repository.
- */
+/** A human-readable name for the repository. */
+@AutoCodec
 public final class RepositoryName implements Serializable {
   public static final String DEFAULT_REPOSITORY = "";
-  public static final RepositoryName DEFAULT;
-  public static final RepositoryName MAIN;
+  @AutoCodec public static final RepositoryName DEFAULT;
+  @AutoCodec public static final RepositoryName MAIN;
   private static final Pattern VALID_REPO_NAME = Pattern.compile("@[\\w\\-.]*");
 
   /** Helper for serializing {@link RepositoryName}. */
@@ -104,13 +103,12 @@ public final class RepositoryName implements Serializable {
     }
   }
 
-  public static final ObjectCodec<RepositoryName> CODEC = new RepositoryNameCodec();
-
   /**
    * Makes sure that name is a valid repository name and creates a new RepositoryName using it.
    *
    * @throws LabelSyntaxException if the name is invalid
    */
+  @AutoCodec.Instantiator
   public static RepositoryName create(String name) throws LabelSyntaxException {
     try {
       return repositoryNameCache.get(name);