From 1b660467d75ca6fdb25f43b3209fefc032cde34f Mon Sep 17 00:00:00 2001 From: Googler Date: Fri, 28 Apr 2023 08:29:45 -0700 Subject: [PATCH] Remove overrides of `isSymlink` and `isDirectory` in VirtualActionInput subclasses, they are all the same. PiperOrigin-RevId: 527891355 Change-Id: I3d1d9df72cca40079bb854d79053eee0cc4d95a4 --- .../devtools/build/lib/actions/CommandLines.java | 10 ---------- .../com/google/devtools/build/lib/exec/BinTools.java | 12 ------------ .../build/lib/actions/util/ActionsTestUtil.java | 10 ---------- 3 files changed, 32 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/actions/CommandLines.java b/src/main/java/com/google/devtools/build/lib/actions/CommandLines.java index 46fff7b02bdf98..556340e1927af8 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/CommandLines.java +++ b/src/main/java/com/google/devtools/build/lib/actions/CommandLines.java @@ -288,16 +288,6 @@ public ParamFileActionInput withAdjustedArgs(Function adjuster) charset); } - @Override - public boolean isDirectory() { - return false; - } - - @Override - public boolean isSymlink() { - return false; - } - @Override public void writeTo(OutputStream out) throws IOException { ParameterFile.writeParameterFile(out, arguments, type, charset); diff --git a/src/main/java/com/google/devtools/build/lib/exec/BinTools.java b/src/main/java/com/google/devtools/build/lib/exec/BinTools.java index 03f62fa141b6e2..9a6ad45fe75683 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/BinTools.java +++ b/src/main/java/com/google/devtools/build/lib/exec/BinTools.java @@ -186,13 +186,6 @@ public void writeTo(OutputStream out) throws IOException { } } - @Override - public boolean isSymlink() { - // There are no unresolved symlinks embedded in the binary. We don't need them (embedded - // binaries are just a few simple tools) and zip doesn't support them anyway. - return false; - } - @Override @CanIgnoreReturnValue protected byte[] atomicallyWriteTo(Path outputPath, String uniqueSuffix) throws IOException { @@ -209,11 +202,6 @@ protected byte[] atomicallyWriteTo(Path outputPath, String uniqueSuffix) throws return digest; } - @Override - public boolean isDirectory() { - return false; - } - @Override public ByteString getBytes() throws IOException { ByteString.Output out = ByteString.newOutput(); diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java index 32b41c7224c803..199471f29afac0 100644 --- a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java +++ b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java @@ -365,16 +365,6 @@ public PathFragment getExecPath() { return path; } - @Override - public boolean isDirectory() { - return false; - } - - @Override - public boolean isSymlink() { - return false; - } - @Override public void writeTo(OutputStream out) throws IOException { out.write(contents.getBytes(UTF_8));