From af3ccef467413cacdc9704fed79d3375f728590c Mon Sep 17 00:00:00 2001 From: Thomas Groh Date: Fri, 15 Apr 2016 10:06:21 -0700 Subject: [PATCH] Clean up DataflowPipeline[Debug]Options getUpdate should be isUpdate, to meet standard JavaBeans style. Remove deprecated update property from DataflowPipelineDebugOptions --- .../sdk/options/DataflowPipelineDebugOptions.java | 12 ------------ .../beam/sdk/options/DataflowPipelineOptions.java | 6 +----- .../beam/sdk/runners/DataflowPipelineRunner.java | 4 ++-- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/sdk/options/DataflowPipelineDebugOptions.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/sdk/options/DataflowPipelineDebugOptions.java index 7e0ef481588b..553f667ddf3e 100644 --- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/sdk/options/DataflowPipelineDebugOptions.java +++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/sdk/options/DataflowPipelineDebugOptions.java @@ -165,18 +165,6 @@ public Dataflow create(PipelineOptions options) { } } - /** - * Whether to update the currently running pipeline with the same name as this one. - * - * @deprecated This property is replaced by {@link DataflowPipelineOptions#getUpdate()} - */ - @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); - /** * Mapping of old PTranform names to new ones, specified as JSON * {"oldName":"newName",...}. To mark a transform as deleted, make newName the diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/sdk/options/DataflowPipelineOptions.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/sdk/options/DataflowPipelineOptions.java index 50fc956d10a8..02210fe16200 100644 --- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/sdk/options/DataflowPipelineOptions.java +++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/sdk/options/DataflowPipelineOptions.java @@ -76,14 +76,10 @@ public interface DataflowPipelineOptions /** * 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. + boolean isUpdate(); void setUpdate(boolean value); /** diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/sdk/runners/DataflowPipelineRunner.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/sdk/runners/DataflowPipelineRunner.java index 18e2cc9ea0de..84bcee90e612 100644 --- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/sdk/runners/DataflowPipelineRunner.java +++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/sdk/runners/DataflowPipelineRunner.java @@ -560,7 +560,7 @@ public DataflowPipelineJob run(Pipeline pipeline) { } String jobIdToUpdate = null; - if (options.getUpdate()) { + if (options.isUpdate()) { jobIdToUpdate = getJobIdFromName(options.getJobName()); newJob.setTransformNameMapping(options.getTransformNameMapping()); newJob.setReplaceJobId(jobIdToUpdate); @@ -612,7 +612,7 @@ public DataflowPipelineJob run(Pipeline pipeline) { if (jobResult.getClientRequestId() != null && !jobResult.getClientRequestId().isEmpty() && !jobResult.getClientRequestId().equals(requestId)) { // If updating a job. - if (options.getUpdate()) { + if (options.isUpdate()) { throw new DataflowJobAlreadyUpdatedException(dataflowPipelineJob, String.format("The job named %s with id: %s has already been updated into job id: %s " + "and cannot be updated again.",