Repository: beam Updated Branches: refs/heads/master a93e218ba -> f1ea8f951
Use varargs for PipelineOptionsFactory.fromArgs This simplifies usage of PipelineOptionsFactory within tests. Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/079657c7 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/079657c7 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/079657c7 Branch: refs/heads/master Commit: 079657c7a9a65a039148bb9813b4ccb500b34479 Parents: a93e218 Author: Luke Cwik <[email protected]> Authored: Thu Jan 12 11:24:47 2017 -0800 Committer: Luke Cwik <[email protected]> Committed: Thu Jan 12 11:24:47 2017 -0800 ---------------------------------------------------------------------- .../options/DataflowPipelineDebugOptionsTest.java | 2 +- .../dataflow/options/DataflowProfilingOptionsTest.java | 4 ++-- .../apache/beam/sdk/options/PipelineOptionsFactory.java | 10 +++++----- .../beam/sdk/options/PipelineOptionsFactoryTest.java | 6 +++--- .../apache/beam/sdk/options/PipelineOptionsTest.java | 3 +-- .../org/apache/beam/sdk/options/ValueProviderTest.java | 12 ++++-------- .../apache/beam/sdk/options/ValueProviderUtilsTest.java | 2 +- .../java/org/apache/beam/sdk/io/kafka/KafkaIOTest.java | 9 +++++---- 8 files changed, 22 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/079657c7/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/options/DataflowPipelineDebugOptionsTest.java ---------------------------------------------------------------------- diff --git a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/options/DataflowPipelineDebugOptionsTest.java b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/options/DataflowPipelineDebugOptionsTest.java index d376acf..1201668 100644 --- a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/options/DataflowPipelineDebugOptionsTest.java +++ b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/options/DataflowPipelineDebugOptionsTest.java @@ -32,7 +32,7 @@ public class DataflowPipelineDebugOptionsTest { @Test public void testTransformNameMapping() throws Exception { DataflowPipelineDebugOptions options = PipelineOptionsFactory - .fromArgs(new String[]{"--transformNameMapping={\"a\":\"b\",\"foo\":\"\",\"bar\":\"baz\"}"}) + .fromArgs("--transformNameMapping={\"a\":\"b\",\"foo\":\"\",\"bar\":\"baz\"}") .as(DataflowPipelineDebugOptions.class); assertEquals(3, options.getTransformNameMapping().size()); assertThat(options.getTransformNameMapping(), hasEntry("a", "b")); http://git-wip-us.apache.org/repos/asf/beam/blob/079657c7/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/options/DataflowProfilingOptionsTest.java ---------------------------------------------------------------------- diff --git a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/options/DataflowProfilingOptionsTest.java b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/options/DataflowProfilingOptionsTest.java index 299f3c8..4018cbb 100644 --- a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/options/DataflowProfilingOptionsTest.java +++ b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/options/DataflowProfilingOptionsTest.java @@ -37,8 +37,8 @@ public class DataflowProfilingOptionsTest { @Test public void testOptionsObject() throws Exception { - DataflowPipelineOptions options = PipelineOptionsFactory.fromArgs(new String[] { - "--saveProfilesToGcs=path", "--profilingAgentConfiguration={\"interval\": 21}"}) + DataflowPipelineOptions options = PipelineOptionsFactory.fromArgs( + "--saveProfilesToGcs=path", "--profilingAgentConfiguration={\"interval\": 21}") .as(DataflowPipelineOptions.class); assertThat(options.getSaveProfilesToGcs(), equalTo("path")); http://git-wip-us.apache.org/repos/asf/beam/blob/079657c7/sdks/java/core/src/main/java/org/apache/beam/sdk/options/PipelineOptionsFactory.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/options/PipelineOptionsFactory.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/options/PipelineOptionsFactory.java index 42e1092..1ecd577 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/options/PipelineOptionsFactory.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/options/PipelineOptionsFactory.java @@ -164,7 +164,7 @@ public class PipelineOptionsFactory { * specifically requested PipelineOptions by invoking * {@link PipelineOptionsFactory#printHelp(PrintStream, Class)}. */ - public static Builder fromArgs(String[] args) { + public static Builder fromArgs(String... args) { return new Builder().fromArgs(args); } @@ -235,7 +235,7 @@ public class PipelineOptionsFactory { * specifically requested PipelineOptions by invoking * {@link PipelineOptionsFactory#printHelp(PrintStream, Class)}. */ - public Builder fromArgs(String[] args) { + public Builder fromArgs(String... args) { checkNotNull(args, "Arguments should not be null."); return new Builder(args, validation, strictParsing); } @@ -608,7 +608,7 @@ public class PipelineOptionsFactory { List<PropertyDescriptor> propertyDescriptors = validateClass(iface, validatedPipelineOptionsInterfaces, allProxyClass); COMBINED_CACHE.put(combinedPipelineOptionsInterfaces, - new Registration<T>(allProxyClass, propertyDescriptors)); + new Registration<>(allProxyClass, propertyDescriptors)); } catch (IntrospectionException e) { throw new RuntimeException(e); } @@ -623,7 +623,7 @@ public class PipelineOptionsFactory { List<PropertyDescriptor> propertyDescriptors = validateClass(iface, validatedPipelineOptionsInterfaces, proxyClass); INTERFACE_CACHE.put(iface, - new Registration<T>(proxyClass, propertyDescriptors)); + new Registration<>(proxyClass, propertyDescriptors)); } catch (IntrospectionException e) { throw new RuntimeException(e); } @@ -1560,7 +1560,7 @@ public class PipelineOptionsFactory { // Search for close matches for missing properties. // Either off by one or off by two character errors. if (!propertyNamesToGetters.containsKey(entry.getKey())) { - SortedSet<String> closestMatches = new TreeSet<String>( + SortedSet<String> closestMatches = new TreeSet<>( Sets.filter(propertyNamesToGetters.keySet(), new Predicate<String>() { @Override public boolean apply(@Nonnull String input) { http://git-wip-us.apache.org/repos/asf/beam/blob/079657c7/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsFactoryTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsFactoryTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsFactoryTest.java index d73cad4..7d941bf 100644 --- a/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsFactoryTest.java +++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsFactoryTest.java @@ -27,7 +27,6 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import com.fasterxml.jackson.annotation.JsonFormat.Value; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.auto.service.AutoService; @@ -684,7 +683,7 @@ public class PipelineOptionsFactoryTest { @Test public void testAppNameIsNotOverriddenWhenPassedInViaCommandLine() { ApplicationNameOptions options = PipelineOptionsFactory - .fromArgs(new String[]{ "--appName=testAppName" }) + .fromArgs("--appName=testAppName") .as(ApplicationNameOptions.class); assertEquals("testAppName", options.getAppName()); } @@ -692,7 +691,7 @@ public class PipelineOptionsFactoryTest { @Test public void testPropertyIsSetOnRegisteredPipelineOptionNotPartOfOriginalInterface() { PipelineOptions options = PipelineOptionsFactory - .fromArgs(new String[]{ "--project=testProject" }) + .fromArgs("--project=testProject") .create(); assertEquals("testProject", options.as(GcpOptions.class).getProject()); } @@ -1636,6 +1635,7 @@ public class PipelineOptionsFactoryTest { return new RegisteredTestRunner(); } + @Override public PipelineResult run(Pipeline p) { throw new IllegalArgumentException(); } http://git-wip-us.apache.org/repos/asf/beam/blob/079657c7/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsTest.java index f7ff45d..62f53e4 100644 --- a/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsTest.java +++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsTest.java @@ -88,8 +88,7 @@ public class PipelineOptionsTest { @Test public void testOutputRuntimeOptions() { ValueProviderOptions options = - PipelineOptionsFactory.fromArgs( - new String[]{"--string=baz"}).as(ValueProviderOptions.class); + PipelineOptionsFactory.fromArgs("--string=baz").as(ValueProviderOptions.class); Map<String, ?> expected = ImmutableMap.of( "bool", ImmutableMap.of("type", Boolean.class)); assertEquals(expected, options.outputRuntimeOptions()); http://git-wip-us.apache.org/repos/asf/beam/blob/079657c7/sdks/java/core/src/test/java/org/apache/beam/sdk/options/ValueProviderTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/options/ValueProviderTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/options/ValueProviderTest.java index e4492b7..383de53 100644 --- a/sdks/java/core/src/test/java/org/apache/beam/sdk/options/ValueProviderTest.java +++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/options/ValueProviderTest.java @@ -58,8 +58,7 @@ public class ValueProviderTest { @Test public void testCommandLineNoDefault() { - TestOptions options = PipelineOptionsFactory.fromArgs( - new String[]{"--foo=baz"}).as(TestOptions.class); + TestOptions options = PipelineOptionsFactory.fromArgs("--foo=baz").as(TestOptions.class); ValueProvider<String> provider = options.getFoo(); assertEquals("baz", provider.get()); assertTrue(provider.isAccessible()); @@ -67,8 +66,7 @@ public class ValueProviderTest { @Test public void testListValueProvider() { - TestOptions options = PipelineOptionsFactory.fromArgs( - new String[]{"--list=1,2,3"}).as(TestOptions.class); + TestOptions options = PipelineOptionsFactory.fromArgs("--list=1,2,3").as(TestOptions.class); ValueProvider<List<Integer>> provider = options.getList(); assertEquals(ImmutableList.of(1, 2, 3), provider.get()); assertTrue(provider.isAccessible()); @@ -76,8 +74,7 @@ public class ValueProviderTest { @Test public void testCommandLineWithDefault() { - TestOptions options = PipelineOptionsFactory.fromArgs( - new String[]{"--bar=baz"}).as(TestOptions.class); + TestOptions options = PipelineOptionsFactory.fromArgs("--bar=baz").as(TestOptions.class); ValueProvider<String> provider = options.getBar(); assertEquals("baz", provider.get()); assertTrue(provider.isAccessible()); @@ -215,8 +212,7 @@ public class ValueProviderTest { @Test public void testSerializeDeserializeWithArg() throws Exception { - TestOptions submitOptions = PipelineOptionsFactory.fromArgs( - new String[]{"--foo=baz"}).as(TestOptions.class); + TestOptions submitOptions = PipelineOptionsFactory.fromArgs("--foo=baz").as(TestOptions.class); assertEquals("baz", submitOptions.getFoo().get()); assertTrue(submitOptions.getFoo().isAccessible()); ObjectMapper mapper = new ObjectMapper(); http://git-wip-us.apache.org/repos/asf/beam/blob/079657c7/sdks/java/core/src/test/java/org/apache/beam/sdk/options/ValueProviderUtilsTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/options/ValueProviderUtilsTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/options/ValueProviderUtilsTest.java index 0f8ed8e..e09f4ad 100644 --- a/sdks/java/core/src/test/java/org/apache/beam/sdk/options/ValueProviderUtilsTest.java +++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/options/ValueProviderUtilsTest.java @@ -53,7 +53,7 @@ public class ValueProviderUtilsTest { @Test public void testUpdateSerializeExistingValue() throws Exception { TestOptions submitOptions = PipelineOptionsFactory.fromArgs( - new String[]{"--string=baz", "--otherString=quux"}).as(TestOptions.class); + "--string=baz", "--otherString=quux").as(TestOptions.class); ObjectMapper mapper = new ObjectMapper(); String serializedOptions = mapper.writeValueAsString(submitOptions); String updatedOptions = ValueProviderUtils.updateSerializedOptions( http://git-wip-us.apache.org/repos/asf/beam/blob/079657c7/sdks/java/io/kafka/src/test/java/org/apache/beam/sdk/io/kafka/KafkaIOTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/io/kafka/src/test/java/org/apache/beam/sdk/io/kafka/KafkaIOTest.java b/sdks/java/io/kafka/src/test/java/org/apache/beam/sdk/io/kafka/KafkaIOTest.java index 071deea..e18d628 100644 --- a/sdks/java/io/kafka/src/test/java/org/apache/beam/sdk/io/kafka/KafkaIOTest.java +++ b/sdks/java/io/kafka/src/test/java/org/apache/beam/sdk/io/kafka/KafkaIOTest.java @@ -37,7 +37,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; - import javax.annotation.Nullable; import org.apache.beam.sdk.Pipeline.PipelineExecutionException; import org.apache.beam.sdk.coders.BigEndianIntegerCoder; @@ -143,6 +142,7 @@ public class KafkaIOTest { final MockConsumer<byte[], byte[]> consumer = new MockConsumer<byte[], byte[]>(offsetResetStrategy) { // override assign() in order to set offset limits & to save assigned partitions. + @Override public void assign(final List<TopicPartition> assigned) { super.assign(assigned); assignedPartitions.set(ImmutableList.copyOf(assigned)); @@ -200,6 +200,7 @@ public class KafkaIOTest { this.offsetResetStrategy = offsetResetStrategy; } + @Override public Consumer<byte[], byte[]> apply(Map<String, Object> config) { return mkMockConsumer(topics, partitionsPerTopic, numElements, offsetResetStrategy); } @@ -414,7 +415,7 @@ public class KafkaIOTest { UnboundedSource<KafkaRecord<Integer, Long>, KafkaCheckpointMark> source = mkKafkaReadTransform(numElements, new ValueAsTimestampFn()) .makeSource() - .generateInitialSplits(1, PipelineOptionsFactory.fromArgs(new String[0]).create()) + .generateInitialSplits(1, PipelineOptionsFactory.create()) .get(0); UnboundedReader<KafkaRecord<Integer, Long>> reader = source.createReader(null, null); @@ -454,7 +455,7 @@ public class KafkaIOTest { UnboundedSource<KafkaRecord<Integer, Long>, KafkaCheckpointMark> source = mkKafkaReadTransform(initialNumElements, new ValueAsTimestampFn()) .makeSource() - .generateInitialSplits(1, PipelineOptionsFactory.fromArgs(new String[0]).create()) + .generateInitialSplits(1, PipelineOptionsFactory.create()) .get(0); UnboundedReader<KafkaRecord<Integer, Long>> reader = source.createReader(null, null); @@ -483,7 +484,7 @@ public class KafkaIOTest { .withMaxNumRecords(numElements) .withTimestampFn(new ValueAsTimestampFn()) .makeSource() - .generateInitialSplits(1, PipelineOptionsFactory.fromArgs(new String[0]).create()) + .generateInitialSplits(1, PipelineOptionsFactory.create()) .get(0); reader = source.createReader(null, mark);
