You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lc...@apache.org on 2016/03/02 17:43:30 UTC
[1/3] incubator-beam git commit: Remove JsonIgnore attribute
Repository: incubator-beam
Updated Branches:
refs/heads/master c9e552531 -> f87f35b70
Remove JsonIgnore attribute
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/fa429b44
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/fa429b44
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/fa429b44
Branch: refs/heads/master
Commit: fa429b44a8d2de1fcc7894a188f25d8550ba831b
Parents: 1f31d4d
Author: Scott Wegner <sw...@outlook.com>
Authored: Tue Mar 1 11:38:09 2016 -0800
Committer: Luke Cwik <lc...@google.com>
Committed: Wed Mar 2 08:41:32 2016 -0800
----------------------------------------------------------------------
.../cloud/dataflow/sdk/options/DataflowPipelineDebugOptions.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/fa429b44/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineDebugOptions.java
----------------------------------------------------------------------
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineDebugOptions.java b/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineDebugOptions.java
index 3ceec89..a14be44 100644
--- a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineDebugOptions.java
+++ b/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineDebugOptions.java
@@ -175,7 +175,6 @@ public interface DataflowPipelineDebugOptions extends PipelineOptions {
*
* @deprecated This property is replaced by @{link DataflowPipelineOptions#getUpdate()}
*/
- @JsonIgnore
@Deprecated
@Description("If set, replace the existing pipeline with the name specified by --jobName with "
+ "this pipeline, preserving state.")
[2/3] incubator-beam git commit: Move 'update' pipeline option to
correct interface
Posted by lc...@apache.org.
Move 'update' pipeline option to correct interface
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/1f31d4d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/1f31d4d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/1f31d4d5
Branch: refs/heads/master
Commit: 1f31d4d5980619916a39c70a0af046fc4235b71e
Parents: c9e5525
Author: Scott Wegner <sw...@google.com>
Authored: Mon Feb 29 15:24:49 2016 -0800
Committer: Luke Cwik <lc...@google.com>
Committed: Wed Mar 2 08:41:32 2016 -0800
----------------------------------------------------------------------
.../sdk/options/DataflowPipelineDebugOptions.java | 4 ++++
.../dataflow/sdk/options/DataflowPipelineOptions.java | 13 +++++++++++++
2 files changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/1f31d4d5/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineDebugOptions.java
----------------------------------------------------------------------
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineDebugOptions.java b/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineDebugOptions.java
index e94b56d..3ceec89 100644
--- a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineDebugOptions.java
+++ b/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineDebugOptions.java
@@ -172,11 +172,15 @@ public interface DataflowPipelineDebugOptions extends PipelineOptions {
/**
* Whether to update the currently running pipeline with the same name as this one.
+ *
+ * @deprecated This property is replaced by @{link DataflowPipelineOptions#getUpdate()}
*/
@JsonIgnore
+ @Deprecated
@Description("If set, replace the existing pipeline with the name specified by --jobName with "
+ "this pipeline, preserving state.")
boolean getUpdate();
+ @Deprecated
void setUpdate(boolean value);
/**
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/1f31d4d5/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineOptions.java
----------------------------------------------------------------------
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineOptions.java b/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineOptions.java
index a0f188a..1aa4342 100644
--- a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineOptions.java
+++ b/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineOptions.java
@@ -92,6 +92,19 @@ public interface DataflowPipelineOptions extends
void setJobName(String value);
/**
+ * Whether to update the currently running pipeline with the same name as this one.
+ */
+ @Override
+ @SuppressWarnings("deprecation") // base class member deprecated in favor of this one.
+ @Description(
+ "If set, replace the existing pipeline with the name specified by --jobName with "
+ + "this pipeline, preserving state.")
+ boolean getUpdate();
+ @Override
+ @SuppressWarnings("deprecation") // base class member deprecated in favor of this one.
+ void setUpdate(boolean value);
+
+ /**
* Returns a normalized job name constructed from {@link ApplicationNameOptions#getAppName()}, the
* local system user name (if available), and the current time. The normalization makes sure that
* the job name matches the required pattern of [a-z]([-a-z0-9]*[a-z0-9])? and length limit of 40
[3/3] incubator-beam git commit: This closes #5
Posted by lc...@apache.org.
This closes #5
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/f87f35b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/f87f35b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/f87f35b7
Branch: refs/heads/master
Commit: f87f35b7022b36b8db04c4284df3f4b94dad7700
Parents: c9e5525 fa429b4
Author: Luke Cwik <lc...@google.com>
Authored: Wed Mar 2 08:42:55 2016 -0800
Committer: Luke Cwik <lc...@google.com>
Committed: Wed Mar 2 08:42:55 2016 -0800
----------------------------------------------------------------------
.../sdk/options/DataflowPipelineDebugOptions.java | 5 ++++-
.../dataflow/sdk/options/DataflowPipelineOptions.java | 13 +++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------