From 8d6d59e1e79696fa036297a8fad92dd6fd66db5e Mon Sep 17 00:00:00 2001
From: Dan Halperin <dhalperi@google.com>
Date: Tue, 26 Apr 2016 15:49:46 -0700
Subject: [PATCH 1/2] checkstyle.xml: blacklist repackaged code from Google API
 Client

---
 sdks/java/checkstyle.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sdks/java/checkstyle.xml b/sdks/java/checkstyle.xml
index 253b822d62a6..a4aab6e3a4b7 100644
--- a/sdks/java/checkstyle.xml
+++ b/sdks/java/checkstyle.xml
@@ -122,6 +122,10 @@ page at http://checkstyle.sourceforge.net/config.html -->
       <property name="severity" value="error"/>
     </module>
 
+    <module name="IllegalImport">
+      <property name="illegalPkgs" value="com.google.api.client.repackaged"/>
+    </module>
+
     <module name="UnusedImports">
       <property name="severity" value="error"/>
       <property name="processJavadoc" value="true"/>

From 2b3b140da0d015d38f556369c199a9fd0565c3b8 Mon Sep 17 00:00:00 2001
From: Dan Halperin <dhalperi@google.com>
Date: Tue, 26 Apr 2016 15:50:04 -0700
Subject: [PATCH 2/2] PubsubClient: fix use of blacklisted Preconditions

---
 .../src/main/java/org/apache/beam/sdk/io/PubsubClient.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/PubsubClient.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/PubsubClient.java
index ce5979b0126b..f92b480de1d8 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/PubsubClient.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/PubsubClient.java
@@ -18,7 +18,7 @@
 
 package org.apache.beam.sdk.io;
 
-import com.google.api.client.repackaged.com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkState;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -88,7 +88,7 @@ public String getPath() {
 
     public String getV1Beta1Path() {
       String[] splits = path.split("/");
-      Preconditions.checkState(splits.length == 4);
+      checkState(splits.length == 4);
       return String.format("/subscriptions/%s/%s", splits[1], splits[3]);
     }
 
@@ -136,7 +136,7 @@ public String getPath() {
 
     public String getV1Beta1Path() {
       String[] splits = path.split("/");
-      Preconditions.checkState(splits.length == 4);
+      checkState(splits.length == 4);
       return String.format("/topics/%s/%s", splits[1], splits[3]);
     }