diff options
| author |  tomlu <tomlu@google.com> | 2017-11-08 20:12:47 +0100 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-11-09 18:29:06 +0100 |
| commit | a155b536cb8032feaf2710677d2bdab4b2b43c96 (patch) | |
| tree | 793ab3da054e3dc26e6fb00d1fd2fa7793b6799b /src/main/java/com/google/devtools/build/lib/events | |
| parent | 743ea216879dd0e3037d4b34eff92ba8af493554 (diff) | |
Replace all usages of Blaze's Preconditions class with guava.
Blaze had its own class to avoid GC from varargs array creation for the precondition happy path. Guava now (mostly) implements these, making it unnecessary to maintain our own.
This change was almost entirely automated by search-and-replace. A few BUILD files needed fixing up since I removed an export of preconditions from lib:util, which was all done by add_deps. There was one incorrect usage of Preconditions that was caught by error prone (which checks Guava's version of Preconditions) that I had to change manually.
PiperOrigin-RevId: 175033526
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/events')
4 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/events/DelegatingEventHandler.java b/src/main/java/com/google/devtools/build/lib/events/DelegatingEventHandler.java index 84858e328b..024f1c9e46 100644 --- a/src/main/java/com/google/devtools/build/lib/events/DelegatingEventHandler.java +++ b/src/main/java/com/google/devtools/build/lib/events/DelegatingEventHandler.java @@ -14,7 +14,7 @@ package com.google.devtools.build.lib.events; -import com.google.devtools.build.lib.util.Preconditions; +import com.google.common.base.Preconditions; /** * An EventHandler which delegates to another EventHandler. Primarily useful as a base class for diff --git a/src/main/java/com/google/devtools/build/lib/events/Event.java b/src/main/java/com/google/devtools/build/lib/events/Event.java index e0bf233b65..61db7dcad9 100644 --- a/src/main/java/com/google/devtools/build/lib/events/Event.java +++ b/src/main/java/com/google/devtools/build/lib/events/Event.java @@ -15,7 +15,7 @@ package com.google.devtools.build.lib.events; import static java.nio.charset.StandardCharsets.UTF_8; -import com.google.devtools.build.lib.util.Preconditions; +import com.google.common.base.Preconditions; import java.io.Serializable; import java.util.Arrays; import java.util.Objects; diff --git a/src/main/java/com/google/devtools/build/lib/events/Reporter.java b/src/main/java/com/google/devtools/build/lib/events/Reporter.java index 12039e3340..6c164a1ebd 100644 --- a/src/main/java/com/google/devtools/build/lib/events/Reporter.java +++ b/src/main/java/com/google/devtools/build/lib/events/Reporter.java @@ -13,8 +13,8 @@ // limitations under the License. package com.google.devtools.build.lib.events; +import com.google.common.base.Preconditions; import com.google.common.eventbus.EventBus; -import com.google.devtools.build.lib.util.Preconditions; import com.google.devtools.build.lib.util.io.OutErr; import java.io.PrintStream; import java.util.ArrayList; diff --git a/src/main/java/com/google/devtools/build/lib/events/ReporterStream.java b/src/main/java/com/google/devtools/build/lib/events/ReporterStream.java index 3a7e7d60b8..e3b81919b8 100644 --- a/src/main/java/com/google/devtools/build/lib/events/ReporterStream.java +++ b/src/main/java/com/google/devtools/build/lib/events/ReporterStream.java @@ -14,7 +14,7 @@ package com.google.devtools.build.lib.events; -import com.google.devtools.build.lib.util.Preconditions; +import com.google.common.base.Preconditions; import java.io.OutputStream; import java.util.Arrays; |