diff --git a/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkPortableClientEntryPoint.java b/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkPortableClientEntryPoint.java
index df0f07c915a7..296e14590834 100644
--- a/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkPortableClientEntryPoint.java
+++ b/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkPortableClientEntryPoint.java
@@ -18,7 +18,7 @@
package org.apache.beam.runners.flink;
import java.io.File;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.time.Duration;
import java.util.Arrays;
@@ -188,7 +188,7 @@ private void runDriverProgram() throws Exception {
String msg =
String.format(
"Failed to start job with driver program: %s %s output: %s",
- executable, args, new String(output, Charset.defaultCharset()));
+ executable, args, new String(output, StandardCharsets.UTF_8));
throw new RuntimeException(msg, e);
}
}
diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/logging/JulHandlerPrintStreamAdapterFactory.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/logging/JulHandlerPrintStreamAdapterFactory.java
index bcdd8c1d0527..9e401d1f24de 100644
--- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/logging/JulHandlerPrintStreamAdapterFactory.java
+++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/logging/JulHandlerPrintStreamAdapterFactory.java
@@ -69,6 +69,7 @@ private static class JulHandlerPrintStream extends PrintStream {
private int carryOverBytes;
private byte[] carryOverByteArray;
+ @SuppressWarnings("ForbidDefaultCharset")
private JulHandlerPrintStream(Handler handler, String loggerName, Level logLevel)
throws UnsupportedEncodingException {
super(
diff --git a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/logging/JulHandlerPrintStreamAdapterFactoryTest.java b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/logging/JulHandlerPrintStreamAdapterFactoryTest.java
index 804ec532f840..82fe24747dda 100644
--- a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/logging/JulHandlerPrintStreamAdapterFactoryTest.java
+++ b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/logging/JulHandlerPrintStreamAdapterFactoryTest.java
@@ -25,7 +25,7 @@
import static org.junit.Assert.assertThat;
import java.io.PrintStream;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.logging.Level;
import java.util.logging.LogRecord;
import org.apache.beam.runners.dataflow.worker.LogSaver;
@@ -124,14 +124,14 @@ public void testLogOnClose() {
public void testLogRawBytes() {
PrintStream printStream = createPrintStreamAdapter();
String msg = "♠ ♡ ♢ ♣ ♤ ♥ ♦ ♧";
- byte[] bytes = msg.getBytes(Charset.defaultCharset());
+ byte[] bytes = msg.getBytes(StandardCharsets.UTF_8);
printStream.write(bytes, 0, 1);
printStream.write(bytes, 1, 4);
printStream.write(bytes, 5, 15);
printStream.write(bytes, 20, bytes.length - 20);
assertThat(handler.getLogs(), is(empty()));
String newlineMsg = "♠ ♡ \n♦ ♧";
- byte[] newlineMsgBytes = newlineMsg.getBytes(Charset.defaultCharset());
+ byte[] newlineMsgBytes = newlineMsg.getBytes(StandardCharsets.UTF_8);
printStream.write(newlineMsgBytes, 0, newlineMsgBytes.length);
assertThat(handler.getLogs(), hasLogItem(msg + newlineMsg));
}
@@ -154,7 +154,7 @@ public void testNoEmptyMessages() {
printStream.flush();
printStream.print("");
printStream.flush();
- byte[] bytes = "a".getBytes(Charset.defaultCharset());
+ byte[] bytes = "a".getBytes(StandardCharsets.UTF_8);
printStream.write(bytes, 0, 0);
printStream.flush();
}
diff --git a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/environment/ProcessManagerTest.java b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/environment/ProcessManagerTest.java
index d2d9d4753399..b70ddec860d2 100644
--- a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/environment/ProcessManagerTest.java
+++ b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/environment/ProcessManagerTest.java
@@ -30,7 +30,7 @@
import java.io.File;
import java.io.IOException;
import java.io.PrintStream;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.Arrays;
import java.util.Collections;
@@ -130,7 +130,7 @@ public void testRedirectOutput() throws IOException, InterruptedException {
processManager.stopProcess("1");
byte[] output = Files.readAllBytes(outputFile.toPath());
assertNotNull(output);
- String outputStr = new String(output, Charset.defaultCharset());
+ String outputStr = new String(output, StandardCharsets.UTF_8);
assertThat(outputStr, containsString("testing123"));
}
@@ -158,7 +158,7 @@ public void testInheritIO() throws IOException, InterruptedException {
}
// TODO: this doesn't work as inherit IO bypasses System.out/err
// the output instead appears in the console
- // String outputStr = new String(baos.toByteArray(), Charset.defaultCharset());
+ // String outputStr = new String(baos.toByteArray(), StandardCharsets.UTF_8);
// assertThat(outputStr, containsString("testing123"));
assertFalse(ProcessManager.INHERIT_IO_FILE.exists());
}
diff --git a/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml b/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml
index c168453be8fd..43a0f5c41e34 100644
--- a/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml
+++ b/sdks/java/build-tools/src/main/resources/beam/checkstyle.xml
@@ -119,6 +119,14 @@ page at http://checkstyle.sourceforge.net/config.html -->
+
+
+
+
+
+
+
+
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/AvroUtils.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/AvroUtils.java
index 4b66409f5d8d..7da4f7c639fc 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/AvroUtils.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/AvroUtils.java
@@ -28,7 +28,7 @@
import java.lang.reflect.Method;
import java.math.BigDecimal;
import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -453,7 +453,7 @@ public Row apply(byte[] bytes) {
} catch (Exception e) {
throw new AvroRuntimeException(
"Could not decode avro record from given bytes "
- + new String(bytes, Charset.defaultCharset()),
+ + new String(bytes, StandardCharsets.UTF_8),
e);
}
}
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/AutoValueSchemaTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/AutoValueSchemaTest.java
index 867b87c1493f..cabd9bd150b1 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/AutoValueSchemaTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/AutoValueSchemaTest.java
@@ -26,7 +26,7 @@
import com.google.auto.value.AutoValue;
import java.math.BigDecimal;
import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import org.apache.beam.sdk.schemas.Schema.Field;
import org.apache.beam.sdk.schemas.Schema.FieldType;
import org.apache.beam.sdk.schemas.annotations.DefaultSchema;
@@ -50,7 +50,7 @@
})
public class AutoValueSchemaTest {
static final DateTime DATE = DateTime.parse("1979-03-14");
- static final byte[] BYTE_ARRAY = "bytearray".getBytes(Charset.defaultCharset());
+ static final byte[] BYTE_ARRAY = "bytearray".getBytes(StandardCharsets.UTF_8);
static final StringBuilder STRING_BUILDER = new StringBuilder("stringbuilder");
static final Schema SIMPLE_SCHEMA =
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/JavaBeanSchemaTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/JavaBeanSchemaTest.java
index 9833aceb81b9..294e8c78ff75 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/JavaBeanSchemaTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/JavaBeanSchemaTest.java
@@ -40,7 +40,7 @@
import java.math.BigDecimal;
import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -77,7 +77,7 @@
})
public class JavaBeanSchemaTest {
static final DateTime DATE = DateTime.parse("1979-03-14");
- static final byte[] BYTE_ARRAY = "bytearray".getBytes(Charset.defaultCharset());
+ static final byte[] BYTE_ARRAY = "bytearray".getBytes(StandardCharsets.UTF_8);
private SimpleBean createSimple(String name) {
return new SimpleBean(
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/JavaFieldSchemaTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/JavaFieldSchemaTest.java
index bb9223ae2fe6..96df6748136a 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/JavaFieldSchemaTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/JavaFieldSchemaTest.java
@@ -43,7 +43,7 @@
import java.math.BigDecimal;
import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -86,9 +86,9 @@
public class JavaFieldSchemaTest {
static final DateTime DATE = DateTime.parse("1979-03-14");
static final Instant INSTANT = DateTime.parse("1979-03-15").toInstant();
- static final byte[] BYTE_ARRAY = "bytearray".getBytes(Charset.defaultCharset());
+ static final byte[] BYTE_ARRAY = "bytearray".getBytes(StandardCharsets.UTF_8);
static final ByteBuffer BYTE_BUFFER =
- ByteBuffer.wrap("byteBuffer".getBytes(Charset.defaultCharset()));
+ ByteBuffer.wrap("byteBuffer".getBytes(StandardCharsets.UTF_8));
private SimplePOJO createSimple(String name) {
return new SimplePOJO(
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/utils/JavaBeanUtilsTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/utils/JavaBeanUtilsTest.java
index 51b221c24a6b..878b16616908 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/utils/JavaBeanUtilsTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/utils/JavaBeanUtilsTest.java
@@ -33,7 +33,7 @@
import java.math.BigDecimal;
import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import org.apache.beam.sdk.schemas.FieldValueGetter;
import org.apache.beam.sdk.schemas.FieldValueSetter;
@@ -131,8 +131,8 @@ public void testGeneratedSimpleGetters() {
simpleBean.setaBoolean(true);
simpleBean.setDateTime(DateTime.parse("1979-03-14"));
simpleBean.setInstant(DateTime.parse("1979-03-15").toInstant());
- simpleBean.setBytes("bytes1".getBytes(Charset.defaultCharset()));
- simpleBean.setByteBuffer(ByteBuffer.wrap("bytes2".getBytes(Charset.defaultCharset())));
+ simpleBean.setBytes("bytes1".getBytes(StandardCharsets.UTF_8));
+ simpleBean.setByteBuffer(ByteBuffer.wrap("bytes2".getBytes(StandardCharsets.UTF_8)));
simpleBean.setBigDecimal(new BigDecimal(42));
simpleBean.setStringBuilder(new StringBuilder("stringBuilder"));
@@ -155,11 +155,11 @@ public void testGeneratedSimpleGetters() {
assertEquals(DateTime.parse("1979-03-15").toInstant(), getters.get(7).get(simpleBean));
assertArrayEquals(
"Unexpected bytes",
- "bytes1".getBytes(Charset.defaultCharset()),
+ "bytes1".getBytes(StandardCharsets.UTF_8),
(byte[]) getters.get(8).get(simpleBean));
assertArrayEquals(
"Unexpected bytes",
- "bytes2".getBytes(Charset.defaultCharset()),
+ "bytes2".getBytes(StandardCharsets.UTF_8),
(byte[]) getters.get(9).get(simpleBean));
assertEquals(new BigDecimal(42), getters.get(10).get(simpleBean));
assertEquals("stringBuilder", getters.get(11).get(simpleBean).toString());
@@ -184,8 +184,8 @@ public void testGeneratedSimpleSetters() {
setters.get(5).set(simpleBean, true);
setters.get(6).set(simpleBean, DateTime.parse("1979-03-14").toInstant());
setters.get(7).set(simpleBean, DateTime.parse("1979-03-15").toInstant());
- setters.get(8).set(simpleBean, "bytes1".getBytes(Charset.defaultCharset()));
- setters.get(9).set(simpleBean, "bytes2".getBytes(Charset.defaultCharset()));
+ setters.get(8).set(simpleBean, "bytes1".getBytes(StandardCharsets.UTF_8));
+ setters.get(9).set(simpleBean, "bytes2".getBytes(StandardCharsets.UTF_8));
setters.get(10).set(simpleBean, new BigDecimal(42));
setters.get(11).set(simpleBean, "stringBuilder");
@@ -198,9 +198,9 @@ public void testGeneratedSimpleSetters() {
assertEquals(DateTime.parse("1979-03-14"), simpleBean.getDateTime());
assertEquals(DateTime.parse("1979-03-15").toInstant(), simpleBean.getInstant());
assertArrayEquals(
- "Unexpected bytes", "bytes1".getBytes(Charset.defaultCharset()), simpleBean.getBytes());
+ "Unexpected bytes", "bytes1".getBytes(StandardCharsets.UTF_8), simpleBean.getBytes());
assertEquals(
- ByteBuffer.wrap("bytes2".getBytes(Charset.defaultCharset())), simpleBean.getByteBuffer());
+ ByteBuffer.wrap("bytes2".getBytes(StandardCharsets.UTF_8)), simpleBean.getByteBuffer());
assertEquals(new BigDecimal(42), simpleBean.getBigDecimal());
assertEquals("stringBuilder", simpleBean.getStringBuilder().toString());
}
@@ -259,10 +259,10 @@ public void testGeneratedByteBufferSetters() {
BEAN_WITH_BYTE_ARRAY_SCHEMA,
new SetterTypeSupplier(),
new DefaultTypeConversionsFactory());
- setters.get(0).set(bean, "field1".getBytes(Charset.defaultCharset()));
- setters.get(1).set(bean, "field2".getBytes(Charset.defaultCharset()));
+ setters.get(0).set(bean, "field1".getBytes(StandardCharsets.UTF_8));
+ setters.get(1).set(bean, "field2".getBytes(StandardCharsets.UTF_8));
- assertArrayEquals("not equal", "field1".getBytes(Charset.defaultCharset()), bean.getBytes1());
- assertEquals(ByteBuffer.wrap("field2".getBytes(Charset.defaultCharset())), bean.getBytes2());
+ assertArrayEquals("not equal", "field1".getBytes(StandardCharsets.UTF_8), bean.getBytes1());
+ assertEquals(ByteBuffer.wrap("field2".getBytes(StandardCharsets.UTF_8)), bean.getBytes2());
}
}
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/utils/POJOUtilsTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/utils/POJOUtilsTest.java
index ff05402f15b1..03477a9dbfb3 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/utils/POJOUtilsTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/utils/POJOUtilsTest.java
@@ -33,7 +33,7 @@
import java.math.BigDecimal;
import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import org.apache.beam.sdk.schemas.FieldValueGetter;
import org.apache.beam.sdk.schemas.FieldValueSetter;
@@ -62,9 +62,9 @@
public class POJOUtilsTest {
static final DateTime DATE = DateTime.parse("1979-03-14");
static final Instant INSTANT = DateTime.parse("1979-03-15").toInstant();
- static final byte[] BYTE_ARRAY = "byteArray".getBytes(Charset.defaultCharset());
+ static final byte[] BYTE_ARRAY = "byteArray".getBytes(StandardCharsets.UTF_8);
static final ByteBuffer BYTE_BUFFER =
- ByteBuffer.wrap("byteBuffer".getBytes(Charset.defaultCharset()));
+ ByteBuffer.wrap("byteBuffer".getBytes(StandardCharsets.UTF_8));
@Test
public void testNullables() {
diff --git a/sdks/java/extensions/google-cloud-platform-core/src/main/java/org/apache/beam/sdk/extensions/gcp/util/GceMetadataUtil.java b/sdks/java/extensions/google-cloud-platform-core/src/main/java/org/apache/beam/sdk/extensions/gcp/util/GceMetadataUtil.java
index 6736844870ae..711310217244 100644
--- a/sdks/java/extensions/google-cloud-platform-core/src/main/java/org/apache/beam/sdk/extensions/gcp/util/GceMetadataUtil.java
+++ b/sdks/java/extensions/google-cloud-platform-core/src/main/java/org/apache/beam/sdk/extensions/gcp/util/GceMetadataUtil.java
@@ -21,7 +21,7 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.io.CharStreams;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
@@ -50,7 +50,7 @@ static String fetchMetadata(String key) {
return "";
}
InputStream in = response.getEntity().getContent();
- try (final Reader reader = new InputStreamReader(in, Charset.defaultCharset())) {
+ try (final Reader reader = new InputStreamReader(in, StandardCharsets.UTF_8)) {
return CharStreams.toString(reader);
}
} catch (IOException e) {
diff --git a/sdks/java/extensions/schemaio-expansion-service/src/test/java/org/apache/beam/sdk/extensions/schemaio/expansion/ExternalSchemaIOTransformRegistrarTest.java b/sdks/java/extensions/schemaio-expansion-service/src/test/java/org/apache/beam/sdk/extensions/schemaio/expansion/ExternalSchemaIOTransformRegistrarTest.java
index 9d9bdcff3dd2..31b8dac47b7b 100644
--- a/sdks/java/extensions/schemaio-expansion-service/src/test/java/org/apache/beam/sdk/extensions/schemaio/expansion/ExternalSchemaIOTransformRegistrarTest.java
+++ b/sdks/java/extensions/schemaio-expansion-service/src/test/java/org/apache/beam/sdk/extensions/schemaio/expansion/ExternalSchemaIOTransformRegistrarTest.java
@@ -23,7 +23,7 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import javax.annotation.Nullable;
import org.apache.beam.sdk.coders.RowCoder;
import org.apache.beam.sdk.extensions.schemaio.expansion.ExternalSchemaIOTransformRegistrar.Configuration;
@@ -49,7 +49,7 @@ public class ExternalSchemaIOTransformRegistrarTest {
Row validConfigRow = Row.withSchema(validConfigSchema).addValue("value").build();
byte[] validSchemaBytes = SchemaTranslation.schemaToProto(validDataSchema, true).toByteArray();
- byte[] invalidBytes = "Nice try".getBytes(Charset.defaultCharset());
+ byte[] invalidBytes = "Nice try".getBytes(StandardCharsets.UTF_8);
SchemaIO schemaIO = Mockito.mock(SchemaIO.class);
SchemaIOProvider schemaIOProvider = Mockito.mock(SchemaIOProvider.class);
diff --git a/sdks/java/extensions/sorter/src/test/java/org/apache/beam/sdk/extensions/sorter/ExternalSorterBenchmark.java b/sdks/java/extensions/sorter/src/test/java/org/apache/beam/sdk/extensions/sorter/ExternalSorterBenchmark.java
index 620711f9ac8f..0daff56962da 100644
--- a/sdks/java/extensions/sorter/src/test/java/org/apache/beam/sdk/extensions/sorter/ExternalSorterBenchmark.java
+++ b/sdks/java/extensions/sorter/src/test/java/org/apache/beam/sdk/extensions/sorter/ExternalSorterBenchmark.java
@@ -19,7 +19,7 @@
import java.io.File;
import java.io.IOException;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.UUID;
import org.apache.beam.sdk.extensions.sorter.ExternalSorter.Options.SorterType;
@@ -48,8 +48,8 @@ private static void benchmark(Sorter sorter) throws IOException {
for (int i = 0; i < N; i++) {
sorter.add(
KV.of(
- UUID.randomUUID().toString().getBytes(Charset.defaultCharset()),
- UUID.randomUUID().toString().getBytes(Charset.defaultCharset())));
+ UUID.randomUUID().toString().getBytes(StandardCharsets.UTF_8),
+ UUID.randomUUID().toString().getBytes(StandardCharsets.UTF_8)));
}
int i = 0;
for (KV ignored : sorter.sort()) {
diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/EntityToRowRowToEntityTest.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/EntityToRowRowToEntityTest.java
index 159a13164977..66c22619fc15 100644
--- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/EntityToRowRowToEntityTest.java
+++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/datastore/EntityToRowRowToEntityTest.java
@@ -31,7 +31,7 @@
import com.google.datastore.v1.Key;
import com.google.datastore.v1.Value;
import com.google.protobuf.ByteString;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
import java.util.UUID;
@@ -91,7 +91,7 @@ public class EntityToRowRowToEntityTest {
makeValue(Collections.singletonList(makeValue(NESTED_ENTITY).build())).build())
.putProperties("double", makeValue(Double.MAX_VALUE).build())
.putProperties(
- "bytes", makeValue(ByteString.copyFrom("hello", Charset.defaultCharset())).build())
+ "bytes", makeValue(ByteString.copyFrom("hello", StandardCharsets.UTF_8)).build())
.putProperties("string", makeValue("string").build())
.putProperties("nullable", Value.newBuilder().build())
.build();
@@ -105,7 +105,7 @@ public class EntityToRowRowToEntityTest {
Arrays.asList("string1", "string2"),
Collections.singletonList(row(NESTED_ROW_SCHEMA, Long.MIN_VALUE)),
Double.MAX_VALUE,
- "hello".getBytes(Charset.defaultCharset()),
+ "hello".getBytes(StandardCharsets.UTF_8),
"string",
null);
diff --git a/sdks/java/io/hadoop-format/src/test/java/org/apache/beam/sdk/io/hadoop/format/HadoopFormatIOCassandraTest.java b/sdks/java/io/hadoop-format/src/test/java/org/apache/beam/sdk/io/hadoop/format/HadoopFormatIOCassandraTest.java
index 3bbc81c2d3e2..f37d4d2f9d6a 100644
--- a/sdks/java/io/hadoop-format/src/test/java/org/apache/beam/sdk/io/hadoop/format/HadoopFormatIOCassandraTest.java
+++ b/sdks/java/io/hadoop-format/src/test/java/org/apache/beam/sdk/io/hadoop/format/HadoopFormatIOCassandraTest.java
@@ -26,7 +26,7 @@
import java.io.File;
import java.io.Serializable;
import java.net.URI;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import org.apache.beam.sdk.io.common.HashingFn;
@@ -209,10 +209,10 @@ public static void beforeClass() throws Exception {
private static void replacePortsInConfFile() throws Exception {
URI uri = HadoopFormatIOCassandraTest.class.getResource("/cassandra.yaml").toURI();
Path cassandraYamlPath = new File(uri).toPath();
- String content = new String(Files.readAllBytes(cassandraYamlPath), Charset.defaultCharset());
+ String content = new String(Files.readAllBytes(cassandraYamlPath), StandardCharsets.UTF_8);
content = content.replaceAll("9042", String.valueOf(cassandraNativePort));
content = content.replaceAll("9061", String.valueOf(cassandraPort));
- Files.write(cassandraYamlPath, content.getBytes(Charset.defaultCharset()));
+ Files.write(cassandraYamlPath, content.getBytes(StandardCharsets.UTF_8));
}
@AfterClass
diff --git a/sdks/java/io/kafka/src/test/java/org/apache/beam/sdk/io/kafka/KafkaIOTest.java b/sdks/java/io/kafka/src/test/java/org/apache/beam/sdk/io/kafka/KafkaIOTest.java
index 1f7d5902fb26..4b7fddffb095 100644
--- a/sdks/java/io/kafka/src/test/java/org/apache/beam/sdk/io/kafka/KafkaIOTest.java
+++ b/sdks/java/io/kafka/src/test/java/org/apache/beam/sdk/io/kafka/KafkaIOTest.java
@@ -41,7 +41,7 @@
import java.io.IOException;
import java.lang.reflect.Method;
import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.AbstractMap.SimpleEntry;
import java.util.ArrayList;
import java.util.Arrays;
@@ -1408,7 +1408,7 @@ public void testKafkaWriteHeaders() throws Exception {
assertEquals(1, headersArray.length);
assertEquals(header.getKey(), headersArray[0].key());
assertEquals(
- header.getValue(), new String(headersArray[0].value(), Charset.defaultCharset()));
+ header.getValue(), new String(headersArray[0].value(), StandardCharsets.UTF_8));
}
}
}
@@ -1491,7 +1491,7 @@ public void processElement(ProcessContext ctx) {
headers =
Arrays.asList(
new RecordHeader(
- header.getKey(), header.getValue().getBytes(Charset.defaultCharset())));
+ header.getKey(), header.getValue().getBytes(StandardCharsets.UTF_8)));
}
if (isSingleTopic) {
ctx.output(new ProducerRecord<>(topic, null, ts, kv.getKey(), kv.getValue(), headers));
diff --git a/sdks/java/io/snowflake/src/main/java/org/apache/beam/sdk/io/snowflake/KeyPairUtils.java b/sdks/java/io/snowflake/src/main/java/org/apache/beam/sdk/io/snowflake/KeyPairUtils.java
index 437e96a07764..ca5753cc396d 100644
--- a/sdks/java/io/snowflake/src/main/java/org/apache/beam/sdk/io/snowflake/KeyPairUtils.java
+++ b/sdks/java/io/snowflake/src/main/java/org/apache/beam/sdk/io/snowflake/KeyPairUtils.java
@@ -18,7 +18,7 @@
package org.apache.beam.sdk.io.snowflake;
import java.io.IOException;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.security.InvalidKeyException;
@@ -59,7 +59,7 @@ public static PrivateKey preparePrivateKey(String privateKey, String privateKeyP
public static String readPrivateKeyFile(String privateKeyPath) {
try {
byte[] keyBytes = Files.readAllBytes(Paths.get(privateKeyPath));
- return new String(keyBytes, Charset.defaultCharset());
+ return new String(keyBytes, StandardCharsets.UTF_8);
} catch (IOException e) {
throw new RuntimeException("Can't read private key from provided path");
}
diff --git a/sdks/java/io/snowflake/src/main/java/org/apache/beam/sdk/io/snowflake/crosslanguage/ReadBuilder.java b/sdks/java/io/snowflake/src/main/java/org/apache/beam/sdk/io/snowflake/crosslanguage/ReadBuilder.java
index ad275ed1b58a..47bd7ff06df0 100644
--- a/sdks/java/io/snowflake/src/main/java/org/apache/beam/sdk/io/snowflake/crosslanguage/ReadBuilder.java
+++ b/sdks/java/io/snowflake/src/main/java/org/apache/beam/sdk/io/snowflake/crosslanguage/ReadBuilder.java
@@ -18,7 +18,7 @@
package org.apache.beam.sdk.io.snowflake.crosslanguage;
import java.io.Serializable;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import org.apache.beam.sdk.annotations.Experimental;
import org.apache.beam.sdk.annotations.Experimental.Kind;
import org.apache.beam.sdk.coders.ByteArrayCoder;
@@ -59,7 +59,7 @@ public static SnowflakeIO.CsvMapper getCsvMapper() {
return parts -> {
String partsCSV = String.join(",", parts);
- return partsCSV.getBytes(Charset.defaultCharset());
+ return partsCSV.getBytes(StandardCharsets.UTF_8);
};
}
}
diff --git a/sdks/java/io/snowflake/src/main/java/org/apache/beam/sdk/io/snowflake/services/SnowflakeBatchServiceImpl.java b/sdks/java/io/snowflake/src/main/java/org/apache/beam/sdk/io/snowflake/services/SnowflakeBatchServiceImpl.java
index bee0daa8c637..2927829e7b6c 100644
--- a/sdks/java/io/snowflake/src/main/java/org/apache/beam/sdk/io/snowflake/services/SnowflakeBatchServiceImpl.java
+++ b/sdks/java/io/snowflake/src/main/java/org/apache/beam/sdk/io/snowflake/services/SnowflakeBatchServiceImpl.java
@@ -20,7 +20,7 @@
import static org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions.checkArgument;
import java.math.BigInteger;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -98,7 +98,7 @@ private String copyIntoStage(SnowflakeBatchServiceConfig config) throws SQLExcep
}
private String getASCIICharRepresentation(String input) {
- return String.format("0x%x", new BigInteger(1, input.getBytes(Charset.defaultCharset())));
+ return String.format("0x%x", new BigInteger(1, input.getBytes(StandardCharsets.UTF_8)));
}
/**
diff --git a/sdks/java/io/snowflake/src/test/java/org/apache/beam/sdk/io/snowflake/test/FakeSnowflakeStreamingServiceImpl.java b/sdks/java/io/snowflake/src/test/java/org/apache/beam/sdk/io/snowflake/test/FakeSnowflakeStreamingServiceImpl.java
index 8df12afa06b7..b2abd8623cc5 100644
--- a/sdks/java/io/snowflake/src/test/java/org/apache/beam/sdk/io/snowflake/test/FakeSnowflakeStreamingServiceImpl.java
+++ b/sdks/java/io/snowflake/src/test/java/org/apache/beam/sdk/io/snowflake/test/FakeSnowflakeStreamingServiceImpl.java
@@ -21,7 +21,7 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.zip.GZIPInputStream;
@@ -61,7 +61,7 @@ private List readGZIPFile(String file) {
List lines = new ArrayList<>();
try {
GZIPInputStream gzip = new GZIPInputStream(new FileInputStream(file));
- BufferedReader br = new BufferedReader(new InputStreamReader(gzip, Charset.defaultCharset()));
+ BufferedReader br = new BufferedReader(new InputStreamReader(gzip, StandardCharsets.UTF_8));
String line;
while ((line = br.readLine()) != null) {
diff --git a/sdks/java/io/snowflake/src/test/java/org/apache/beam/sdk/io/snowflake/test/TestUtils.java b/sdks/java/io/snowflake/src/test/java/org/apache/beam/sdk/io/snowflake/test/TestUtils.java
index 5f094bf22203..64e4e4391496 100644
--- a/sdks/java/io/snowflake/src/test/java/org/apache/beam/sdk/io/snowflake/test/TestUtils.java
+++ b/sdks/java/io/snowflake/src/test/java/org/apache/beam/sdk/io/snowflake/test/TestUtils.java
@@ -26,7 +26,7 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -152,7 +152,7 @@ public static List readGZIPFile(String file) {
List lines = new ArrayList<>();
try {
GZIPInputStream gzip = new GZIPInputStream(new FileInputStream(file));
- BufferedReader br = new BufferedReader(new InputStreamReader(gzip, Charset.defaultCharset()));
+ BufferedReader br = new BufferedReader(new InputStreamReader(gzip, StandardCharsets.UTF_8));
String line;
while ((line = br.readLine()) != null) {
@@ -175,7 +175,7 @@ public static String getValidPrivateKeyPath(Class c) {
public static String getRawValidPrivateKey(Class c) throws IOException {
byte[] keyBytes = Files.readAllBytes(Paths.get(getValidPrivateKeyPath(c)));
- return new String(keyBytes, Charset.defaultCharset());
+ return new String(keyBytes, StandardCharsets.UTF_8);
}
public static String getPrivateKeyPassphrase() {
diff --git a/sdks/java/io/solr/src/test/java/org/apache/beam/sdk/io/solr/SolrIOTest.java b/sdks/java/io/solr/src/test/java/org/apache/beam/sdk/io/solr/SolrIOTest.java
index 16c4815db4c0..79d4947926a0 100644
--- a/sdks/java/io/solr/src/test/java/org/apache/beam/sdk/io/solr/SolrIOTest.java
+++ b/sdks/java/io/solr/src/test/java/org/apache/beam/sdk/io/solr/SolrIOTest.java
@@ -24,7 +24,7 @@
import com.carrotsearch.randomizedtesting.RandomizedRunner;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
import java.io.IOException;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Set;
import org.apache.beam.sdk.Pipeline;
@@ -112,7 +112,7 @@ public static void beforeClass() throws Exception {
ZkStateReader zkStateReader = cluster.getSolrClient().getZkStateReader();
zkStateReader
.getZkClient()
- .setData("/security.json", securityJson.getBytes(Charset.defaultCharset()), true);
+ .setData("/security.json", securityJson.getBytes(StandardCharsets.UTF_8), true);
String zkAddress = cluster.getZkServer().getZkAddress();
connectionConfiguration =
SolrIO.ConnectionConfiguration.create(zkAddress).withBasicCredentials("solr", password);