Repository: incubator-beam Updated Branches: refs/heads/master 336ae2e7e -> 47dd61a55
Remove references to javax.servlet. Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/cdfab9ba Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/cdfab9ba Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/cdfab9ba Branch: refs/heads/master Commit: cdfab9ba95c3d0b32a8a46aa24b4895a9d261904 Parents: 336ae2e Author: Pei He <pe...@google.com> Authored: Fri Jun 17 13:02:58 2016 -0700 Committer: Pei He <pe...@google.com> Committed: Fri Jun 17 13:03:04 2016 -0700 ---------------------------------------------------------------------- examples/java/pom.xml | 6 ------ .../org/apache/beam/examples/common/DataflowExampleUtils.java | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/cdfab9ba/examples/java/pom.xml ---------------------------------------------------------------------- diff --git a/examples/java/pom.xml b/examples/java/pom.xml index 5211b80..9458962 100644 --- a/examples/java/pom.xml +++ b/examples/java/pom.xml @@ -285,12 +285,6 @@ <scope>runtime</scope> </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>3.1.0</version> - </dependency> - <!-- Hamcrest and JUnit are required dependencies of PAssert, which is used in the main code of DebuggingWordCount example. --> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/cdfab9ba/examples/java/src/main/java/org/apache/beam/examples/common/DataflowExampleUtils.java ---------------------------------------------------------------------- diff --git a/examples/java/src/main/java/org/apache/beam/examples/common/DataflowExampleUtils.java b/examples/java/src/main/java/org/apache/beam/examples/common/DataflowExampleUtils.java index a0b7319..5b1af6d 100644 --- a/examples/java/src/main/java/org/apache/beam/examples/common/DataflowExampleUtils.java +++ b/examples/java/src/main/java/org/apache/beam/examples/common/DataflowExampleUtils.java @@ -62,8 +62,6 @@ import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; -import javax.servlet.http.HttpServletResponse; - /** * The utility class that sets up and tears down external resources, starts the Google Cloud Pub/Sub * injector, and cancels the streaming and the injector pipelines once the program terminates. @@ -72,6 +70,8 @@ import javax.servlet.http.HttpServletResponse; */ public class DataflowExampleUtils { + private static final int SC_NOT_FOUND = 404; + private final DataflowPipelineOptions options; private Bigquery bigQueryClient = null; private Pubsub pubsubClient = null; @@ -481,7 +481,7 @@ public class DataflowExampleUtils { try { return request.execute(); } catch (GoogleJsonResponseException e) { - if (e.getStatusCode() == HttpServletResponse.SC_NOT_FOUND) { + if (e.getStatusCode() == SC_NOT_FOUND) { return null; } else { throw e;
