You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ie...@apache.org on 2017/10/27 14:47:26 UTC
[1/4] beam git commit: Remove extraneous type arguments in PAssert
Repository: beam
Updated Branches:
refs/heads/master 1f6803078 -> 2b8cd3f20
Remove extraneous type arguments in PAssert
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/e127c487
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/e127c487
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/e127c487
Branch: refs/heads/master
Commit: e127c4874ddb1455973afa5867826a9da9224a74
Parents: 1f68030
Author: Kenneth Knowles <ke...@apache.org>
Authored: Thu Oct 26 12:40:18 2017 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Thu Oct 26 20:14:53 2017 -0700
----------------------------------------------------------------------
.../main/java/org/apache/beam/sdk/testing/PAssert.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/e127c487/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/PAssert.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/PAssert.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/PAssert.java
index d2ad67d..ef45491 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/PAssert.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/testing/PAssert.java
@@ -469,7 +469,7 @@ public class PAssert {
private final PAssertionSite site;
public PCollectionContentsAssert(PCollection<T> actual, PAssertionSite site) {
- this(actual, IntoGlobalWindow.<T>of(), PaneExtractors.<T>allPanes(), site);
+ this(actual, IntoGlobalWindow.of(), PaneExtractors.<T>allPanes(), site);
}
public PCollectionContentsAssert(
@@ -515,7 +515,7 @@ public class PAssert {
Coder<BoundedWindow> windowCoder =
(Coder) actual.getWindowingStrategy().getWindowFn().windowCoder();
return new PCollectionContentsAssert<>(
- actual, IntoStaticWindows.<T>of(windowCoder, window), paneExtractor, site);
+ actual, IntoStaticWindows.of(windowCoder, window), paneExtractor, site);
}
/**
@@ -651,7 +651,7 @@ public class PAssert {
PCollection<Iterable<T>> actual, PAssertionSite site) {
this(
actual,
- IntoGlobalWindow.<Iterable<T>>of(),
+ IntoGlobalWindow.of(),
PaneExtractors.<Iterable<T>>allPanes(),
site);
}
@@ -706,7 +706,7 @@ public class PAssert {
Coder<BoundedWindow> windowCoder =
(Coder) actual.getWindowingStrategy().getWindowFn().windowCoder();
return new PCollectionSingletonIterableAssert<>(
- actual, IntoStaticWindows.<Iterable<T>>of(windowCoder, window), paneExtractor, site);
+ actual, IntoStaticWindows.of(windowCoder, window), paneExtractor, site);
}
@Override
@@ -764,7 +764,7 @@ public class PAssert {
this(
actual,
view,
- IntoGlobalWindow.<ElemT>of(),
+ IntoGlobalWindow.of(),
PaneExtractors.<ElemT>allPanes(),
coder,
site);
[2/4] beam git commit: Remove extraneous type arguments in Latest.java
Posted by ie...@apache.org.
Remove extraneous type arguments in Latest.java
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/50de2938
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/50de2938
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/50de2938
Branch: refs/heads/master
Commit: 50de2938ea91db0f38c6a1595dacb54c66ee71f8
Parents: e127c48
Author: Kenneth Knowles <ke...@apache.org>
Authored: Thu Oct 26 12:41:06 2017 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Thu Oct 26 20:14:54 2017 -0700
----------------------------------------------------------------------
.../core/src/main/java/org/apache/beam/sdk/transforms/Latest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/50de2938/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Latest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Latest.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Latest.java
index f7028ec..f327df1 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Latest.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Latest.java
@@ -129,7 +129,7 @@ public class Latest {
TimestampedValue.TimestampedValueCoder<T> inputTVCoder =
(TimestampedValue.TimestampedValueCoder<T>) inputCoder;
- return NullableCoder.of(inputTVCoder.<T>getValueCoder());
+ return NullableCoder.of(inputTVCoder.getValueCoder());
}
@Override
[4/4] beam git commit: This closes #4048
Posted by ie...@apache.org.
This closes #4048
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/2b8cd3f2
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/2b8cd3f2
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/2b8cd3f2
Branch: refs/heads/master
Commit: 2b8cd3f204da6ecc00a9517fb9531971ad729288
Parents: 1f68030 26a3fc5
Author: Ismaël Mejía <ie...@gmail.com>
Authored: Fri Oct 27 16:44:28 2017 +0200
Committer: Ismaël Mejía <ie...@gmail.com>
Committed: Fri Oct 27 16:44:28 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/beam/sdk/io/TextIO.java | 24 ++++++++++++++++----
.../org/apache/beam/sdk/testing/PAssert.java | 10 ++++----
.../org/apache/beam/sdk/transforms/Latest.java | 2 +-
3 files changed, 26 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
[3/4] beam git commit: Suppress AutoValue warnings in TextIO
Posted by ie...@apache.org.
Suppress AutoValue warnings in TextIO
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/26a3fc55
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/26a3fc55
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/26a3fc55
Branch: refs/heads/master
Commit: 26a3fc55596139f96084ff6310defb0609791d6d
Parents: 50de293
Author: Kenneth Knowles <ke...@apache.org>
Authored: Thu Oct 26 12:43:08 2017 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Thu Oct 26 20:14:54 2017 -0700
----------------------------------------------------------------------
.../java/org/apache/beam/sdk/io/TextIO.java | 24 ++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/26a3fc55/sdks/java/core/src/main/java/org/apache/beam/sdk/io/TextIO.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/TextIO.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/TextIO.java
index 6e6bb2f..fb01634 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/TextIO.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/TextIO.java
@@ -269,11 +269,19 @@ public class TextIO {
/** Implementation of {@link #read}. */
@AutoValue
public abstract static class Read extends PTransform<PBegin, PCollection<String>> {
- @Nullable abstract ValueProvider<String> getFilepattern();
+ @Nullable
+ abstract ValueProvider<String> getFilepattern();
+
abstract MatchConfiguration getMatchConfiguration();
+
abstract boolean getHintMatchesManyFiles();
+
abstract Compression getCompression();
- @Nullable abstract byte[] getDelimiter();
+
+ @SuppressWarnings("mutable") // this returns an array that can be mutated by the caller
+ @Nullable
+ abstract byte[] getDelimiter();
+
abstract Builder toBuilder();
@AutoValue.Builder
@@ -430,8 +438,12 @@ public class TextIO {
public abstract static class ReadAll
extends PTransform<PCollection<String>, PCollection<String>> {
abstract MatchConfiguration getMatchConfiguration();
+
abstract Compression getCompression();
- @Nullable abstract byte[] getDelimiter();
+
+ @SuppressWarnings("mutable") // this returns an array that can be mutated by the caller
+ @Nullable
+ abstract byte[] getDelimiter();
abstract Builder toBuilder();
@@ -512,7 +524,11 @@ public class TextIO {
public abstract static class ReadFiles
extends PTransform<PCollection<FileIO.ReadableFile>, PCollection<String>> {
abstract long getDesiredBundleSizeBytes();
- @Nullable abstract byte[] getDelimiter();
+
+ @SuppressWarnings("mutable") // this returns an array that can be mutated by the caller
+ @Nullable
+ abstract byte[] getDelimiter();
+
abstract Builder toBuilder();
@AutoValue.Builder