Replace Attribute.SplitTransition with config.transitions.SplitTransition.

PiperOrigin-RevId: 179948322

4 files changed, 30 insertions, 37 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/LateBoundSplitUtil.java b/src/test/java/com/google/devtools/build/lib/analysis/LateBoundSplitUtil.java
index 4296f10375..a721f4ee1b 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/LateBoundSplitUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/LateBoundSplitUtil.java
@@ -24,6 +24,7 @@ import com.google.devtools.build.lib.analysis.config.ConfigurationEnvironment;
 import com.google.devtools.build.lib.analysis.config.ConfigurationFragmentFactory;
 import com.google.devtools.build.lib.analysis.config.FragmentOptions;
 import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
+import com.google.devtools.build.lib.analysis.config.transitions.SplitTransition;
 import com.google.devtools.build.lib.analysis.util.MockRule;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.packages.Attribute;
@@ -33,7 +34,6 @@ import com.google.devtools.build.lib.util.FileTypeSet;
 import com.google.devtools.common.options.Option;
 import com.google.devtools.common.options.OptionDocumentationCategory;
 import com.google.devtools.common.options.OptionEffectTag;
-import java.util.List;
 
 /**
  * Rule and configuration class definitions for testing late-bound split attributes.
@@ -55,17 +55,14 @@ public class LateBoundSplitUtil {
   /**
    * The split.
    */
