You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by pa...@apache.org on 2018/05/15 15:55:18 UTC
[beam] branch master updated: Fix error-prone warnings for
file-based-io-tests
This is an automated email from the ASF dual-hosted git repository.
pabloem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new 1a0b9be Fix error-prone warnings for file-based-io-tests
1a0b9be is described below
commit 1a0b9be058f9f3e18734af8393c72b582c71347b
Author: timrobertson100 <ti...@gmial.com>
AuthorDate: Tue May 15 12:05:00 2018 +0200
Fix error-prone warnings for file-based-io-tests
---
.../common/src/test/java/org/apache/beam/sdk/io/common/TestRow.java | 4 ++--
.../src/test/java/org/apache/beam/sdk/io/tfrecord/TFRecordIOIT.java | 6 ++++--
.../src/test/java/org/apache/beam/sdk/io/xml/XmlIOIT.java | 3 +--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/sdks/java/io/common/src/test/java/org/apache/beam/sdk/io/common/TestRow.java b/sdks/java/io/common/src/test/java/org/apache/beam/sdk/io/common/TestRow.java
index 4465456..7a93131 100644
--- a/sdks/java/io/common/src/test/java/org/apache/beam/sdk/io/common/TestRow.java
+++ b/sdks/java/io/common/src/test/java/org/apache/beam/sdk/io/common/TestRow.java
@@ -24,7 +24,6 @@ import com.google.common.collect.ImmutableMap;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
import org.apache.beam.sdk.transforms.DoFn;
/**
@@ -42,6 +41,7 @@ public abstract class TestRow implements Serializable, Comparable<TestRow> {
public abstract Integer id();
public abstract String name();
+ @Override
public int compareTo(TestRow other) {
return id().compareTo(other.id());
}
@@ -96,7 +96,7 @@ public abstract class TestRow implements Serializable, Comparable<TestRow> {
* Precalculated hashes - you can calculate an entry by running HashingFn on
* the name() for the rows generated from seeds in [0, n).
*/
- private static final Map<Integer, String> EXPECTED_HASHES = ImmutableMap.of(
+ private static final ImmutableMap<Integer, String> EXPECTED_HASHES = ImmutableMap.of(
1000, "7d94d63a41164be058a9680002914358",
100_000, "c7cbddb319209e200f1c5eebef8fe960",
600_000, "e2add2f680de9024e9bc46cd3912545e",
diff --git a/sdks/java/io/file-based-io-tests/src/test/java/org/apache/beam/sdk/io/tfrecord/TFRecordIOIT.java b/sdks/java/io/file-based-io-tests/src/test/java/org/apache/beam/sdk/io/tfrecord/TFRecordIOIT.java
index b9d8be9..56c3e03 100644
--- a/sdks/java/io/file-based-io-tests/src/test/java/org/apache/beam/sdk/io/tfrecord/TFRecordIOIT.java
+++ b/sdks/java/io/file-based-io-tests/src/test/java/org/apache/beam/sdk/io/tfrecord/TFRecordIOIT.java
@@ -23,6 +23,7 @@ import static org.apache.beam.sdk.io.common.FileBasedIOITHelper.appendTimestampS
import static org.apache.beam.sdk.io.common.FileBasedIOITHelper.getExpectedHashForLineCount;
import static org.apache.beam.sdk.io.common.FileBasedIOITHelper.readTestPipelineOptions;
+import java.nio.charset.StandardCharsets;
import org.apache.beam.sdk.io.Compression;
import org.apache.beam.sdk.io.GenerateSequence;
import org.apache.beam.sdk.io.TFRecordIO;
@@ -46,6 +47,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
+
/**
* Integration tests for {@link org.apache.beam.sdk.io.TFRecordIO}.
*
@@ -132,14 +134,14 @@ public class TFRecordIOIT {
static class StringToByteArray extends SimpleFunction<String, byte[]> {
@Override
public byte[] apply(String input) {
- return input.getBytes();
+ return input.getBytes(StandardCharsets.UTF_8);
}
}
static class ByteArrayToString extends SimpleFunction<byte[], String> {
@Override
public String apply(byte[] input) {
- return new String(input);
+ return new String(input, StandardCharsets.UTF_8);
}
}
}
diff --git a/sdks/java/io/file-based-io-tests/src/test/java/org/apache/beam/sdk/io/xml/XmlIOIT.java b/sdks/java/io/file-based-io-tests/src/test/java/org/apache/beam/sdk/io/xml/XmlIOIT.java
index d32b1d6..f5d6146 100644
--- a/sdks/java/io/file-based-io-tests/src/test/java/org/apache/beam/sdk/io/xml/XmlIOIT.java
+++ b/sdks/java/io/file-based-io-tests/src/test/java/org/apache/beam/sdk/io/xml/XmlIOIT.java
@@ -23,7 +23,6 @@ import static org.apache.beam.sdk.io.common.IOITHelper.getHashForRecordCount;
import com.google.common.collect.ImmutableMap;
import java.io.Serializable;
import java.nio.charset.Charset;
-import java.util.Map;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
@@ -70,7 +69,7 @@ import org.junit.runners.JUnit4;
@RunWith(JUnit4.class)
public class XmlIOIT {
- private static final Map<Integer, String> EXPECTED_HASHES = ImmutableMap.of(
+ private static final ImmutableMap<Integer, String> EXPECTED_HASHES = ImmutableMap.of(
1000, "7f51adaf701441ee83459a3f705c1b86",
100_000, "af7775de90d0b0c8bbc36273fbca26fe",
100_000_000, "bfee52b33aa1552b9c1bfa8bcc41ae80"
--
To stop receiving notification emails like this one, please contact
pabloem@apache.org.