You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ke...@apache.org on 2016/10/18 03:38:43 UTC
[12/18] incubator-beam git commit: Make return types of trigger
static factory methods precise
Make return types of trigger static factory methods precise
This is helpful in testing and loses no abstraction - the code
locations calling these methods already know the more-specific
type that will be returned.
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/e1c5bfbc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/e1c5bfbc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/e1c5bfbc
Branch: refs/heads/master
Commit: e1c5bfbc76c0ef3766d5b1bf2dbd47e13f0ed97c
Parents: e0c5766
Author: Kenneth Knowles <kl...@google.com>
Authored: Thu Oct 13 22:15:32 2016 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Mon Oct 17 19:56:36 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/beam/sdk/transforms/windowing/AfterAll.java | 2 +-
.../java/org/apache/beam/sdk/transforms/windowing/AfterEach.java | 2 +-
.../org/apache/beam/sdk/transforms/windowing/AfterFirst.java | 2 +-
.../org/apache/beam/sdk/transforms/windowing/AfterWatermark.java | 4 ++--
.../java/org/apache/beam/sdk/transforms/windowing/Never.java | 2 +-
.../java/org/apache/beam/sdk/transforms/windowing/Trigger.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e1c5bfbc/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterAll.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterAll.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterAll.java
index cc8c97f..0e37d33 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterAll.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterAll.java
@@ -41,7 +41,7 @@ public class AfterAll extends OnceTrigger {
/**
* Returns an {@code AfterAll} {@code Trigger} with the given subtriggers.
*/
- public static OnceTrigger of(OnceTrigger... triggers) {
+ public static AfterAll of(OnceTrigger... triggers) {
return new AfterAll(Arrays.<Trigger>asList(triggers));
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e1c5bfbc/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterEach.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterEach.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterEach.java
index 629c640..961d97f 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterEach.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterEach.java
@@ -54,7 +54,7 @@ public class AfterEach extends Trigger {
* Returns an {@code AfterEach} {@code Trigger} with the given subtriggers.
*/
@SafeVarargs
- public static Trigger inOrder(Trigger... triggers) {
+ public static AfterEach inOrder(Trigger... triggers) {
return new AfterEach(Arrays.<Trigger>asList(triggers));
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e1c5bfbc/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterFirst.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterFirst.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterFirst.java
index 6b06cfa..7840fc4 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterFirst.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterFirst.java
@@ -42,7 +42,7 @@ public class AfterFirst extends OnceTrigger {
/**
* Returns an {@code AfterFirst} {@code Trigger} with the given subtriggers.
*/
- public static OnceTrigger of(OnceTrigger... triggers) {
+ public static AfterFirst of(OnceTrigger... triggers) {
return new AfterFirst(Arrays.<Trigger>asList(triggers));
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e1c5bfbc/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterWatermark.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterWatermark.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterWatermark.java
index da96de3..89c1ba9 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterWatermark.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterWatermark.java
@@ -102,11 +102,11 @@ public class AfterWatermark {
this.lateTrigger = lateTrigger;
}
- public Trigger withEarlyFirings(OnceTrigger earlyTrigger) {
+ public AfterWatermarkEarlyAndLate withEarlyFirings(OnceTrigger earlyTrigger) {
return new AfterWatermarkEarlyAndLate(earlyTrigger, lateTrigger);
}
- public Trigger withLateFirings(OnceTrigger lateTrigger) {
+ public AfterWatermarkEarlyAndLate withLateFirings(OnceTrigger lateTrigger) {
return new AfterWatermarkEarlyAndLate(earlyTrigger, lateTrigger);
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e1c5bfbc/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Never.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Never.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Never.java
index 5f20465..353258b 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Never.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Never.java
@@ -34,7 +34,7 @@ public final class Never {
* Returns a trigger which never fires. Output will be produced from the using {@link GroupByKey}
* when the {@link BoundedWindow} closes.
*/
- public static OnceTrigger ever() {
+ public static NeverTrigger ever() {
// NeverTrigger ignores all inputs and is Window-type independent.
return new NeverTrigger();
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e1c5bfbc/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Trigger.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Trigger.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Trigger.java
index cfabb8b..90e9386 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Trigger.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Trigger.java
@@ -490,7 +490,7 @@ public abstract class Trigger implements Serializable {
* <p>Note that if {@code t1} is {@link OnceTrigger}, then {@code t1.orFinally(t2)} is the same
* as {@code AfterFirst.of(t1, t2)}.
*/
- public Trigger orFinally(OnceTrigger until) {
+ public OrFinallyTrigger orFinally(OnceTrigger until) {
return new OrFinallyTrigger(this, until);
}