From 2c9721f9ba11979eee1fd95fe793b52369df99ac Mon Sep 17 00:00:00 2001
From: jhorvitz <jhorvitz@google.com>
Date: Mon, 1 Nov 2021 07:09:16 -0700
Subject: [PATCH] Automated rollback of commit
9c65356cedcf4e68077219c10f5a7bb39d38054b.
*** Reason for rollback ***
b/204092093#comment5
*** Original change description ***
Add a method to get an `OutputDirectory` from its name.
PiperOrigin-RevId: 406817638
---
.../config/BuildConfigurationValue.java | 4 ++--
.../lib/analysis/config/OutputDirectories.java | 17 -----------------
.../commands/info/ExecutionRootInfoItem.java | 3 +--
.../commands/info/OutputPathInfoItem.java | 3 +--
.../config/BuildConfigurationValueTest.java | 7 ++-----
5 files changed, 6 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationValue.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationValue.java
index 5d97969b814ba2..85e4556aa59084 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationValue.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationValue.java
@@ -365,8 +365,8 @@ public boolean isStrictFilesetOutput() {
return options.strictFilesetOutput;
}
- public RepositoryName getMainRepositoryName() {
- return mainRepositoryName;
+ public String getMainRepositoryName() {
+ return mainRepositoryName.strippedName();
}
/**
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/OutputDirectories.java b/src/main/java/com/google/devtools/build/lib/analysis/config/OutputDirectories.java
index 899c39eec8d386..a7ba0529ef308a 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/OutputDirectories.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/OutputDirectories.java
@@ -14,7 +14,6 @@
package com.google.devtools.build.lib.analysis.config;
-import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Predicates.not;
import static java.util.stream.Collectors.joining;
@@ -89,22 +88,6 @@ public enum OutputDirectory {
INCLUDE(BlazeDirectories.RELATIVE_INCLUDE_DIR),
OUTPUT("");
- /**
- * Returns the {@link OutputDirectory} matching the given name.
- *
- * <p>Throws {@link IllegalArgumentException} if the given name does not match any directory in
- * the output tree.
- */
- public static OutputDirectory forName(String name) {
- checkNotNull(name);
- for (OutputDirectory directory : values()) {
- if (directory.name.equals(name)) {
- return directory;
- }
- }
- throw new IllegalArgumentException(name);
- }
-
private final String name;
OutputDirectory(String name) {
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/info/ExecutionRootInfoItem.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/info/ExecutionRootInfoItem.java
index 11a2c4500ff655..2d34190bc8a5dc 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/info/ExecutionRootInfoItem.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/info/ExecutionRootInfoItem.java
@@ -35,7 +35,6 @@ public byte[] get(
Supplier<BuildConfigurationValue> configurationSupplier, CommandEnvironment env) {
checkNotNull(env);
return print(
- env.getDirectories()
- .getExecRoot(configurationSupplier.get().getMainRepositoryName().strippedName()));
+ env.getDirectories().getExecRoot(configurationSupplier.get().getMainRepositoryName()));
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/info/OutputPathInfoItem.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/info/OutputPathInfoItem.java
index b426137bed9c99..d3577baf81b153 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/info/OutputPathInfoItem.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/info/OutputPathInfoItem.java
@@ -32,7 +32,6 @@ public byte[] get(
Supplier<BuildConfigurationValue> configurationSupplier, CommandEnvironment env) {
checkNotNull(env);
return print(
- env.getDirectories()
- .getOutputPath(configurationSupplier.get().getMainRepositoryName().strippedName()));
+ env.getDirectories().getOutputPath(configurationSupplier.get().getMainRepositoryName()));
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationValueTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationValueTest.java
index 3524a3149332e2..9334314a60ce6b 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationValueTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationValueTest.java
@@ -47,10 +47,7 @@ public void testBasics() throws Exception {
BuildConfigurationValue config = create("--cpu=piii");
String outputDirPrefix =
- outputBase
- + "/execroot/"
- + config.getMainRepositoryName().strippedName()
- + "/blaze-out/.*piii-fastbuild";
+ outputBase + "/execroot/" + config.getMainRepositoryName() + "/blaze-out/.*piii-fastbuild";
assertThat(config.getOutputDirectory(RepositoryName.MAIN).getRoot().toString())
.matches(outputDirPrefix);
@@ -73,7 +70,7 @@ public void testPlatformSuffix() throws Exception {
.matches(
outputBase
+ "/execroot/"
- + config.getMainRepositoryName().strippedName()
+ + config.getMainRepositoryName()
+ "/blaze-out/.*k8-fastbuild-test");
}