checkstyle.xml: blacklist more bad imports from api client package And fixup existing use
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/0a0bb90b Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/0a0bb90b Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/0a0bb90b Branch: refs/heads/master Commit: 0a0bb90b5703c326d46d1c2071e5d10da96c28b3 Parents: ee198d4 Author: Dan Halperin <[email protected]> Authored: Fri May 13 18:20:27 2016 -0700 Committer: Dan Halperin <[email protected]> Committed: Mon May 16 11:07:07 2016 -0700 ---------------------------------------------------------------------- .../org/apache/beam/runners/dataflow/util/OutputReference.java | 2 +- sdks/java/build-tools/src/main/resources/beam/checkstyle.xml | 2 +- .../core/src/main/java/org/apache/beam/sdk/util/CloudObject.java | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/0a0bb90b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/OutputReference.java ---------------------------------------------------------------------- diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/OutputReference.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/OutputReference.java index 1b525ac..b0b7811 100644 --- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/OutputReference.java +++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/OutputReference.java @@ -17,7 +17,7 @@ */ package org.apache.beam.runners.dataflow.util; -import static com.google.api.client.util.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkNotNull; import com.google.api.client.json.GenericJson; import com.google.api.client.util.Key; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/0a0bb90b/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml ---------------------------------------------------------------------- diff --git a/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml b/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml index 2a4f832..b739243 100644 --- a/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml +++ b/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml @@ -110,7 +110,7 @@ page at http://checkstyle.sourceforge.net/config.html --> </module> <module name="IllegalImport"> - <property name="illegalPkgs" value="com.google.api.client.repackaged"/> + <property name="illegalPkgs" value="com.google.api.client.repackaged, com.google.api.client.util.util.ByteStreams, com.google.api.client.util.Charsets, com.google.api.client.util.Collections2, com.google.api.client.util.Joiner, com.google.api.client.util.Lists, com.google.api.client.util.Maps, com.google.api.client.util.Objects, com.google.api.client.util.Preconditions, com.google.api.client.util.Sets, com.google.api.client.util.Strings, com.google.api.client.util.Throwables"/> </module> <module name="UnusedImports"> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/0a0bb90b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/CloudObject.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/CloudObject.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/CloudObject.java index 8d3ec0b..2772225 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/CloudObject.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/CloudObject.java @@ -17,7 +17,8 @@ */ package org.apache.beam.sdk.util; -import static com.google.api.client.util.Preconditions.checkNotNull; + +import static com.google.common.base.Preconditions.checkNotNull; import com.google.api.client.json.GenericJson; import com.google.api.client.util.Key;
