Allows @AutoCodec to use factory methods.

Generalizes @AutoCodec.Constructor to @AutoCodec.Instantiator.

PiperOrigin-RevId: 183702768

5 files changed, 7 insertions, 7 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BlazeDirectories.java b/src/main/java/com/google/devtools/build/lib/analysis/BlazeDirectories.java
index bbae6b4c20..d121a3dfe9 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BlazeDirectories.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BlazeDirectories.java
@@ -66,7 +66,7 @@ public final class BlazeDirectories {
   private final Path localOutputPath;
   private final String productName;
 
-  @AutoCodec.Constructor
+  @AutoCodec.Instantiator
   public BlazeDirectories(ServerDirectories serverDirectories, Path workspace, String productName) {
     this.serverDirectories = serverDirectories;
     this.workspace = workspace;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/LanguageDependentFragment.java b/src/main/java/com/google/devtools/build/lib/analysis/LanguageDependentFragment.java
index 82bbef3af8..56c22f1f6f 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/LanguageDependentFragment.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/LanguageDependentFragment.java
@@ -52,7 +52,7 @@ public final class LanguageDependentFragment implements TransitiveInfoProvider {
 
     private final String displayName;
 
-    @AutoCodec.Constructor
+    @AutoCodec.Instantiator
     public LibraryLanguage(String displayName) {
       this.displayName = displayName;
     }
@@ -80,7 +80,7 @@ public final class LanguageDependentFragment implements TransitiveInfoProvider {
   private final Label label;
   private final ImmutableSet<LibraryLanguage> languages;
 
-  @AutoCodec.Constructor
+  @AutoCodec.Instantiator
   public LanguageDependentFragment(Label label, ImmutableSet<LibraryLanguage> languages) {
     this.label = label;
     this.languages = languages;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/PlatformConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/PlatformConfiguration.java
index ff12670bda..021c673010 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/PlatformConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/PlatformConfiguration.java
@@ -45,7 +45,7 @@ public class PlatformConfiguration extends BuildConfiguration.Fragment {
   private final ImmutableMap<Label, Label> toolchainResolutionOverrides;
   private final ImmutableList<Label> enabledToolchainTypes;
 
-  @AutoCodec.Constructor
+  @AutoCodec.Instantiator
   PlatformConfiguration(
       Label executionPlatform,
       ImmutableList<Label> extraExecutionPlatforms,
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ServerDirectories.java b/src/main/java/com/google/devtools/build/lib/analysis/ServerDirectories.java
index c653c8c9ba..6797cb21a2 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ServerDirectories.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ServerDirectories.java
@@ -53,7 +53,7 @@ public final class ServerDirectories {
         Strings.isNullOrEmpty(installMD5) ? null : checkMD5(HashCode.fromString(installMD5)));
   }
 
-  @AutoCodec.Constructor
+  @AutoCodec.Instantiator
   ServerDirectories(Path installBase, Path outputBase, HashCode installMD5) {
     this.installBase = installBase;
     this.outputBase = outputBase;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/RunUnderConverter.java b/src/main/java/com/google/devtools/build/lib/analysis/config/RunUnderConverter.java
index d367ceec6a..a09a1ce8df 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/RunUnderConverter.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/RunUnderConverter.java
@@ -65,7 +65,7 @@ public class RunUnderConverter implements Converter<RunUnder> {
     private final Label runUnderLabel;
     private final ImmutableList<String> runUnderList;
 
-    @AutoCodec.Constructor
+    @AutoCodec.Instantiator
     RunUnderLabel(String input, Label runUnderLabel, ImmutableList<String> runUnderList) {
       this.input = input;
       this.runUnderLabel = runUnderLabel;
@@ -126,7 +126,7 @@ public class RunUnderConverter implements Converter<RunUnder> {
     private final String runUnderCommand;
     private final ImmutableList<String> runUnderList;
 
-    @AutoCodec.Constructor
+    @AutoCodec.Instantiator
     RunUnderCommand(String input, String runUnderCommand, ImmutableList<String> runUnderList) {
       this.input = input;
       this.runUnderCommand = runUnderCommand;