Clarify RequiresWindowAccess error message An error message is printed when a DoFn needs access to the window but does not implement RequiresWindowAccess. This PR changes to the error message to print the interface name instead of just "RequiresWindow", which makes it more clear which interface the user should use.
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/5f5b4e69 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/5f5b4e69 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/5f5b4e69 Branch: refs/heads/master Commit: 5f5b4e69505c729abfd0747df0080706f5e01dc6 Parents: 7a945a7 Author: Ryan Culbertson <[email protected]> Authored: Tue Jul 12 11:49:28 2016 -0400 Committer: Dan Halperin <[email protected]> Committed: Fri Jul 15 17:14:38 2016 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/beam/sdk/util/DoFnRunnerBase.java | 2 +- .../runners/flink/translation/functions/FlinkProcessContext.java | 2 +- .../wrappers/streaming/FlinkAbstractParDoWrapper.java | 4 ++-- .../beam/runners/spark/translation/SparkProcessContext.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/5f5b4e69/runners/core-java/src/main/java/org/apache/beam/sdk/util/DoFnRunnerBase.java ---------------------------------------------------------------------- diff --git a/runners/core-java/src/main/java/org/apache/beam/sdk/util/DoFnRunnerBase.java b/runners/core-java/src/main/java/org/apache/beam/sdk/util/DoFnRunnerBase.java index 3f8f8e0..e267a31 100644 --- a/runners/core-java/src/main/java/org/apache/beam/sdk/util/DoFnRunnerBase.java +++ b/runners/core-java/src/main/java/org/apache/beam/sdk/util/DoFnRunnerBase.java @@ -436,7 +436,7 @@ public abstract class DoFnRunnerBase<InputT, OutputT> implements DoFnRunner<Inpu public BoundedWindow window() { if (!(fn instanceof RequiresWindowAccess)) { throw new UnsupportedOperationException( - "window() is only available in the context of a DoFn marked as RequiresWindow."); + "window() is only available in the context of a DoFn marked as RequiresWindowAccess."); } return Iterables.getOnlyElement(windows()); } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/5f5b4e69/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/functions/FlinkProcessContext.java ---------------------------------------------------------------------- diff --git a/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/functions/FlinkProcessContext.java b/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/functions/FlinkProcessContext.java index 0ee8198..235a803 100644 --- a/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/functions/FlinkProcessContext.java +++ b/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/functions/FlinkProcessContext.java @@ -141,7 +141,7 @@ class FlinkProcessContext<InputT, OutputT> public BoundedWindow window() { if (!requiresWindowAccess) { throw new UnsupportedOperationException( - "window() is only available in the context of a DoFn marked as RequiresWindow."); + "window() is only available in the context of a DoFn marked as RequiresWindowAccess."); } return Iterables.getOnlyElement(windowedValue.getWindows()); } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/5f5b4e69/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/FlinkAbstractParDoWrapper.java ---------------------------------------------------------------------- diff --git a/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/FlinkAbstractParDoWrapper.java b/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/FlinkAbstractParDoWrapper.java index d8222b6..e40d6e3 100644 --- a/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/FlinkAbstractParDoWrapper.java +++ b/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/FlinkAbstractParDoWrapper.java @@ -139,7 +139,7 @@ public abstract class FlinkAbstractParDoWrapper<IN, OUTDF, OUTFL> extends RichFl public BoundedWindow window() { if (!(fn instanceof DoFn.RequiresWindowAccess)) { throw new UnsupportedOperationException( - "window() is only available in the context of a DoFn marked as RequiresWindow."); + "window() is only available in the context of a DoFn marked as RequiresWindowAccess."); } Collection<? extends BoundedWindow> windows = this.element.getWindows(); @@ -277,4 +277,4 @@ public abstract class FlinkAbstractParDoWrapper<IN, OUTDF, OUTFL> extends RichFl WindowedValue<IN> inElement, Collector<WindowedValue<OUTFL>> outCollector); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/5f5b4e69/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/SparkProcessContext.java ---------------------------------------------------------------------- diff --git a/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/SparkProcessContext.java b/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/SparkProcessContext.java index 779a83e..cad2a8e 100644 --- a/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/SparkProcessContext.java +++ b/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/SparkProcessContext.java @@ -137,7 +137,7 @@ public abstract class SparkProcessContext<InputT, OutputT, ValueT> public BoundedWindow window() { if (!(fn instanceof DoFn.RequiresWindowAccess)) { throw new UnsupportedOperationException( - "window() is only available in the context of a DoFn marked as RequiresWindow."); + "window() is only available in the context of a DoFn marked as RequiresWindowAccess."); } return Iterables.getOnlyElement(windowedValue.getWindows()); }
