aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/actions/ActionInputHelper.java
diff options
context:
space:
mode:
authorGravatar cpeyser <cpeyser@google.com>2018-02-05 09:33:15 -0800
committerGravatar Copybara-Service <copybara-piper@google.com>2018-02-05 09:35:15 -0800
commitac09f0a1b39092aa92cd86ffe51b30488e3ae312 (patch)
tree5da2c93a53102c82258a2637b9e853c7bfb2dd2c /src/main/java/com/google/devtools/build/lib/actions/ActionInputHelper.java
parent98f703b46e08b6795af609b6f453ce3884f28a28 (diff)
Add type assertion that TreeFileArtifact's parentTreeArtifact member is a
SpecialArtifact. PiperOrigin-RevId: 184539696
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/actions/ActionInputHelper.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/actions/ActionInputHelper.java19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionInputHelper.java b/src/main/java/com/google/devtools/build/lib/actions/ActionInputHelper.java
index 0f2c387102..f7a9e0734a 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/ActionInputHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/ActionInputHelper.java
@@ -22,6 +22,7 @@ import com.google.common.collect.Collections2;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
+import com.google.devtools.build.lib.actions.Artifact.SpecialArtifact;
import com.google.devtools.build.lib.actions.Artifact.TreeFileArtifact;
import com.google.devtools.build.lib.vfs.PathFragment;
import java.util.ArrayList;
@@ -138,18 +139,18 @@ public final class ActionInputHelper {
}
/**
- * Instantiates a concrete TreeFileArtifact with the given parent Artifact and path
- * relative to that Artifact.
+ * Instantiates a concrete TreeFileArtifact with the given parent Artifact and path relative to
+ * that Artifact.
*/
public static TreeFileArtifact treeFileArtifact(
- Artifact parent, PathFragment relativePath) {
+ SpecialArtifact parent, PathFragment relativePath) {
Preconditions.checkState(parent.isTreeArtifact(),
"Given parent %s must be a TreeArtifact", parent);
return new TreeFileArtifact(parent, relativePath);
}
public static TreeFileArtifact treeFileArtifact(
- Artifact parent, PathFragment relativePath, ArtifactOwner artifactOwner) {
+ SpecialArtifact parent, PathFragment relativePath, ArtifactOwner artifactOwner) {
Preconditions.checkState(parent.isTreeArtifact(),
"Given parent %s must be a TreeArtifact", parent);
return new TreeFileArtifact(
@@ -159,16 +160,16 @@ public final class ActionInputHelper {
}
/**
- * Instantiates a concrete TreeFileArtifact with the given parent Artifact and path
- * relative to that Artifact.
+ * Instantiates a concrete TreeFileArtifact with the given parent Artifact and path relative to
+ * that Artifact.
*/
- public static TreeFileArtifact treeFileArtifact(Artifact parent, String relativePath) {
+ public static TreeFileArtifact treeFileArtifact(SpecialArtifact parent, String relativePath) {
return treeFileArtifact(parent, PathFragment.create(relativePath));
}
/** Returns an Iterable of TreeFileArtifacts with the given parent and parent relative paths. */
public static Iterable<TreeFileArtifact> asTreeFileArtifacts(
- final Artifact parent, Iterable<? extends PathFragment> parentRelativePaths) {
+ final SpecialArtifact parent, Iterable<? extends PathFragment> parentRelativePaths) {
Preconditions.checkState(parent.isTreeArtifact(),
"Given parent %s must be a TreeArtifact", parent);
return Iterables.transform(
@@ -177,7 +178,7 @@ public final class ActionInputHelper {
/** Returns a Set of TreeFileArtifacts with the given parent and parent-relative paths. */
public static Set<TreeFileArtifact> asTreeFileArtifacts(
- final Artifact parent, Set<? extends PathFragment> parentRelativePaths) {
+ final SpecialArtifact parent, Set<? extends PathFragment> parentRelativePaths) {
Preconditions.checkState(parent.isTreeArtifact(),
"Given parent %s must be a TreeArtifact", parent);