[BEAM-151] Clean up reference to DataflowWorkerHarnessOptions This prevents moving DataflowWorkerHarnessOptions to Dataflow Runner maven module.
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/02ee7457 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/02ee7457 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/02ee7457 Branch: refs/heads/master Commit: 02ee74579171a8e47909b23425dcd906f22786cd Parents: 5d78420 Author: Luke Cwik <lc...@google.com> Authored: Fri Mar 25 15:28:43 2016 -0700 Committer: Luke Cwik <lc...@google.com> Committed: Fri Apr 8 14:27:36 2016 -0700 ---------------------------------------------------------------------- .../sdk/options/PipelineOptionsFactory.java | 48 -------------------- .../sdk/options/PipelineOptionsFactoryTest.java | 17 ------- 2 files changed, 65 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/02ee7457/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsFactory.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsFactory.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsFactory.java index 988d346..dac7726 100644 --- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsFactory.java +++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsFactory.java @@ -831,54 +831,6 @@ public class PipelineOptionsFactory { } /** - * Creates a set of Dataflow worker harness options based of a set of known system - * properties. This is meant to only be used from the Dataflow worker harness as a method to - * bootstrap the worker harness. - * - * <p>For internal use only. - * - * @return A {@link DataflowWorkerHarnessOptions} object configured for the - * Dataflow worker harness. - */ - public static DataflowWorkerHarnessOptions createFromSystemPropertiesInternal() - throws IOException { - return createFromSystemProperties(); - } - - /** - * Creates a set of {@link DataflowWorkerHarnessOptions} based of a set of known system - * properties. This is meant to only be used from the Dataflow worker harness as a method to - * bootstrap the worker harness. - * - * @return A {@link DataflowWorkerHarnessOptions} object configured for the - * Dataflow worker harness. - * @deprecated for internal use only - */ - @Deprecated - public static DataflowWorkerHarnessOptions createFromSystemProperties() throws IOException { - ObjectMapper objectMapper = new ObjectMapper(); - DataflowWorkerHarnessOptions options; - if (System.getProperties().containsKey("sdk_pipeline_options")) { - String serializedOptions = System.getProperty("sdk_pipeline_options"); - LOG.info("Worker harness starting with: " + serializedOptions); - options = objectMapper.readValue(serializedOptions, PipelineOptions.class) - .as(DataflowWorkerHarnessOptions.class); - } else { - options = PipelineOptionsFactory.as(DataflowWorkerHarnessOptions.class); - } - - // These values will not be known at job submission time and must be provided. - if (System.getProperties().containsKey("worker_id")) { - options.setWorkerId(System.getProperty("worker_id")); - } - if (System.getProperties().containsKey("job_id")) { - options.setJobId(System.getProperty("job_id")); - } - - return options; - } - - /** * This method is meant to emulate the behavior of {@link Introspector#getBeanInfo(Class, int)} * to construct the list of {@link PropertyDescriptor}. * http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/02ee7457/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsFactoryTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsFactoryTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsFactoryTest.java index d8ba8e3..6ba1e00 100644 --- a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsFactoryTest.java +++ b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/options/PipelineOptionsFactoryTest.java @@ -78,23 +78,6 @@ public class PipelineOptionsFactoryTest { } @Test - public void testCreationFromSystemProperties() throws Exception { - System.getProperties().putAll(ImmutableMap - .<String, String>builder() - .put("worker_id", "test_worker_id") - .put("job_id", "test_job_id") - // Set a non-default value for testing - .put("sdk_pipeline_options", "{\"options\":{\"numWorkers\":999}}") - .build()); - - @SuppressWarnings("deprecation") // testing deprecated functionality - DataflowWorkerHarnessOptions options = PipelineOptionsFactory.createFromSystemProperties(); - assertEquals("test_worker_id", options.getWorkerId()); - assertEquals("test_job_id", options.getJobId()); - assertEquals(999, options.getNumWorkers()); - } - - @Test public void testAppNameIsSet() { ApplicationNameOptions options = PipelineOptionsFactory.as(ApplicationNameOptions.class); assertEquals(PipelineOptionsFactoryTest.class.getSimpleName(), options.getAppName());