-  private static final Attribute.SplitTransition<BuildOptions> SIMPLE_SPLIT =
-      new Attribute.SplitTransition<BuildOptions>() {
-    @Override
-    public List<BuildOptions> split(BuildOptions buildOptions) {
-      BuildOptions split1 = buildOptions.clone();
-      split1.get(TestOptions.class).fooFlag = "one";
-      BuildOptions split2 = buildOptions.clone();
-      split2.get(TestOptions.class).fooFlag = "two";
-      return ImmutableList.<BuildOptions>of(split1, split2);
-    }
-  };
+  private static final SplitTransition SIMPLE_SPLIT =
+      (SplitTransition) buildOptions -> {
+        BuildOptions split1 = buildOptions.clone();
+        split1.get(TestOptions.class).fooFlag = "one";
+        BuildOptions split2 = buildOptions.clone();
+        split2.get(TestOptions.class).fooFlag = "two";
+        return ImmutableList.of(split1, split2);
+      };
 
   /**
    * The {@link BuildConfiguration.Fragment} that contains the options.
diff --git a/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java b/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java
index 4adef68f79..f4b5662af7 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java
@@ -27,9 +27,9 @@ import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.analysis.config.BuildOptions;
 import com.google.devtools.build.lib.analysis.config.HostTransition;
+import com.google.devtools.build.lib.analysis.config.transitions.SplitTransition;
 import com.google.devtools.build.lib.analysis.util.TestAspects;
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.packages.Attribute.SplitTransition;
 import com.google.devtools.build.lib.packages.Attribute.SplitTransitionProvider;
 import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassNamePredicate;
 import com.google.devtools.build.lib.syntax.Type;
@@ -295,7 +295,7 @@ public class AttributeTest {
     assertThat(attr.hasSplitConfigurationTransition()).isFalse();
   }
 
-  private static class TestSplitTransition implements SplitTransition<BuildOptions> {
+  private static class TestSplitTransition implements SplitTransition {
     @Override
     public List<BuildOptions> split(BuildOptions buildOptions) {
       return ImmutableList.of(buildOptions.clone(), buildOptions.clone());
@@ -304,7 +304,7 @@ public class AttributeTest {
 
   private static class TestSplitTransitionProvider implements SplitTransitionProvider {
     @Override
-    public SplitTransition<?> apply(AttributeMap attrMapper) {
+    public SplitTransition apply(AttributeMap attrMapper) {
       return new TestSplitTransition();
     }
   }
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
index c5577e76a3..74b5a4d0c2 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
@@ -74,11 +74,11 @@ import com.google.devtools.build.lib.analysis.actions.TemplateExpansionAction.Su
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
 import com.google.devtools.build.lib.analysis.config.BuildOptions;
 import com.google.devtools.build.lib.analysis.config.CompilationMode;
+import com.google.devtools.build.lib.analysis.config.transitions.SplitTransition;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.analysis.util.ScratchAttributeWriter;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.cmdline.RepositoryName;
-import com.google.devtools.build.lib.packages.Attribute.SplitTransition;
 import com.google.devtools.build.lib.packages.util.MockJ2ObjcSupport;
 import com.google.devtools.build.lib.packages.util.MockObjcSupport;
 import com.google.devtools.build.lib.packages.util.MockProtoSupport;
@@ -420,7 +420,7 @@ public abstract class ObjcRuleTestCase extends BuildViewTestCase {
    * configuration.
    */
   protected List<BuildConfiguration> getSplitConfigurations(BuildConfiguration configuration,
-      SplitTransition<BuildOptions> splitTransition) throws InterruptedException {
+      SplitTransition splitTransition) throws InterruptedException {
     ImmutableList.Builder<BuildConfiguration> splitConfigs = ImmutableList.builder();
 
     for (BuildOptions splitOptions : splitTransition.split(configuration.getOptions())) {
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java
index 56c4d29431..64e141d134 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ConfigurationsForTargetsWithTrimmedConfigurationsTest.java
@@ -31,6 +31,7 @@ import com.google.devtools.build.lib.analysis.config.BuildOptions;
 import com.google.devtools.build.lib.analysis.config.ConfigurationResolver;
 import com.google.devtools.build.lib.analysis.config.PatchTransition;
 import com.google.devtools.build.lib.analysis.config.TransitionResolver;
+import com.google.devtools.build.lib.analysis.config.transitions.SplitTransition;
 import com.google.devtools.build.lib.analysis.config.transitions.Transition;
 import com.google.devtools.build.lib.analysis.test.TestConfiguration;
 import com.google.devtools.build.lib.analysis.util.MockRule;
@@ -38,8 +39,6 @@ import com.google.devtools.build.lib.analysis.util.MockRuleDefaults;
 import com.google.devtools.build.lib.analysis.util.TestAspects;
 import com.google.devtools.build.lib.analysis.util.TestAspects.DummyRuleFactory;
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.packages.Attribute;
-import com.google.devtools.build.lib.packages.Attribute.SplitTransition;
 import com.google.devtools.build.lib.packages.NonconfigurableAttributeMapper;
 import com.google.devtools.build.lib.packages.Rule;
 import com.google.devtools.build.lib.packages.RuleTransitionFactory;
@@ -70,14 +69,14 @@ public class ConfigurationsForTargetsWithTrimmedConfigurationsTest
     return super.defaultFlags().with(Flag.TRIMMED_CONFIGURATIONS);
   }
 
-  private static class EmptySplitTransition implements SplitTransition<BuildOptions> {
+  private static class EmptySplitTransition implements SplitTransition {
     @Override
     public List<BuildOptions> split(BuildOptions buildOptions) {
       return ImmutableList.of();
     }
   }
 
-  private static class SetsHostCpuSplitTransition implements SplitTransition<BuildOptions> {
+  private static class SetsHostCpuSplitTransition implements SplitTransition {
     @Override
     public List<BuildOptions> split(BuildOptions buildOptions) {
       BuildOptions result = buildOptions.clone();
@@ -86,7 +85,7 @@ public class ConfigurationsForTargetsWithTrimmedConfigurationsTest
     }
   }
 
-  private static class SetsCpuSplitTransition implements SplitTransition<BuildOptions> {
+  private static class SetsCpuSplitTransition implements SplitTransition {
 
     @Override
     public List<BuildOptions> split(BuildOptions buildOptions) {
@@ -368,25 +367,22 @@ public class ConfigurationsForTargetsWithTrimmedConfigurationsTest
   }
 
   /**
-   * Returns a custom {@link Attribute.SplitTransition} that splits {@link
+   * Returns a custom {@link SplitTransition} that splits {@link
    * TestConfiguration.TestOptions#testFilter} down two paths: {@code += prefix + "1"} and {@code +=
    * prefix + "2"}.
    */
-  private static Attribute.SplitTransition<BuildOptions> newSplitTransition(final String prefix) {
-    return new Attribute.SplitTransition<BuildOptions>() {
-      @Override
-      public List<BuildOptions> split(BuildOptions buildOptions) {
-        ImmutableList.Builder<BuildOptions> result = ImmutableList.builder();
-        for (int index = 1; index <= 2; index++) {
-          BuildOptions toOptions = buildOptions.clone();
-          TestConfiguration.TestOptions baseOptions =
-              toOptions.get(TestConfiguration.TestOptions.class);
-          baseOptions.testFilter =
-              (baseOptions.testFilter == null ? "" : baseOptions.testFilter) + prefix + index;
-          result.add(toOptions);
-        }
-        return result.build();
+  private static SplitTransition newSplitTransition(final String prefix) {
+    return buildOptions -> {
+      ImmutableList.Builder<BuildOptions> result = ImmutableList.builder();
+      for (int index = 1; index <= 2; index++) {
+        BuildOptions toOptions = buildOptions.clone();
+        TestConfiguration.TestOptions baseOptions =
+            toOptions.get(TestConfiguration.TestOptions.class);
+        baseOptions.testFilter =
+            (baseOptions.testFilter == null ? "" : baseOptions.testFilter) + prefix + index;
+        result.add(toOptions);
       }
+      return result.build();
     };
   }