Skip to content

[BEAM-117] Window display data should be safe for null windowFn #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
swegner wants to merge 1 commit into from
Closed

[BEAM-117] Window display data should be safe for null windowFn #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/Window.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,14 +599,16 @@ public PCollection<T> apply(PCollection<T> input) {
@Override
public void populateDisplayData(DisplayData.Builder builder) {
super.populateDisplayData(builder);
builder
.add(DisplayData.item("windowFn", windowFn.getClass()))
.include(windowFn);

if (windowFn != null) {
builder
.add(DisplayData.item("windowFn", windowFn.getClass()))
.include(windowFn);
}

if (allowedLateness != null) {
builder.addIfNotDefault(DisplayData.item("allowedLateness", allowedLateness),
Duration.millis(BoundedWindow.TIMESTAMP_MAX_VALUE.getMillis()));

}

if (trigger != null && !(trigger instanceof DefaultTrigger)) {
Expand Down
11 changes: 6 additions & 5 deletions sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/windowing/WindowTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,16 +272,17 @@ public void testDisplayData() {

@Test
public void testDisplayDataExcludesUnspecifiedProperties() {
Window.Bound<?> window = Window.into(new GlobalWindows());

DisplayData displayData = DisplayData.from(window);
assertThat(displayData, not(hasDisplayItem(hasKey(isOneOf(
Window.Bound<?> onlyHasAccumulationMode = Window.named("foobar").discardingFiredPanes();
assertThat(DisplayData.from(onlyHasAccumulationMode), not(hasDisplayItem(hasKey(isOneOf(
"windowFn",
"trigger",
"outputTimeFn",
"accumulationMode",
"allowedLateness",
"closingBehavior")))));

Window.Bound<?> noAccumulationMode = Window.into(new GlobalWindows());
assertThat(DisplayData.from(noAccumulationMode),
not(hasDisplayItem(hasKey("accumulationMode"))));
}

@Test
Expand Down