Refactor CoreOptions to use the new options class interface.

RELNOTES: None
PiperOrigin-RevId: 891322186
Change-Id: I8a15ff1b9e71afb04465a99bc06c09618b5d0400

Author: lberki

src/main/java/com/google/devtools/build/lib/actions/AbstractCommandLine.java

@@ -14,7 +14,7 @@
 
 package com.google.devtools.build.lib.actions;
 
-import com.google.devtools.build.lib.analysis.config.CoreOptions;
+import com.google.devtools.build.lib.analysis.config.CoreOptionsFields;
 import com.google.devtools.build.lib.util.Fingerprint;
 import javax.annotation.Nullable;
 
@@ -54,7 +54,7 @@ public Iterable<String> arguments(
   public void addToFingerprint(
       ActionKeyContext actionKeyContext,
       @Nullable InputMetadataProvider inputMetadataProvider,
-      CoreOptions.OutputPathsMode effectiveOutputPathsMode,
+      CoreOptionsFields.OutputPathsMode effectiveOutputPathsMode,
       Fingerprint fingerprint)
       throws CommandLineExpansionException, InterruptedException {
     for (String s :

src/main/java/com/google/devtools/build/lib/actions/CommandLine.java

@@ -18,7 +18,7 @@
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
-import com.google.devtools.build.lib.analysis.config.CoreOptions;
+import com.google.devtools.build.lib.analysis.config.CoreOptionsFields;
 import com.google.devtools.build.lib.util.Fingerprint;
 import javax.annotation.Nullable;
 
@@ -100,7 +100,7 @@ public abstract Iterable<String> arguments(
   public abstract void addToFingerprint(
       ActionKeyContext actionKeyContext,
       @Nullable InputMetadataProvider inputMetadataProvider,
-      CoreOptions.OutputPathsMode effectiveOutputPathsMode,
+      CoreOptionsFields.OutputPathsMode effectiveOutputPathsMode,
       Fingerprint fingerprint)
       throws CommandLineExpansionException, InterruptedException;
 

src/main/java/com/google/devtools/build/lib/actions/CommandLines.java

@@ -18,7 +18,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.actions.ParameterFile.ParameterFileType;
-import com.google.devtools.build.lib.analysis.config.CoreOptions;
+import com.google.devtools.build.lib.analysis.config.CoreOptionsFields;
 import com.google.devtools.build.lib.util.Fingerprint;
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.PathFragment;
@@ -175,7 +175,7 @@ public ImmutableList<String> allArguments(PathMapper pathMapper)
   public void addToFingerprint(
       ActionKeyContext actionKeyContext,
       @Nullable InputMetadataProvider inputMetadataProvider,
-      CoreOptions.OutputPathsMode effectiveOutputPathsMode,
+      CoreOptionsFields.OutputPathsMode effectiveOutputPathsMode,
       Fingerprint fingerprint)
       throws CommandLineExpansionException, InterruptedException {
     ImmutableList<CommandLineAndParamFileInfo> commandLines = unpack();

src/main/java/com/google/devtools/build/lib/actions/PathMapper.java

@@ -18,7 +18,7 @@
 import com.google.devtools.build.lib.actions.Artifact.DerivedArtifact;
 import com.google.devtools.build.lib.actions.CommandLineItem.ExceptionlessMapFn;
 import com.google.devtools.build.lib.actions.CommandLineItem.MapFn;
-import com.google.devtools.build.lib.analysis.config.CoreOptions;
+import com.google.devtools.build.lib.analysis.config.CoreOptionsFields;
 import com.google.devtools.build.lib.starlarkbuildapi.FileRootApi;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import com.google.errorprone.annotations.CheckReturnValue;
@@ -84,8 +84,8 @@ public StarlarkSemantics getBuiltinManagerCacheKey() {
   }
 
   /** Returns the instance to use during action key computation. */
-  static PathMapper forActionKey(CoreOptions.OutputPathsMode effectiveOutputPathsMode) {
-    return effectiveOutputPathsMode == CoreOptions.OutputPathsMode.OFF
+  static PathMapper forActionKey(CoreOptionsFields.OutputPathsMode effectiveOutputPathsMode) {
+    return effectiveOutputPathsMode == CoreOptionsFields.OutputPathsMode.OFF
         ? NOOP
         : PathMapperConstants.FOR_FINGERPRINTING;
   }

src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java

@@ -209,7 +209,7 @@ public ConfiguredAspect build() throws ActionConflictException, InterruptedExcep
     /**
      * Adds {@link RequiredConfigFragmentsProvider} if {@link
      * CoreOptions#includeRequiredConfigFragmentsProvider} isn't {@link
-     * CoreOptions.IncludeConfigFragmentsEnum#OFF} and if the provider was not already added.
+     * CoreOptionsFields.IncludeConfigFragmentsEnum#OFF} and if the provider was not already added.
      *
      * <p>See {@link RequiredFragmentsUtil} for a description of the meaning of this provider's
      * content. That class contains methods that populate the results of {@link

src/main/java/com/google/devtools/build/lib/analysis/Project.java

@@ -307,7 +307,7 @@ static ImmutableMultimap<Label, Label> findProjectFiles(
    *     active or some targets have project files and others don't, this method checks there's a
    *     sound way to set the desired config and throws an {@link InvalidConfigurationException} if
    *     not.
-   * @param sclConfig the {@link CoreOptions.sclConfig} to apply
+   * @param sclConfig the {@link CoreOptions.getSclConfig()} to apply
    * @param allOptionNames the names of every native option the parser recognizes, in {@code "name"}
    *     form. Not all entries are {@link BuildOptions}.
    * @param userOptions options that were set by users (vs. global bazelrcs), in name=value form

src/main/java/com/google/devtools/build/lib/analysis/RequiredFragmentsUtil.java

@@ -21,7 +21,8 @@
 import com.google.devtools.build.lib.analysis.config.BuildOptionDetails;
 import com.google.devtools.build.lib.analysis.config.ConfigConditions;
 import com.google.devtools.build.lib.analysis.config.CoreOptions;
-import com.google.devtools.build.lib.analysis.config.CoreOptions.IncludeConfigFragmentsEnum;
+import com.google.devtools.build.lib.analysis.config.CoreOptionsFields;
+import com.google.devtools.build.lib.analysis.config.CoreOptionsFields.IncludeConfigFragmentsEnum;
 import com.google.devtools.build.lib.analysis.config.Fragment;
 import com.google.devtools.build.lib.analysis.config.FragmentClassSet;
 import com.google.devtools.build.lib.analysis.config.transitions.TransitionFactory;
@@ -59,11 +60,11 @@ public final class RequiredFragmentsUtil {
    * {@link RuleConfiguredTargetBuilder#maybeAddRequiredConfigFragmentsProvider} for the remaining
    * pieces of config state.
    *
-   * <p>If {@code configuration} is {@link CoreOptions.IncludeConfigFragmentsEnum#DIRECT}, the
+   * <p>If {@code configuration} is {@link CoreOptionsFields.IncludeConfigFragmentsEnum#DIRECT}, the
    * result includes only the config state considered to be directly required by this target. If
-   * it's {@link CoreOptions.IncludeConfigFragmentsEnum#TRANSITIVE}, it also includes config state
-   * needed by transitive dependencies. If it's {@link CoreOptions.IncludeConfigFragmentsEnum#OFF},
-   * this method returns {@code null}.
+   * it's {@link CoreOptionsFields.IncludeConfigFragmentsEnum#TRANSITIVE}, it also includes config
+   * state needed by transitive dependencies. If it's {@link
+   * CoreOptionsFields.IncludeConfigFragmentsEnum#OFF}, this method returns {@code null}.
    *
    * <p>{@code select()}s and toolchain dependencies are considered when looking at what config
    * state is required.
@@ -319,7 +320,7 @@ private static void addStarlarkBuildSettings(
   private static IncludeConfigFragmentsEnum getRequiredFragmentsMode(
       BuildConfigurationValue config) {
     return checkNotNull(
-        config.getOptions().get(CoreOptions.class).includeRequiredConfigFragmentsProvider);
+        config.getOptions().get(CoreOptions.class).getIncludeRequiredConfigFragmentsProvider());
   }
 
   private RequiredFragmentsUtil() {}

src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java

@@ -712,7 +712,7 @@ private static Artifact createRepoMappingManifestAction(
                     .getConfiguration()
                     .getOptions()
                     .get(CoreOptions.class)
-                    .compactRepoMapping));
+                    .getCompactRepoMapping()));
     return repoMappingManifest;
   }
 

src/main/java/com/google/devtools/build/lib/analysis/actions/CustomCommandLine.java

@@ -33,7 +33,7 @@
 import com.google.devtools.build.lib.actions.InputMetadataProvider;
 import com.google.devtools.build.lib.actions.PathMapper;
 import com.google.devtools.build.lib.actions.SingleStringArgFormatter;
-import com.google.devtools.build.lib.analysis.config.CoreOptions;
+import com.google.devtools.build.lib.analysis.config.CoreOptionsFields;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.cmdline.RepositoryMapping;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
@@ -1366,7 +1366,7 @@ Object substituteTreeFileArtifactArgvFragment(TreeFileArtifactArgvFragment argvF
   public void addToFingerprint(
       ActionKeyContext actionKeyContext,
       @Nullable InputMetadataProvider inputMetadataProvider,
-      CoreOptions.OutputPathsMode effectiveOutputPathsMode,
+      CoreOptionsFields.OutputPathsMode effectiveOutputPathsMode,
       Fingerprint fingerprint)
       throws CommandLineExpansionException, InterruptedException {
     List<Object> arguments = rawArgsAsList();

src/main/java/com/google/devtools/build/lib/analysis/actions/ParameterFileWriteAction.java

@@ -36,7 +36,7 @@
 import com.google.devtools.build.lib.actions.PathMapper;
 import com.google.devtools.build.lib.actions.UserExecException;
 import com.google.devtools.build.lib.analysis.config.BuildConfigurationValue;
-import com.google.devtools.build.lib.analysis.config.CoreOptions;
+import com.google.devtools.build.lib.analysis.config.CoreOptionsFields;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.collect.nestedset.Order;
@@ -89,7 +89,7 @@ public ParameterFileWriteAction(
         makeExecutable,
         AbstractFileWriteAction.MNEMONIC,
         /* executionInfo= */ ImmutableMap.of(),
-        CoreOptions.OutputPathsMode.OFF);
+        CoreOptionsFields.OutputPathsMode.OFF);
   }
 
   /**
@@ -116,7 +116,7 @@ public ParameterFileWriteAction(
       boolean makeExecutable,
       String mnemonic,
       ImmutableMap<String, String> executionInfo,
-      CoreOptions.OutputPathsMode outputPathsMode) {
+      CoreOptionsFields.OutputPathsMode outputPathsMode) {
     super(owner, inputs, output);
     this.commandLine = commandLine;
     this.type = type;
@@ -126,7 +126,7 @@ public ParameterFileWriteAction(
     // action.
     this.usePathStripping =
         PathMappers.getEffectiveOutputPathsMode(outputPathsMode, getMnemonic(), executionInfo)
-            == CoreOptions.OutputPathsMode.STRIP;
+            == CoreOptionsFields.OutputPathsMode.STRIP;
   }
 
   @Override
@@ -146,8 +146,10 @@ public ImmutableMap<String, String> getExecutionInfo() {
         : ImmutableMap.of();
   }
 
-  private CoreOptions.OutputPathsMode getOutputPathsMode() {
-    return usePathStripping ? CoreOptions.OutputPathsMode.STRIP : CoreOptions.OutputPathsMode.OFF;
+  private CoreOptionsFields.OutputPathsMode getOutputPathsMode() {
+    return usePathStripping
+        ? CoreOptionsFields.OutputPathsMode.STRIP
+        : CoreOptionsFields.OutputPathsMode.OFF;
   }
 
   @VisibleForTesting