diff options
Diffstat (limited to 'src/main/java')
10 files changed, 20 insertions, 30 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/BuildResult.java b/src/main/java/com/google/devtools/build/lib/buildtool/BuildResult.java index 22c36f831d..ed165e00c1 100644 --- a/src/main/java/com/google/devtools/build/lib/buildtool/BuildResult.java +++ b/src/main/java/com/google/devtools/build/lib/buildtool/BuildResult.java @@ -14,7 +14,7 @@ package com.google.devtools.build.lib.buildtool; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.util.ExitCode; @@ -179,10 +179,8 @@ public final class BuildResult { /** For debugging. */ @Override - @SuppressWarnings("deprecation") public String toString() { - // We need to be compatible with Guava, so we use this, even though it is deprecated. - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("startTimeMillis", startTimeMillis) .add("stopTimeMillis", stopTimeMillis) .add("crash", crash) diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionValue.java index 714325adcd..e2c6e1595f 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionValue.java @@ -14,7 +14,7 @@ package com.google.devtools.build.lib.skyframe; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.actions.Action; @@ -109,7 +109,7 @@ public class ActionExecutionValue implements SkyValue { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("artifactData", artifactData) .add("additionalOutputData", additionalOutputData) .toString(); diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionValue.java index 8958e1bd42..3633899471 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionValue.java @@ -38,10 +38,9 @@ public class BuildInfoCollectionValue extends ActionLookupValue { return collection; } - @SuppressWarnings("deprecation") @Override public String toString() { - return com.google.common.base.Objects.toStringHelper(getClass()) + return com.google.common.base.MoreObjects.toStringHelper(getClass()) .add("collection", collection) .add("generatingActionMap", generatingActionMap).toString(); } diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/FileArtifactValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/FileArtifactValue.java index 1fcd4912e9..1876397978 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/FileArtifactValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/FileArtifactValue.java @@ -14,7 +14,7 @@ package com.google.devtools.build.lib.skyframe; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.cache.DigestUtils; @@ -171,7 +171,7 @@ public class FileArtifactValue extends ArtifactValue { @Override public String toString() { - return Objects.toStringHelper(FileArtifactValue.class) + return MoreObjects.toStringHelper(FileArtifactValue.class) .add("digest", digest) .add("mtime", mtime) .add("size", size).toString(); diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/MutableSupplier.java b/src/main/java/com/google/devtools/build/lib/skyframe/MutableSupplier.java index 86de11d7ca..4897b244b6 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/MutableSupplier.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/MutableSupplier.java @@ -13,7 +13,7 @@ // limitations under the License. package com.google.devtools.build.lib.skyframe; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Supplier; /** @@ -37,10 +37,9 @@ public class MutableSupplier<T> implements Supplier<T> { val = newVal; } - @SuppressWarnings("deprecation") // MoreObjects.toStringHelper() is not in Guava @Override public String toString() { - return Objects.toStringHelper(getClass()) + return MoreObjects.toStringHelper(getClass()) .add("val", val).toString(); } } diff --git a/src/main/java/com/google/devtools/build/lib/util/GroupedList.java b/src/main/java/com/google/devtools/build/lib/util/GroupedList.java index cac6a7a51d..61941b2ba6 100644 --- a/src/main/java/com/google/devtools/build/lib/util/GroupedList.java +++ b/src/main/java/com/google/devtools/build/lib/util/GroupedList.java @@ -13,7 +13,7 @@ // limitations under the License. package com.google.devtools.build.lib.util; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -144,9 +144,8 @@ public class GroupedList<T> implements Iterable<Iterable<T>> { } @Override - @SuppressWarnings("deprecation") public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("elements", elements) .add("size", size).toString(); @@ -325,9 +324,8 @@ public class GroupedList<T> implements Iterable<Iterable<T>> { } @Override - @SuppressWarnings("deprecation") public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("groupedList", groupedList) .add("elements", elements) .add("currentGroup", currentGroup).toString(); diff --git a/src/main/java/com/google/devtools/build/skyframe/BuildingState.java b/src/main/java/com/google/devtools/build/skyframe/BuildingState.java index 01cbf8fc5f..a1acb5ccb9 100644 --- a/src/main/java/com/google/devtools/build/skyframe/BuildingState.java +++ b/src/main/java/com/google/devtools/build/skyframe/BuildingState.java @@ -13,7 +13,7 @@ // limitations under the License. package com.google.devtools.build.skyframe; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -407,9 +407,8 @@ final class BuildingState { } @Override - @SuppressWarnings("deprecation") public String toString() { - return Objects.toStringHelper(this) // MoreObjects is not in Guava + return MoreObjects.toStringHelper(this) .add("evaluating", evaluating) .add("dirtyState", dirtyState) .add("signaledDeps", signaledDeps) diff --git a/src/main/java/com/google/devtools/build/skyframe/EvaluationResult.java b/src/main/java/com/google/devtools/build/skyframe/EvaluationResult.java index 92738b0ac0..aa081a33dc 100644 --- a/src/main/java/com/google/devtools/build/skyframe/EvaluationResult.java +++ b/src/main/java/com/google/devtools/build/skyframe/EvaluationResult.java @@ -13,7 +13,7 @@ // limitations under the License. package com.google.devtools.build.skyframe; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; @@ -127,9 +127,8 @@ public class EvaluationResult<T extends SkyValue> { } @Override - @SuppressWarnings("deprecation") public String toString() { - return Objects.toStringHelper(this) // MoreObjects is not in Guava + return MoreObjects.toStringHelper(this) .add("hasError", hasError) .add("errorMap", errorMap) .add("resultMap", resultMap) diff --git a/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java b/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java index ed28f4e867..16dbe243f2 100644 --- a/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java +++ b/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java @@ -14,7 +14,7 @@ package com.google.devtools.build.skyframe; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -408,9 +408,8 @@ public class InMemoryNodeEntry implements NodeEntry { } @Override - @SuppressWarnings("deprecation") public String toString() { - return Objects.toStringHelper(this) // MoreObjects is not in Guava + return MoreObjects.toStringHelper(this) .add("value", value) .add("version", version) .add("directDeps", directDeps == null ? null : GroupedList.create(directDeps)) diff --git a/src/main/java/com/google/devtools/build/skyframe/ReverseDepsUtil.java b/src/main/java/com/google/devtools/build/skyframe/ReverseDepsUtil.java index 13d8c4b276..b5b295b18e 100644 --- a/src/main/java/com/google/devtools/build/skyframe/ReverseDepsUtil.java +++ b/src/main/java/com/google/devtools/build/skyframe/ReverseDepsUtil.java @@ -13,7 +13,7 @@ // limitations under the License. package com.google.devtools.build.skyframe; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -190,9 +190,8 @@ abstract class ReverseDepsUtil<T> { setReverseDepsToRemove(container, null); } - @SuppressWarnings("deprecation") String toString(T container) { - return Objects.toStringHelper("ReverseDeps") // MoreObjects is not in Guava + return MoreObjects.toStringHelper("ReverseDeps") .add("reverseDeps", getReverseDepsObject(container)) .add("singleReverseDep", isSingleReverseDep(container)) .add("reverseDepsToRemove", getReverseDepsToRemove(container)) |