[
https://issues.apache.org/jira/browse/BEAM-3533?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16339301#comment-16339301
]
ASF GitHub Bot commented on BEAM-3533:
--------------------------------------
coheigea closed pull request #4485: BEAM-3533 - Replace hard-coded UTF-8
Strings.
URL: https://github.com/apache/beam/pull/4485
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/examples/java/src/test/java/org/apache/beam/examples/cookbook/TriggerExampleTest.java
b/examples/java/src/test/java/org/apache/beam/examples/cookbook/TriggerExampleTest.java
index 706cfb91b43..667f487595a 100644
---
a/examples/java/src/test/java/org/apache/beam/examples/cookbook/TriggerExampleTest.java
+++
b/examples/java/src/test/java/org/apache/beam/examples/cookbook/TriggerExampleTest.java
@@ -104,7 +104,7 @@ public void testExtractTotalFlow() throws Exception {
List<KV<String, Integer>> results = extractFlowInfow.processBundle(INPUT);
Assert.assertEquals(results.size(), 1);
Assert.assertEquals(results.get(0).getKey(), "94");
- Assert.assertEquals(results.get(0).getValue(), new Integer(29));
+ Assert.assertEquals(results.get(0).getValue(), Integer.valueOf(29));
List<KV<String, Integer>> output = extractFlowInfow.processBundle("");
Assert.assertEquals(output.size(), 0);
diff --git
a/examples/java8/src/main/java/org/apache/beam/examples/complete/game/injector/Injector.java
b/examples/java8/src/main/java/org/apache/beam/examples/complete/game/injector/Injector.java
index 90c3d7645d8..a5d9227b91a 100644
---
a/examples/java8/src/main/java/org/apache/beam/examples/complete/game/injector/Injector.java
+++
b/examples/java8/src/main/java/org/apache/beam/examples/complete/game/injector/Injector.java
@@ -26,6 +26,7 @@
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -283,7 +284,7 @@ public static void publishData(int numMessages, int
delayInMillis)
Long currTime = System.currentTimeMillis();
String message = generateEvent(currTime, delayInMillis);
PubsubMessage pubsubMessage = new PubsubMessage()
- .encodeData(message.getBytes("UTF-8"));
+ .encodeData(message.getBytes(StandardCharsets.UTF_8));
pubsubMessage.setAttributes(
ImmutableMap.of(GameConstants.TIMESTAMP_ATTRIBUTE,
Long.toString((currTime - delayInMillis) / 1000 * 1000)));
@@ -305,7 +306,7 @@ public static void publishData(int numMessages, int
delayInMillis)
public static void publishDataToFile(String fileName, int numMessages, int
delayInMillis)
throws IOException {
PrintWriter out = new PrintWriter(new OutputStreamWriter(
- new BufferedOutputStream(new FileOutputStream(fileName, true)),
"UTF-8"));
+ new BufferedOutputStream(new FileOutputStream(fileName, true)),
StandardCharsets.UTF_8));
try {
for (int i = 0; i < Math.max(1, numMessages); i++) {
diff --git
a/examples/java8/src/test/java/org/apache/beam/examples/complete/game/UserScoreTest.java
b/examples/java8/src/test/java/org/apache/beam/examples/complete/game/UserScoreTest.java
index 2eb63aa4720..c41135523ee 100644
---
a/examples/java8/src/test/java/org/apache/beam/examples/complete/game/UserScoreTest.java
+++
b/examples/java8/src/test/java/org/apache/beam/examples/complete/game/UserScoreTest.java
@@ -94,7 +94,7 @@ public void testParseEventFn() throws Exception {
Assert.assertEquals(results.size(), 8);
Assert.assertEquals(results.get(0).getUser(), "user0_MagentaKangaroo");
Assert.assertEquals(results.get(0).getTeam(), "MagentaKangaroo");
- Assert.assertEquals(results.get(0).getScore(), new Integer(3));
+ Assert.assertEquals(results.get(0).getScore(), Integer.valueOf(3));
}
/** Tests ExtractAndSumScore("user"). */
diff --git
a/runners/apex/src/test/java/org/apache/beam/runners/apex/ApexRunnerTest.java
b/runners/apex/src/test/java/org/apache/beam/runners/apex/ApexRunnerTest.java
index c5521d1c700..8363a815c1f 100644
---
a/runners/apex/src/test/java/org/apache/beam/runners/apex/ApexRunnerTest.java
+++
b/runners/apex/src/test/java/org/apache/beam/runners/apex/ApexRunnerTest.java
@@ -58,7 +58,7 @@ public void testConfigProperties() throws Exception {
DAG dag = TestApexRunner.translate(p, options);
OperatorMeta t1Meta = dag.getOperatorMeta(operName);
Assert.assertNotNull(t1Meta);
- Assert.assertEquals(new Integer(32),
t1Meta.getValue(OperatorContext.MEMORY_MB));
+ Assert.assertEquals(Integer.valueOf(32),
t1Meta.getValue(OperatorContext.MEMORY_MB));
File tmp = File.createTempFile("beam-runners-apex-", ".properties");
tmp.deleteOnExit();
@@ -73,7 +73,7 @@ public void testConfigProperties() throws Exception {
t1Meta = dag.getOperatorMeta(operName);
Assert.assertNotNull(t1Meta);
- Assert.assertEquals(new Integer(64),
t1Meta.getValue(OperatorContext.MEMORY_MB));
+ Assert.assertEquals(Integer.valueOf(64),
t1Meta.getValue(OperatorContext.MEMORY_MB));
}
diff --git
a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/MonitoringUtil.java
b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/MonitoringUtil.java
index cf464066c12..0b5efb0d1d9 100644
---
a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/MonitoringUtil.java
+++
b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/util/MonitoringUtil.java
@@ -28,6 +28,7 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -195,9 +196,9 @@ public static String getJobMonitoringPageURL(String
projectName, String regionId
// that has the project name replaced with project id.
return String.format(
"https://console.cloud.google.com/dataflow/jobsDetail/locations/%s/jobs/%s?project=%s";,
- URLEncoder.encode(regionId, "UTF-8"),
- URLEncoder.encode(jobId, "UTF-8"),
- URLEncoder.encode(projectName, "UTF-8"));
+ URLEncoder.encode(regionId, StandardCharsets.UTF_8.name()),
+ URLEncoder.encode(jobId, StandardCharsets.UTF_8.name()),
+ URLEncoder.encode(projectName, StandardCharsets.UTF_8.name()));
} catch (UnsupportedEncodingException e) {
// Should never happen.
throw new AssertionError("UTF-8 encoding is not supported by the
environment", e);
diff --git
a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/util/PackageUtilTest.java
b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/util/PackageUtilTest.java
index 0b94f7ca165..f817ca31780 100644
---
a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/util/PackageUtilTest.java
+++
b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/util/PackageUtilTest.java
@@ -261,7 +261,8 @@ public void testPackageUploadWithFileSucceeds() throws
Exception {
assertThat(target.getName(), RegexMatcher.matches("file-" + HASH_PATTERN +
".txt"));
assertThat(target.getLocation(), equalTo(STAGING_PATH + target.getName()));
- assertThat(new LineReader(Channels.newReader(pipe.source(),
"UTF-8")).readLine(),
+ assertThat(new LineReader(Channels.newReader(pipe.source(),
+ StandardCharsets.UTF_8.name())).readLine(),
equalTo(contents));
}
diff --git
a/runners/spark/src/test/java/org/apache/beam/runners/spark/io/NumShardsTest.java
b/runners/spark/src/test/java/org/apache/beam/runners/spark/io/NumShardsTest.java
index 55ee9382754..167d582b8aa 100644
---
a/runners/spark/src/test/java/org/apache/beam/runners/spark/io/NumShardsTest.java
+++
b/runners/spark/src/test/java/org/apache/beam/runners/spark/io/NumShardsTest.java
@@ -21,12 +21,12 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import com.google.common.base.Charsets;
import com.google.common.collect.Sets;
import com.google.common.io.Files;
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
@@ -83,7 +83,7 @@ public void testText() throws Exception {
}
})) {
count++;
- for (String line : Files.readLines(f, Charsets.UTF_8)) {
+ for (String line : Files.readLines(f, StandardCharsets.UTF_8)) {
assertTrue(line + " not found", expected.remove(line));
}
}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/AvroSource.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/AvroSource.java
index b8449fd79e7..fac0ebd9724 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/AvroSource.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/AvroSource.java
@@ -36,6 +36,7 @@
import java.nio.channels.Channels;
import java.nio.channels.ReadableByteChannel;
import java.nio.channels.SeekableByteChannel;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Map;
import java.util.WeakHashMap;
@@ -422,9 +423,9 @@ static AvroMetadata readMetadataFromFile(ResourceId
fileResource) throws IOExcep
byte[] bytes = new byte[valueBuffer.remaining()];
valueBuffer.get(bytes);
if (key.equals(DataFileConstants.CODEC)) {
- codec = new String(bytes, "UTF-8");
+ codec = new String(bytes, StandardCharsets.UTF_8);
} else if (key.equals(DataFileConstants.SCHEMA)) {
- schemaString = new String(bytes, "UTF-8");
+ schemaString = new String(bytes, StandardCharsets.UTF_8);
}
}
numRecords = decoder.mapNext();
diff --git
a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/AvroCoderTest.java
b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/AvroCoderTest.java
index deecb969436..00058092c0d 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/AvroCoderTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/AvroCoderTest.java
@@ -331,7 +331,7 @@ public void testEncodingNotBuffered() throws Exception {
Assert.assertEquals(before, after);
Integer intAfter = intCoder.decode(inStream, context);
- Assert.assertEquals(new Integer(10), intAfter);
+ Assert.assertEquals(Integer.valueOf(10), intAfter);
}
@Test
diff --git
a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/FileBasedSinkTest.java
b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/FileBasedSinkTest.java
index 0c9bdc1ddec..48a5510f68f 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/FileBasedSinkTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/FileBasedSinkTest.java
@@ -419,7 +419,7 @@ public void testCompressionBZIP2() throws
FileNotFoundException, IOException {
new BufferedReader(
new InputStreamReader(
new BZip2CompressorInputStream(new FileInputStream(file)),
- StandardCharsets.UTF_8.name())),
+ StandardCharsets.UTF_8)),
"abc",
"123");
}
@@ -432,7 +432,7 @@ public void testCompressionGZIP() throws
FileNotFoundException, IOException {
assertReadValues(
new BufferedReader(
new InputStreamReader(
- new GZIPInputStream(new FileInputStream(file)),
StandardCharsets.UTF_8.name())),
+ new GZIPInputStream(new FileInputStream(file)),
StandardCharsets.UTF_8)),
"abc",
"123");
}
@@ -447,7 +447,7 @@ public void testCompressionDEFLATE() throws
FileNotFoundException, IOException {
new BufferedReader(
new InputStreamReader(
new DeflateCompressorInputStream(new FileInputStream(file)),
- StandardCharsets.UTF_8.name())),
+ StandardCharsets.UTF_8)),
"abc",
"123");
}
@@ -460,7 +460,7 @@ public void testCompressionUNCOMPRESSED() throws
FileNotFoundException, IOExcept
// Read uncompressed data back in using standard API.
assertReadValues(
new BufferedReader(
- new InputStreamReader(new FileInputStream(file),
StandardCharsets.UTF_8.name())),
+ new InputStreamReader(new FileInputStream(file),
StandardCharsets.UTF_8)),
"abc",
"123");
}
diff --git
a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/SimpleSink.java
b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/SimpleSink.java
index b59876fdc59..334651c808e 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/SimpleSink.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/SimpleSink.java
@@ -19,6 +19,7 @@
import java.nio.ByteBuffer;
import java.nio.channels.WritableByteChannel;
+import java.nio.charset.StandardCharsets;
import org.apache.beam.sdk.io.DefaultFilenamePolicy.Params;
import org.apache.beam.sdk.io.fs.ResolveOptions.StandardResolveOptions;
import org.apache.beam.sdk.io.fs.ResourceId;
@@ -114,7 +115,7 @@ public SimpleWriter(SimpleWriteOperation writeOperation) {
}
private static ByteBuffer wrap(String value) throws Exception {
- return ByteBuffer.wrap((value + "\n").getBytes("UTF-8"));
+ return ByteBuffer.wrap((value + "\n").getBytes(StandardCharsets.UTF_8));
}
@Override
diff --git
a/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/PAssertTest.java
b/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/PAssertTest.java
index 2a790605858..361be152b16 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/PAssertTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/PAssertTest.java
@@ -505,8 +505,8 @@ public void testAssertionSiteIsCaptured() {
// This check should return a failure.
SuccessOrFailure res = PAssert.doChecks(
PAssert.PAssertionSite.capture("Captured assertion message."),
- new Integer(10),
- new MatcherCheckerFn(SerializableMatchers.contains(new Integer(11))));
+ Integer.valueOf(10),
+ new
MatcherCheckerFn(SerializableMatchers.contains(Integer.valueOf(11))));
String stacktrace = Throwables.getStackTraceAsString(res.assertionError());
assertEquals(res.isSuccess(), false);
diff --git
a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubUnboundedSource.java
b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubUnboundedSource.java
index 2271786fe31..a142cef0ba0 100644
---
a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubUnboundedSource.java
+++
b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubUnboundedSource.java
@@ -24,12 +24,12 @@
import com.google.api.client.util.Clock;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Charsets;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
import java.security.GeneralSecurityException;
import java.util.ArrayDeque;
import java.util.ArrayList;
@@ -989,7 +989,7 @@ public Instant getCurrentTimestamp() throws
NoSuchElementException {
if (current == null) {
throw new NoSuchElementException();
}
- return current.recordId.getBytes(Charsets.UTF_8);
+ return current.recordId.getBytes(StandardCharsets.UTF_8);
}
/**
diff --git
a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/FakeBigQueryServices.java
b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/FakeBigQueryServices.java
index 7506cdef5ba..0a384e74e17 100644
---
a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/FakeBigQueryServices.java
+++
b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/FakeBigQueryServices.java
@@ -76,7 +76,7 @@ static String encodeQuery(List<TableRow> rows) throws
IOException {
static TableRow convertNumbers(TableRow tableRow) {
for (TableRow.Entry entry : tableRow.entrySet()) {
if (entry.getValue() instanceof Integer) {
- entry.setValue(new Long((Integer) entry.getValue()));
+ entry.setValue(Long.valueOf((Integer) entry.getValue()));
}
}
return tableRow;
diff --git
a/sdks/java/io/hbase/src/test/java/org/apache/beam/sdk/io/hbase/SerializableScanTest.java
b/sdks/java/io/hbase/src/test/java/org/apache/beam/sdk/io/hbase/SerializableScanTest.java
index 7d2fd280240..bd2faba22e7 100644
---
a/sdks/java/io/hbase/src/test/java/org/apache/beam/sdk/io/hbase/SerializableScanTest.java
+++
b/sdks/java/io/hbase/src/test/java/org/apache/beam/sdk/io/hbase/SerializableScanTest.java
@@ -20,6 +20,8 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import java.nio.charset.StandardCharsets;
+
import org.apache.commons.lang3.SerializationUtils;
import org.apache.hadoop.hbase.client.Scan;
import org.junit.Rule;
@@ -37,11 +39,11 @@
@Test
public void testSerializationDeserialization() throws Exception {
- Scan scan = new Scan().setStartRow("1".getBytes("UTF-8"));
+ Scan scan = new Scan().setStartRow("1".getBytes(StandardCharsets.UTF_8));
byte[] object = SerializationUtils.serialize(new SerializableScan(scan));
SerializableScan serScan = SerializationUtils.deserialize(object);
assertNotNull(serScan);
- assertEquals(new String(serScan.get().getStartRow(), "UTF-8"), "1");
+ assertEquals(new String(serScan.get().getStartRow(),
StandardCharsets.UTF_8), "1");
}
@Test
diff --git
a/sdks/java/io/jms/src/test/java/org/apache/beam/sdk/io/jms/JmsIOTest.java
b/sdks/java/io/jms/src/test/java/org/apache/beam/sdk/io/jms/JmsIOTest.java
index 34a3437f286..2aa6dabaeab 100644
--- a/sdks/java/io/jms/src/test/java/org/apache/beam/sdk/io/jms/JmsIOTest.java
+++ b/sdks/java/io/jms/src/test/java/org/apache/beam/sdk/io/jms/JmsIOTest.java
@@ -169,7 +169,7 @@ public void testReadMessages() throws Exception {
PAssert
.thatSingleton(output.apply("Count", Count.<JmsRecord>globally()))
- .isEqualTo(new Long(5));
+ .isEqualTo(Long.valueOf(5));
pipeline.run();
connection = connectionFactory.createConnection(USERNAME, PASSWORD);
diff --git
a/sdks/java/io/kinesis/src/main/java/org/apache/beam/sdk/io/kinesis/KinesisRecord.java
b/sdks/java/io/kinesis/src/main/java/org/apache/beam/sdk/io/kinesis/KinesisRecord.java
index 057b7bb5ff7..e980c7597ee 100644
---
a/sdks/java/io/kinesis/src/main/java/org/apache/beam/sdk/io/kinesis/KinesisRecord.java
+++
b/sdks/java/io/kinesis/src/main/java/org/apache/beam/sdk/io/kinesis/KinesisRecord.java
@@ -21,9 +21,9 @@
import
com.amazonaws.services.kinesis.clientlibrary.types.ExtendedSequenceNumber;
import com.amazonaws.services.kinesis.clientlibrary.types.UserRecord;
-import com.google.common.base.Charsets;
import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.joda.time.Instant;
@@ -72,7 +72,7 @@ public ExtendedSequenceNumber getExtendedSequenceNumber() {
* @return unique id of the record based on its position in the stream
*/
public byte[] getUniqueId() {
- return getExtendedSequenceNumber().toString().getBytes(Charsets.UTF_8);
+ return
getExtendedSequenceNumber().toString().getBytes(StandardCharsets.UTF_8);
}
public Instant getReadTime() {
diff --git
a/sdks/java/io/kinesis/src/test/java/org/apache/beam/sdk/io/kinesis/KinesisUploader.java
b/sdks/java/io/kinesis/src/test/java/org/apache/beam/sdk/io/kinesis/KinesisUploader.java
index 8fbafd31b0a..41bade64702 100644
---
a/sdks/java/io/kinesis/src/test/java/org/apache/beam/sdk/io/kinesis/KinesisUploader.java
+++
b/sdks/java/io/kinesis/src/test/java/org/apache/beam/sdk/io/kinesis/KinesisUploader.java
@@ -25,9 +25,9 @@
import com.amazonaws.services.kinesis.model.PutRecordsRequestEntry;
import com.amazonaws.services.kinesis.model.PutRecordsResult;
import com.amazonaws.services.kinesis.model.PutRecordsResultEntry;
-import com.google.common.base.Charsets;
import com.google.common.collect.Lists;
import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
@@ -52,7 +52,7 @@ public static void uploadAll(List<String> data,
KinesisTestOptions options) {
List<PutRecordsRequestEntry> allRecords = new ArrayList<>();
for (String row : partition) {
allRecords.add(new PutRecordsRequestEntry().
- withData(ByteBuffer.wrap(row.getBytes(Charsets.UTF_8))).
+ withData(ByteBuffer.wrap(row.getBytes(StandardCharsets.UTF_8))).
withPartitionKey(Integer.toString(row.hashCode()))
);
diff --git
a/sdks/java/io/mongodb/src/main/java/org/apache/beam/sdk/io/mongodb/MongoDbGridFSIO.java
b/sdks/java/io/mongodb/src/main/java/org/apache/beam/sdk/io/mongodb/MongoDbGridFSIO.java
index 4dc2405e59c..cab2e653d68 100644
---
a/sdks/java/io/mongodb/src/main/java/org/apache/beam/sdk/io/mongodb/MongoDbGridFSIO.java
+++
b/sdks/java/io/mongodb/src/main/java/org/apache/beam/sdk/io/mongodb/MongoDbGridFSIO.java
@@ -35,6 +35,7 @@
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -180,7 +181,7 @@ public void parse(GridFSDBFile input,
ParserCallback<String> callback)
.setWriteFn(new WriteFn<String>() {
@Override
public void write(String output, OutputStream outStream) throws
IOException {
- outStream.write(output.getBytes("utf-8"));
+ outStream.write(output.getBytes(StandardCharsets.UTF_8));
outStream.write('\n');
}
}).build();
diff --git
a/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDBGridFSIOTest.java
b/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDBGridFSIOTest.java
index 19f8d87eb3f..a03836878cd 100644
---
a/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDBGridFSIOTest.java
+++
b/sdks/java/io/mongodb/src/test/java/org/apache/beam/sdk/io/mongodb/MongoDBGridFSIOTest.java
@@ -48,6 +48,7 @@
import java.io.OutputStreamWriter;
import java.io.Serializable;
import java.net.ServerSocket;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
@@ -336,7 +337,7 @@ public void write(Integer output, OutputStream outStream)
throws IOException {
DataInputStream dis = new DataInputStream(ins);
byte b[] = new byte[l];
dis.readFully(b);
- results.append(new String(b, "utf-8"));
+ results.append(new String(b, StandardCharsets.UTF_8));
}
}
String dataString = results.toString();
diff --git
a/sdks/java/io/xml/src/main/java/org/apache/beam/sdk/io/xml/XmlIO.java
b/sdks/java/io/xml/src/main/java/org/apache/beam/sdk/io/xml/XmlIO.java
index 798ad118c41..0684ae1a3fd 100644
--- a/sdks/java/io/xml/src/main/java/org/apache/beam/sdk/io/xml/XmlIO.java
+++ b/sdks/java/io/xml/src/main/java/org/apache/beam/sdk/io/xml/XmlIO.java
@@ -105,7 +105,8 @@
public static <T> Read<T> read() {
return new AutoValue_XmlIO_Read.Builder<T>()
.setConfiguration(
- new
AutoValue_XmlIO_MappingConfiguration.Builder<T>().setCharset("UTF-8").build())
+ new AutoValue_XmlIO_MappingConfiguration.Builder<T>().setCharset(
+ StandardCharsets.UTF_8.name()).build())
.setMinBundleSize(1L)
.setCompression(Compression.AUTO)
.build();
@@ -133,7 +134,8 @@
public static <T> ReadFiles<T> readFiles() {
return new AutoValue_XmlIO_ReadFiles.Builder<T>()
.setConfiguration(
- new
AutoValue_XmlIO_MappingConfiguration.Builder<T>().setCharset("UTF-8").build())
+ new AutoValue_XmlIO_MappingConfiguration.Builder<T>().setCharset(
+ StandardCharsets.UTF_8.name()).build())
.build();
}
@@ -144,7 +146,7 @@
* {@link FileIO#writeDynamic}.
*/
public static <T> Write<T> write() {
- return new AutoValue_XmlIO_Write.Builder<T>().setCharset("UTF-8").build();
+ return new
AutoValue_XmlIO_Write.Builder<T>().setCharset(StandardCharsets.UTF_8.name()).build();
}
@AutoValue
@@ -630,7 +632,7 @@ public void open(WritableByteChannel channel) throws
IOException {
}
this.outputStream = Channels.newOutputStream(channel);
- outputStream.write(("<" + getRootElement() +
">\n").getBytes(getCharset()));
+ outputStream.write(("<" + getRootElement() +
">\n").getBytes(Charset.forName(getCharset())));
}
@Override
@@ -644,7 +646,7 @@ public void write(T element) throws IOException {
@Override
public void flush() throws IOException {
- outputStream.write(("\n</" + getRootElement() +
">").getBytes(getCharset()));
+ outputStream.write(("\n</" + getRootElement() +
">").getBytes(Charset.forName(getCharset())));
}
}
}
diff --git
a/sdks/java/io/xml/src/main/java/org/apache/beam/sdk/io/xml/XmlSource.java
b/sdks/java/io/xml/src/main/java/org/apache/beam/sdk/io/xml/XmlSource.java
index 921cd7a1c36..287cdda004c 100644
--- a/sdks/java/io/xml/src/main/java/org/apache/beam/sdk/io/xml/XmlSource.java
+++ b/sdks/java/io/xml/src/main/java/org/apache/beam/sdk/io/xml/XmlSource.java
@@ -27,6 +27,7 @@
import java.nio.CharBuffer;
import java.nio.channels.Channels;
import java.nio.channels.ReadableByteChannel;
+import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.NoSuchElementException;
import javax.xml.bind.JAXBContext;
@@ -180,7 +181,7 @@ protected void startReading(ReadableByteChannel channel)
throws IOException {
+ getCurrentSource().configuration.getCharset()
+ "\"?><%s>",
XML_VERSION,
getCurrentSource().configuration.getRootElement()))
- .getBytes(getCurrentSource().configuration.getCharset());
+
.getBytes(Charset.forName(getCurrentSource().configuration.getCharset()));
preambleByteBuffer.write(dummyStartDocumentBytes);
// Gets the byte offset (in the input file) of the first record in
ReadableByteChannel. This
// method returns the offset and stores any bytes that should be used
when creating the XML
diff --git
a/sdks/java/nexmark/src/main/java/org/apache/beam/sdk/nexmark/queries/Query10.java
b/sdks/java/nexmark/src/main/java/org/apache/beam/sdk/nexmark/queries/Query10.java
index 1c4e44377af..3d477ab2e2b 100644
---
a/sdks/java/nexmark/src/main/java/org/apache/beam/sdk/nexmark/queries/Query10.java
+++
b/sdks/java/nexmark/src/main/java/org/apache/beam/sdk/nexmark/queries/Query10.java
@@ -22,6 +22,7 @@
import java.io.Serializable;
import java.nio.channels.Channels;
import java.nio.channels.WritableByteChannel;
+import java.nio.charset.StandardCharsets;
import java.util.concurrent.ThreadLocalRandom;
import javax.annotation.Nullable;
import org.apache.beam.sdk.coders.Coder;
@@ -346,7 +347,7 @@ public void processElement(ProcessContext c, BoundedWindow
window)
Channels.newOutputStream(
openWritableGcsFile(options, filename))) {
for (OutputFile outputFile : c.element().getValue()) {
- output.write(outputFile.toString().getBytes("UTF-8"));
+
output.write(outputFile.toString().getBytes(StandardCharsets.UTF_8));
n++;
}
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> Replace hard-coded UTF-8 Strings
> --------------------------------
>
> Key: BEAM-3533
> URL: https://issues.apache.org/jira/browse/BEAM-3533
> Project: Beam
> Issue Type: Improvement
> Components: beam-model
> Reporter: Colm O hEigeartaigh
> Assignee: Jean-Baptiste Onofré
> Priority: Trivial
> Fix For: 2.3.0
>
>
> This task is to replace hard-coded UTF-8 Strings in the code with
> StandardCharsets.UTF_8 instead.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
