Repository: incubator-beam Updated Branches: refs/heads/master 63c5d19b3 -> da31a2d77
Miscellaneous fixups * Remove a tab in pom.xml * Fix some javadoc * Remove some newlines * Remove some commented-out code * Remove an accidental System.err.println left in * Remove unnecessary boxing/unboxing Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/68c5be43 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/68c5be43 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/68c5be43 Branch: refs/heads/master Commit: 68c5be43828b7b34629c0799a40b56c11f1add4f Parents: 63c5d19 Author: Dan Halperin <dhalp...@google.com> Authored: Tue Aug 2 18:37:50 2016 -0700 Committer: Dan Halperin <dhalp...@google.com> Committed: Tue Aug 2 23:35:12 2016 -0700 ---------------------------------------------------------------------- pom.xml | 2 +- .../beam/runners/core/UnboundedReadFromBoundedSourceTest.java | 2 +- .../beam/runners/direct/GroupAlsoByWindowEvaluatorFactory.java | 1 - .../org/apache/beam/runners/dataflow/DataflowPipelineJob.java | 2 +- .../src/main/java/org/apache/beam/sdk/coders/CoderRegistry.java | 1 - .../src/main/java/org/apache/beam/sdk/options/GcpOptions.java | 1 - .../src/test/java/org/apache/beam/sdk/io/AvroSourceTest.java | 4 ++-- .../org/apache/beam/sdk/io/gcp/bigquery/BigQueryServices.java | 2 +- 8 files changed, 6 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/68c5be43/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index caec6d5..3b98382 100644 --- a/pom.xml +++ b/pom.xml @@ -573,7 +573,7 @@ <dependency> <groupId>io.netty</groupId> <artifactId>netty-handler</artifactId> - <version>${netty.version}</version> + <version>${netty.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/68c5be43/runners/core-java/src/test/java/org/apache/beam/runners/core/UnboundedReadFromBoundedSourceTest.java ---------------------------------------------------------------------- diff --git a/runners/core-java/src/test/java/org/apache/beam/runners/core/UnboundedReadFromBoundedSourceTest.java b/runners/core-java/src/test/java/org/apache/beam/runners/core/UnboundedReadFromBoundedSourceTest.java index dfbc675..45c1414 100644 --- a/runners/core-java/src/test/java/org/apache/beam/runners/core/UnboundedReadFromBoundedSourceTest.java +++ b/runners/core-java/src/test/java/org/apache/beam/runners/core/UnboundedReadFromBoundedSourceTest.java @@ -360,7 +360,7 @@ public class UnboundedReadFromBoundedSourceTest { if (channel.read(buff) != 1) { return false; } - current = new Byte(buff.get(0)); + current = buff.get(0); offset += 1; return true; } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/68c5be43/runners/direct-java/src/main/java/org/apache/beam/runners/direct/GroupAlsoByWindowEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/GroupAlsoByWindowEvaluatorFactory.java b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/GroupAlsoByWindowEvaluatorFactory.java index 5d3ab3f..477da30 100644 --- a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/GroupAlsoByWindowEvaluatorFactory.java +++ b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/GroupAlsoByWindowEvaluatorFactory.java @@ -109,7 +109,6 @@ class GroupAlsoByWindowEvaluatorFactory implements TransformEvaluatorFactory { DoFn<KeyedWorkItem<K, V>, KV<K, Iterable<V>>> gabwDoFn = GroupAlsoByWindowViaWindowSetDoFn.create( windowingStrategy, - // new DirectStateInternalsFactory<K, V>(stepContext), new ConstantStateInternalsFactory<K>(stateInternals), SystemReduceFn.<K, V, BoundedWindow>buffering(valueCoder)); http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/68c5be43/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineJob.java ---------------------------------------------------------------------- diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineJob.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineJob.java index a02d280..3194f7c 100644 --- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineJob.java +++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineJob.java @@ -113,7 +113,7 @@ public class DataflowPipelineJob implements PipelineResult { * * @param projectId the project id * @param jobId the job id - * @param dataflowOptions the client for the Dataflow Service + * @param dataflowOptions used to configure the client for the Dataflow Service * @param aggregatorTransforms a mapping from aggregators to PTransforms */ public DataflowPipelineJob( http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/68c5be43/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/CoderRegistry.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/CoderRegistry.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/CoderRegistry.java index d9b988b..411ebe2 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/CoderRegistry.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/CoderRegistry.java @@ -1,4 +1,3 @@ - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/68c5be43/sdks/java/core/src/main/java/org/apache/beam/sdk/options/GcpOptions.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/options/GcpOptions.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/options/GcpOptions.java index de3f133..e0a1ef3 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/options/GcpOptions.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/options/GcpOptions.java @@ -317,7 +317,6 @@ public interface GcpOptions extends GoogleApiDebugOptions, PipelineOptions { if (!Strings.isNullOrEmpty(tempLocation)) { try { PathValidator validator = options.as(GcsOptions.class).getPathValidator(); - System.err.println(validator); validator.validateOutputFilePrefixSupported(tempLocation); } catch (Exception e) { // Ignore the temp location because it is not a valid 'gs://' path. http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/68c5be43/sdks/java/core/src/test/java/org/apache/beam/sdk/io/AvroSourceTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/AvroSourceTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/AvroSourceTest.java index af17a95..c7153f8 100644 --- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/AvroSourceTest.java +++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/AvroSourceTest.java @@ -196,14 +196,14 @@ public class AvroSourceTest { AvroSource<FixedRecord> source = AvroSource.from(filename).withSchema(FixedRecord.class); try (BoundedSource.BoundedReader<FixedRecord> reader = source.createReader(null)) { - assertEquals(new Double(0.0), reader.getFractionConsumed()); + assertEquals(Double.valueOf(0.0), reader.getFractionConsumed()); } List<? extends BoundedSource<FixedRecord>> splits = source.splitIntoBundles(file.length() / 3, null); for (BoundedSource<FixedRecord> subSource : splits) { try (BoundedSource.BoundedReader<FixedRecord> reader = subSource.createReader(null)) { - assertEquals(new Double(0.0), reader.getFractionConsumed()); + assertEquals(Double.valueOf(0.0), reader.getFractionConsumed()); } } } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/68c5be43/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryServices.java ---------------------------------------------------------------------- diff --git a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryServices.java b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryServices.java index 87887ec..29a335d 100644 --- a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryServices.java +++ b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryServices.java @@ -143,7 +143,7 @@ interface BigQueryServices extends Serializable { /** * Inserts {@link TableRow TableRows} with the specified insertIds if not null. * - * Returns the total bytes count of {@link TableRow TableRows}. + * <p>Returns the total bytes count of {@link TableRow TableRows}. */ long insertAll(TableReference ref, List<TableRow> rowList, @Nullable List<String> insertIdList) throws IOException, InterruptedException;