From e547147d24092abe92067a1ba4f174555f1464c3 Mon Sep 17 00:00:00 2001
From: Dan Halperin <dhalperi@google.com>
Date: Mon, 2 May 2016 15:40:42 -0700
Subject: [PATCH] DataflowJavaSDK: blacklist Throwables.propagate

This is a partial backport of https://github.com/apache/incubator-beam/pull/270
---
 checkstyle.xml                                             | 7 +++++++
 .../inprocess/ImmutabilityCheckingBundleFactory.java       | 3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/checkstyle.xml b/checkstyle.xml
index 4a2e15009d..d5e8317391 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -76,6 +76,13 @@ page at http://checkstyle.sourceforge.net/config.html -->
     <property name="severity" value="error"/>
   </module>
 
+  <module name="RegexpSingleline">
+    <!-- Checks that Throwables.propagate is not used.  -->
+    <property name="format" value="Throwables.propagate\(" />
+    <property name="message" value='Throwables.propagate is deprecated.' />
+    <property name="severity" value="error"/>
+  </module>
+
   <!-- Allow use of comment to suppress javadocstyle -->
   <module name="SuppressionCommentFilter">
     <property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ImmutabilityCheckingBundleFactory.java b/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ImmutabilityCheckingBundleFactory.java
index 908636a2c2..67535f8bed 100644
--- a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ImmutabilityCheckingBundleFactory.java
+++ b/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/ImmutabilityCheckingBundleFactory.java
@@ -17,7 +17,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.google.api.client.util.Throwables;
 import com.google.cloud.dataflow.sdk.coders.Coder;
 import com.google.cloud.dataflow.sdk.coders.CoderException;
 import com.google.cloud.dataflow.sdk.runners.inprocess.InProcessPipelineRunner.CommittedBundle;
@@ -98,7 +97,7 @@ public UncommittedBundle<T> add(WindowedValue<T> element) {
         mutationDetectors.put(
             element, MutationDetectors.forValueWithCoder(element.getValue(), coder));
       } catch (CoderException e) {
-        throw Throwables.propagate(e);
+        throw new RuntimeException(e);
       }
       underlying.add(element);
       return this;