You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by dh...@apache.org on 2016/08/25 23:11:27 UTC
[1/2] incubator-beam git commit: Closes #872
Repository: incubator-beam
Updated Branches:
refs/heads/master 9c9f4c9c9 -> bfd810f41
Closes #872
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/bfd810f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/bfd810f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/bfd810f4
Branch: refs/heads/master
Commit: bfd810f410140a2fc5e6099755e58ae444a4e023
Parents: 9c9f4c9 89cf461
Author: Dan Halperin <dh...@google.com>
Authored: Thu Aug 25 16:11:21 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Thu Aug 25 16:11:21 2016 -0700
----------------------------------------------------------------------
runners/spark/pom.xml | 4 ----
.../streaming/StreamingTransformTranslator.java | 6 +++---
.../build-tools/src/main/resources/beam/checkstyle.xml | 10 +++++++++-
.../apache/beam/sdk/io/gcp/bigquery/BigQueryIOTest.java | 2 +-
sdks/java/io/hdfs/pom.xml | 5 -----
.../java/org/apache/beam/sdk/io/hdfs/HDFSFileSink.java | 2 +-
6 files changed, 14 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
[2/2] incubator-beam git commit: checkstyle: prohibit API client
repackaged Guava
Posted by dh...@apache.org.
checkstyle: prohibit API client repackaged Guava
Apparently the IllegalImport check only blocks packages,
so we had to move to Regexp to get individual classes.
As a bonus, this enforcement let us remove two bogus dependencies.
Smaller JARs for the win!
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/89cf4613
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/89cf4613
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/89cf4613
Branch: refs/heads/master
Commit: 89cf4613465647e2711983674879afd5f67c519d
Parents: 9c9f4c9
Author: Dan Halperin <dh...@google.com>
Authored: Tue Aug 23 18:54:23 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Thu Aug 25 16:11:21 2016 -0700
----------------------------------------------------------------------
runners/spark/pom.xml | 4 ----
.../streaming/StreamingTransformTranslator.java | 6 +++---
.../build-tools/src/main/resources/beam/checkstyle.xml | 10 +++++++++-
.../apache/beam/sdk/io/gcp/bigquery/BigQueryIOTest.java | 2 +-
sdks/java/io/hdfs/pom.xml | 5 -----
.../java/org/apache/beam/sdk/io/hdfs/HDFSFileSink.java | 2 +-
6 files changed, 14 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/89cf4613/runners/spark/pom.xml
----------------------------------------------------------------------
diff --git a/runners/spark/pom.xml b/runners/spark/pom.xml
index a6311b5..a5e99a0 100644
--- a/runners/spark/pom.xml
+++ b/runners/spark/pom.xml
@@ -155,10 +155,6 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>com.google.http-client</groupId>
- <artifactId>google-http-client</artifactId>
- </dependency>
- <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/89cf4613/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/streaming/StreamingTransformTranslator.java
----------------------------------------------------------------------
diff --git a/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/streaming/StreamingTransformTranslator.java b/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/streaming/StreamingTransformTranslator.java
index 43160f5..5f35ebb 100644
--- a/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/streaming/StreamingTransformTranslator.java
+++ b/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/streaming/StreamingTransformTranslator.java
@@ -17,9 +17,9 @@
*/
package org.apache.beam.runners.spark.translation.streaming;
-import com.google.api.client.util.Lists;
-import com.google.api.client.util.Maps;
-import com.google.api.client.util.Sets;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
import com.google.common.reflect.TypeToken;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/89cf4613/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 47ddc5b..c7d9b2c 100644
--- a/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml
+++ b/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml
@@ -100,7 +100,15 @@ page at http://checkstyle.sourceforge.net/config.html -->
</module>
<module name="IllegalImport">
- <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, io.netty.util.internal"/>
+ <property name="illegalPkgs" value="com.google.api.client.repackaged, io.netty.util.internal"/>
+ </module>
+
+ <!--
+ IllegalImport cannot blacklist classes, and c.g.api.client.util is used for some shaded
+ code and some useful code. So we need to fall back to Regexp.
+ -->
+ <module name="RegexpSinglelineJava">
+ <property name="format" value="com\.google\.api\.client\.util\.(ByteStreams|Charsets|Collections2|Joiner|Lists|Maps|Objects|Preconditions|Sets|Strings|Throwables)"/>
</module>
<module name="UnusedImports">
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/89cf4613/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOTest.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOTest.java
index a6d7e2f..7a7575b 100644
--- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOTest.java
+++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOTest.java
@@ -33,7 +33,6 @@ import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.when;
import com.google.api.client.util.Data;
-import com.google.api.client.util.Strings;
import com.google.api.services.bigquery.model.ErrorProto;
import com.google.api.services.bigquery.model.Job;
import com.google.api.services.bigquery.model.JobConfigurationExtract;
@@ -50,6 +49,7 @@ import com.google.api.services.bigquery.model.TableFieldSchema;
import com.google.api.services.bigquery.model.TableReference;
import com.google.api.services.bigquery.model.TableRow;
import com.google.api.services.bigquery.model.TableSchema;
+import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/89cf4613/sdks/java/io/hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/io/hdfs/pom.xml b/sdks/java/io/hdfs/pom.xml
index 07b9eb6..0ec542c 100644
--- a/sdks/java/io/hdfs/pom.xml
+++ b/sdks/java/io/hdfs/pom.xml
@@ -82,11 +82,6 @@
</dependency>
<dependency>
- <groupId>com.google.http-client</groupId>
- <artifactId>google-http-client</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/89cf4613/sdks/java/io/hdfs/src/main/java/org/apache/beam/sdk/io/hdfs/HDFSFileSink.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/hdfs/src/main/java/org/apache/beam/sdk/io/hdfs/HDFSFileSink.java b/sdks/java/io/hdfs/src/main/java/org/apache/beam/sdk/io/hdfs/HDFSFileSink.java
index 0b538b3..6d30307 100644
--- a/sdks/java/io/hdfs/src/main/java/org/apache/beam/sdk/io/hdfs/HDFSFileSink.java
+++ b/sdks/java/io/hdfs/src/main/java/org/apache/beam/sdk/io/hdfs/HDFSFileSink.java
@@ -19,8 +19,8 @@ package org.apache.beam.sdk.io.hdfs;
import static com.google.common.base.Preconditions.checkState;
-import com.google.api.client.util.Maps;
import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import java.io.IOException;
import java.util.Map;