Skip to content

[BEAM-697] TextIO.Write.Bound.withHeader() and withFooter() now use t… #1111

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
jeffkpayne wants to merge 1 commit into from
Closed

[BEAM-697] TextIO.Write.Bound.withHeader() and withFooter() now use t… #1111

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
4 changes: 2 additions & 2 deletions sdks/java/core/src/main/java/org/apache/beam/sdk/io/TextIO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ public Bound<T> withoutValidation() {
*/
public Bound<T> withHeader(@Nullable String header) {
return new Bound<>(name, filenamePrefix, filenameSuffix, header, footer, coder, numShards,
shardTemplate, false, writableByteChannelFactory);
shardTemplate, validate, writableByteChannelFactory);
}

/**
Expand All @@ -682,7 +682,7 @@ public Bound<T> withHeader(@Nullable String header) {
*/
public Bound<T> withFooter(@Nullable String footer) {
return new Bound<>(name, filenamePrefix, filenameSuffix, header, footer, coder, numShards,
shardTemplate, false, writableByteChannelFactory);
shardTemplate, validate, writableByteChannelFactory);
}

/**
Expand Down
25 changes: 25 additions & 0 deletions sdks/java/core/src/test/java/org/apache/beam/sdk/io/TextIOTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.hasItem;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.startsWith;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
Expand Down Expand Up @@ -556,6 +557,30 @@ public void testWriteDisplayData() {
assertThat(displayData, hasDisplayItem("writableByteChannelFactory", "UNCOMPRESSED"));
}

@Test
public void testWriteDisplayDataValidateThenHeader() {
TextIO.Write.Bound<?> write = TextIO.Write
.to("foo")
.withHeader("myHeader");

DisplayData displayData = DisplayData.from(write);

assertThat(displayData, hasDisplayItem("fileHeader", "myHeader"));
assertThat(displayData, not(hasDisplayItem("validation", false)));
}

@Test
public void testWriteDisplayDataValidateThenFooter() {
TextIO.Write.Bound<?> write = TextIO.Write
.to("foo")
.withFooter("myFooter");

DisplayData displayData = DisplayData.from(write);

assertThat(displayData, hasDisplayItem("fileFooter", "myFooter"));
assertThat(displayData, not(hasDisplayItem("validation", false)));
}

@Test
@Category(RunnableOnService.class)
@Ignore("[BEAM-436] DirectRunner RunnableOnService tempLocation configuration insufficient")
Expand Down