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/profiler | |
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/profiler')
12 files changed, 11 insertions, 14 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/profiler/AutoProfiler.java b/src/main/java/com/google/devtools/build/lib/profiler/AutoProfiler.java index afb55db212..97e6147119 100644 --- a/src/main/java/com/google/devtools/build/lib/profiler/AutoProfiler.java +++ b/src/main/java/com/google/devtools/build/lib/profiler/AutoProfiler.java @@ -13,9 +13,9 @@ // limitations under the License. package com.google.devtools.build.lib.profiler; +import com.google.common.base.Preconditions; import com.google.devtools.build.lib.clock.BlazeClock; import com.google.devtools.build.lib.clock.Clock; -import com.google.devtools.build.lib.util.Preconditions; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/com/google/devtools/build/lib/profiler/BUILD b/src/main/java/com/google/devtools/build/lib/profiler/BUILD index a867c62135..bb1231e064 100644 --- a/src/main/java/com/google/devtools/build/lib/profiler/BUILD +++ b/src/main/java/com/google/devtools/build/lib/profiler/BUILD @@ -15,7 +15,6 @@ java_library( deps = [ "//src/main/java/com/google/devtools/build/lib:base-util", "//src/main/java/com/google/devtools/build/lib:os_util", - "//src/main/java/com/google/devtools/build/lib:preconditions", "//src/main/java/com/google/devtools/build/lib/clock", "//src/main/java/com/google/devtools/build/lib/concurrent", "//src/main/java/com/google/devtools/build/lib/shell", diff --git a/src/main/java/com/google/devtools/build/lib/profiler/Profiler.java b/src/main/java/com/google/devtools/build/lib/profiler/Profiler.java index 5eef97669c..f56afc8f9b 100644 --- a/src/main/java/com/google/devtools/build/lib/profiler/Profiler.java +++ b/src/main/java/com/google/devtools/build/lib/profiler/Profiler.java @@ -15,6 +15,7 @@ package com.google.devtools.build.lib.profiler; import static com.google.devtools.build.lib.profiler.ProfilerTask.TASK_COUNT; +import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; @@ -23,7 +24,6 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadCompatible; import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe; import com.google.devtools.build.lib.profiler.PredicateBasedStatRecorder.RecorderAndPredicate; import com.google.devtools.build.lib.profiler.StatRecorder.VfsHeuristics; -import com.google.devtools.build.lib.util.Preconditions; import com.google.devtools.build.lib.util.VarInt; import java.io.BufferedOutputStream; import java.io.DataOutputStream; diff --git a/src/main/java/com/google/devtools/build/lib/profiler/SingleStatRecorder.java b/src/main/java/com/google/devtools/build/lib/profiler/SingleStatRecorder.java index 1099987f66..b40ffba304 100644 --- a/src/main/java/com/google/devtools/build/lib/profiler/SingleStatRecorder.java +++ b/src/main/java/com/google/devtools/build/lib/profiler/SingleStatRecorder.java @@ -13,11 +13,11 @@ // limitations under the License. package com.google.devtools.build.lib.profiler; +import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Range; import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe; import com.google.devtools.build.lib.profiler.MetricData.HistogramElement; -import com.google.devtools.build.lib.util.Preconditions; /** * A stat recorder that can record time histograms, count of calls, average time, Std. Deviation diff --git a/src/main/java/com/google/devtools/build/lib/profiler/analysis/ProfileInfo.java b/src/main/java/com/google/devtools/build/lib/profiler/analysis/ProfileInfo.java index f1273231c3..88cb5b8071 100644 --- a/src/main/java/com/google/devtools/build/lib/profiler/analysis/ProfileInfo.java +++ b/src/main/java/com/google/devtools/build/lib/profiler/analysis/ProfileInfo.java @@ -18,6 +18,7 @@ import static com.google.devtools.build.lib.profiler.ProfilerTask.CRITICAL_PATH; import static com.google.devtools.build.lib.profiler.ProfilerTask.TASK_COUNT; import com.google.common.base.Joiner; +import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.ListMultimap; @@ -29,7 +30,6 @@ import com.google.common.collect.Sets; import com.google.devtools.build.lib.profiler.ProfilePhase; import com.google.devtools.build.lib.profiler.Profiler; import com.google.devtools.build.lib.profiler.ProfilerTask; -import com.google.devtools.build.lib.util.Preconditions; import com.google.devtools.build.lib.util.VarInt; import com.google.devtools.build.lib.vfs.Path; import java.io.BufferedInputStream; diff --git a/src/main/java/com/google/devtools/build/lib/profiler/chart/ChartBar.java b/src/main/java/com/google/devtools/build/lib/profiler/chart/ChartBar.java index 0330397a48..663595a4bd 100644 --- a/src/main/java/com/google/devtools/build/lib/profiler/chart/ChartBar.java +++ b/src/main/java/com/google/devtools/build/lib/profiler/chart/ChartBar.java @@ -14,7 +14,7 @@ package com.google.devtools.build.lib.profiler.chart; -import com.google.devtools.build.lib.util.Preconditions; +import com.google.common.base.Preconditions; /** * A bar in a row of a Gantt Chart. diff --git a/src/main/java/com/google/devtools/build/lib/profiler/chart/ChartBarType.java b/src/main/java/com/google/devtools/build/lib/profiler/chart/ChartBarType.java index ff7a8c25f4..1d919cd5e4 100644 --- a/src/main/java/com/google/devtools/build/lib/profiler/chart/ChartBarType.java +++ b/src/main/java/com/google/devtools/build/lib/profiler/chart/ChartBarType.java @@ -14,7 +14,7 @@ package com.google.devtools.build.lib.profiler.chart; -import com.google.devtools.build.lib.util.Preconditions; +import com.google.common.base.Preconditions; /** * The type of a bar in a Gantt Chart. A type consists of a name and a color. diff --git a/src/main/java/com/google/devtools/build/lib/profiler/chart/ChartColumn.java b/src/main/java/com/google/devtools/build/lib/profiler/chart/ChartColumn.java index 455583b988..caa0407a28 100644 --- a/src/main/java/com/google/devtools/build/lib/profiler/chart/ChartColumn.java +++ b/src/main/java/com/google/devtools/build/lib/profiler/chart/ChartColumn.java @@ -14,7 +14,7 @@ package com.google.devtools.build.lib.profiler.chart; -import com.google.devtools.build.lib.util.Preconditions; +import com.google.common.base.Preconditions; /** * A chart column. The column can be used to highlight a time-range. diff --git a/src/main/java/com/google/devtools/build/lib/profiler/chart/ChartLine.java b/src/main/java/com/google/devtools/build/lib/profiler/chart/ChartLine.java index eee8f22427..f32f8046ea 100644 --- a/src/main/java/com/google/devtools/build/lib/profiler/chart/ChartLine.java +++ b/src/main/java/com/google/devtools/build/lib/profiler/chart/ChartLine.java @@ -14,7 +14,7 @@ package com.google.devtools.build.lib.profiler.chart; -import com.google.devtools.build.lib.util.Preconditions; +import com.google.common.base.Preconditions; /** * A chart line. Such lines can be used to connect boxes. diff --git a/src/main/java/com/google/devtools/build/lib/profiler/chart/ChartRow.java b/src/main/java/com/google/devtools/build/lib/profiler/chart/ChartRow.java index 5e079244e3..2c6916c30c 100644 --- a/src/main/java/com/google/devtools/build/lib/profiler/chart/ChartRow.java +++ b/src/main/java/com/google/devtools/build/lib/profiler/chart/ChartRow.java @@ -14,8 +14,7 @@ package com.google.devtools.build.lib.profiler.chart; -import com.google.devtools.build.lib.util.Preconditions; - +import com.google.common.base.Preconditions; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/google/devtools/build/lib/profiler/output/TextPrinter.java b/src/main/java/com/google/devtools/build/lib/profiler/output/TextPrinter.java index add56d4012..ecb4cc7219 100644 --- a/src/main/java/com/google/devtools/build/lib/profiler/output/TextPrinter.java +++ b/src/main/java/com/google/devtools/build/lib/profiler/output/TextPrinter.java @@ -13,8 +13,7 @@ // limitations under the License. package com.google.devtools.build.lib.profiler.output; -import com.google.devtools.build.lib.util.Preconditions; - +import com.google.common.base.Preconditions; import java.io.PrintStream; /** diff --git a/src/main/java/com/google/devtools/build/lib/profiler/statistics/PhaseStatistics.java b/src/main/java/com/google/devtools/build/lib/profiler/statistics/PhaseStatistics.java index 0e998ec178..7b40b2de30 100644 --- a/src/main/java/com/google/devtools/build/lib/profiler/statistics/PhaseStatistics.java +++ b/src/main/java/com/google/devtools/build/lib/profiler/statistics/PhaseStatistics.java @@ -13,13 +13,13 @@ // limitations under the License. package com.google.devtools.build.lib.profiler.statistics; +import com.google.common.base.Preconditions; import com.google.common.collect.Iterators; import com.google.devtools.build.lib.profiler.ProfilePhase; import com.google.devtools.build.lib.profiler.ProfilerTask; import com.google.devtools.build.lib.profiler.analysis.ProfileInfo; import com.google.devtools.build.lib.profiler.analysis.ProfileInfo.AggregateAttr; import com.google.devtools.build.lib.profiler.analysis.ProfileInfo.Task; -import com.google.devtools.build.lib.util.Preconditions; import java.util.EnumMap; import java.util.Iterator; import java.util.List; |