Remove outdated defaultsToSelf.

Part of the static config cleanup effort.

PiperOrigin-RevId: 168270713

7 files changed, 1 insertions, 46 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java b/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java
index 28ee44deac..f5829ed2e9 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolver.java
@@ -785,11 +785,6 @@ public abstract class DependencyResolver {
     public BuildOptions apply(BuildOptions options) {
       return toOptions;
     }
-
-    @Override
-    public boolean defaultsToSelf() {
-      return false;
-    }
   }
 
   private void visitTargetVisibility(
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ComposingPatchTransition.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ComposingPatchTransition.java
index fb4c7e5d6c..83fcf6dbb9 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/ComposingPatchTransition.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/ComposingPatchTransition.java
@@ -29,12 +29,6 @@ public class ComposingPatchTransition implements PatchTransition {
   }
 
   @Override
-  public boolean defaultsToSelf() {
-    throw new UnsupportedOperationException(
-        "dynamic configurations don't use global transition tables");
-  }
-
-  @Override
   public BuildOptions apply(BuildOptions options) {
     return Iterables.getOnlyElement(delegate.split(options));
   }
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ComposingSplitTransition.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ComposingSplitTransition.java
index f6eed9f0eb..3241edccff 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/ComposingSplitTransition.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/ComposingSplitTransition.java
@@ -15,7 +15,6 @@
 package com.google.devtools.build.lib.analysis.config;
 
 import com.google.common.base.Preconditions;
-import com.google.common.base.Verify;
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.packages.Attribute.ConfigurationTransition;
 import com.google.devtools.build.lib.packages.Attribute.SplitTransition;
@@ -81,7 +80,6 @@ public class ComposingSplitTransition implements SplitTransition<BuildOptions> {
       SplitTransition split = (SplitTransition<BuildOptions>) transition;
       List<BuildOptions> splitOptions = split.split(fromOptions);
       if (splitOptions.isEmpty()) {
-        Verify.verify(split.defaultsToSelf());
         return ImmutableList.<BuildOptions>of(fromOptions);
       } else {
         return splitOptions;
@@ -92,10 +90,5 @@ public class ComposingSplitTransition implements SplitTransition<BuildOptions> {
               transition.getClass().getName()));
     }
   }
-
-  @Override
-  public boolean defaultsToSelf() {
-    return true;
-  }
 }
 
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationResolver.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationResolver.java
index 5432b7cbab..3f6e710430 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationResolver.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationResolver.java
@@ -218,11 +218,6 @@ public final class ConfigurationResolver {
       return Iterables.getOnlyElement(
           ComposingSplitTransition.apply(options, configurator.apply(options)));
     }
-
-    @Override
-    public boolean defaultsToSelf() {
-      return false;
-    }
   }
 
   /**
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/DynamicTransitionMapper.java b/src/main/java/com/google/devtools/build/lib/analysis/config/DynamicTransitionMapper.java
index 66d0cf90af..5166cb677c 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/DynamicTransitionMapper.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/DynamicTransitionMapper.java
@@ -47,10 +47,7 @@ public final class DynamicTransitionMapper {
   /**
    * Use this to declare a no-op transition that keeps the input configuration.
    */
-  public static final Transition SELF = () -> {
-      throw new UnsupportedOperationException("This is just an alias for \"keep the input "
-       + "configuration\". It shouldn't actually apply a real transition");
-  };
+  public static final Transition SELF = new Transition() {};
 
   private final ImmutableMap<Transition, Transition> map;
 
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/HostTransition.java b/src/main/java/com/google/devtools/build/lib/analysis/config/HostTransition.java
index 61f3e26810..e593cd7621 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/HostTransition.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/HostTransition.java
@@ -43,9 +43,4 @@ public final class HostTransition implements PatchTransition {
       return options.createHostOptions();
     }
   }
-
-  @Override
-  public boolean defaultsToSelf() {
-    return false;
-  }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/PatchTransition.java b/src/main/java/com/google/devtools/build/lib/analysis/config/PatchTransition.java
index 8a78817b3d..33362b1dac 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/PatchTransition.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/PatchTransition.java
@@ -58,18 +58,4 @@ public interface PatchTransition extends Attribute.Transition {
    * @return the options representing the desired post-transition configuration
    */
   BuildOptions apply(BuildOptions options);
-
-  /**
-   * This method is only needed for static configurations, and will go away with their removal. We
-   * don't want to litter the dynamic configurations API with it, so we define this default to save
-   * transition implementers from having to consider it.
-   *
-   * <p>If you're implementing a dynamic transition, ignore this concept completely. It has no
-   * effect on anything you're doing, and will be removed from the API as soon as it's safe to
-   * retire static configurations.
-   */
-  @Override
-  default boolean defaultsToSelf() {
-    return false;
-  }
 }