You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by da...@apache.org on 2016/06/20 22:16:28 UTC
[35/50] [abbrv] incubator-beam git commit: Remove references to
javax.servlet.
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/09bf9b37
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/09bf9b37
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/09bf9b37
Branch: refs/heads/python-sdk
Commit: 09bf9b3720f08acc9e94784461f2482ab371cd90
Parents: 6a41da8
Author: Pei He <pe...@google.com>
Authored: Fri Jun 17 13:02:58 2016 -0700
Committer: Davor Bonaci <da...@google.com>
Committed: Mon Jun 20 15:14:30 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/09bf9b37/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/09bf9b37/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;