This is an automated email from the ASF dual-hosted git repository.
damccorm 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 e9b5dc69532 Enforce java.nio.charset.StandardCharsets against guava
Charsets (#32083)
e9b5dc69532 is described below
commit e9b5dc69532865e4ec20faa13a1ff88552bc50ae
Author: Yi Hu <[email protected]>
AuthorDate: Tue Aug 6 12:39:03 2024 -0400
Enforce java.nio.charset.StandardCharsets against guava Charsets (#32083)
* Enforce java.nio.charset.StandardCharsets against guava Charsets
* Fix dependency analyzeClassesDependencies
---
.../kafkatopubsub/transforms/FormatTransform.java | 5 +++--
.../streaming/io/StreamingImpulseSource.java | 5 +++--
.../runners/flink/FlinkJobServerDriverTest.java | 12 ++++++-----
.../FlinkPipelineExecutionEnvironmentTest.java | 4 ++--
.../beam/runners/flink/FlinkSubmissionTest.java | 4 ++--
.../streaming/ExecutableStageDoFnOperatorTest.java | 9 ++++----
.../wrappers/streaming/FlinkKeyUtilsTest.java | 4 ++--
.../dataflow/DataflowPipelineTranslator.java | 7 ++++---
.../beam/runners/dataflow/worker/graph/Nodes.java | 6 +++---
.../worker/GroupingShuffleEntryIteratorTest.java | 7 +++----
.../windmill/state/WindmillStateInternalsTest.java | 11 +++++-----
.../windmill/state/WindmillStateReaderTest.java | 8 ++++----
.../artifact/ArtifactStagingService.java | 4 ++--
.../fnexecution/state/StateRequestHandlers.java | 5 +++--
.../artifact/ArtifactRetrievalServiceTest.java | 4 ++--
.../portability/testing/TestUniversalRunner.java | 5 +++--
.../main/resources/beam/checkstyle/checkstyle.xml | 8 ++++++++
.../providers/LoggingTransformProvider.java | 4 ++--
.../sdk/transforms/errorhandling/BadRecord.java | 6 +++---
.../reflect/ByteBuddyOnTimerInvokerFactory.java | 6 +++---
.../transforms/resourcehints/ResourceHints.java | 8 ++++----
.../beam/sdk/coders/StructuralByteArrayTest.java | 10 ++++-----
.../org/apache/beam/sdk/io/FileBasedSinkTest.java | 2 +-
.../java/org/apache/beam/sdk/io/FileIOTest.java | 6 +++---
.../org/apache/beam/sdk/io/TFRecordIOTest.java | 7 +++----
.../org/apache/beam/sdk/io/TextIOReadTest.java | 8 ++++----
.../org/apache/beam/sdk/io/TextIOWriteTest.java | 6 +++---
.../beam/sdk/io/TextRowCountEstimatorTest.java | 10 ++++-----
.../org/apache/beam/sdk/io/WriteFilesTest.java | 5 +++--
.../sdk/options/PipelineOptionsFactoryTest.java | 24 +++++++++++-----------
.../beam/sdk/schemas/SchemaTranslationTest.java | 5 +++--
.../BufferedElementCountingOutputStreamTest.java | 6 +++---
.../sdk/util/ExposedByteArrayInputStreamTest.java | 6 +++---
.../sdk/util/ExposedByteArrayOutputStreamTest.java | 4 ++--
.../beam/sdk/util/SerializableUtilsTest.java | 4 ++--
.../expansion/service/ExpansionServiceTest.java | 4 ++--
.../avro/AvroGenericCoderTranslator.java | 6 +++---
.../beam/sdk/extensions/avro/io/AvroIOTest.java | 6 +++---
.../extensions/python/PythonExternalTransform.java | 5 +++--
.../beam/sdk/extensions/python/PythonService.java | 5 +++--
sdks/java/extensions/sql/jdbc/build.gradle | 2 +-
.../beam/sdk/extensions/sql/jdbc/BeamSqlLine.java | 6 +++---
.../meta/provider/text/TextTableProviderTest.java | 20 ++++++++++--------
.../beam/sdk/io/clickhouse/ClickHouseWriter.java | 4 ++--
.../io/contextualtextio/ContextualTextIOTest.java | 16 +++++++--------
.../PubsubReadSchemaTransformProviderTest.java | 6 +++---
.../beam/sdk/io/kafka/ReadFromKafkaDoFnTest.java | 6 +++---
.../org/apache/beam/sdk/tpcds/QueryReader.java | 4 ++--
.../apache/beam/sdk/tpcds/SqlTransformRunner.java | 4 ++--
.../beam/sdk/tpcds/TableSchemaJSONLoader.java | 4 ++--
.../launcher/TransformServiceLauncherTest.java | 10 ++++-----
51 files changed, 182 insertions(+), 161 deletions(-)
diff --git
a/examples/java/src/main/java/org/apache/beam/examples/complete/kafkatopubsub/transforms/FormatTransform.java
b/examples/java/src/main/java/org/apache/beam/examples/complete/kafkatopubsub/transforms/FormatTransform.java
index 2d9089fcd29..296d7e7d240 100644
---
a/examples/java/src/main/java/org/apache/beam/examples/complete/kafkatopubsub/transforms/FormatTransform.java
+++
b/examples/java/src/main/java/org/apache/beam/examples/complete/kafkatopubsub/transforms/FormatTransform.java
@@ -17,6 +17,7 @@
*/
package org.apache.beam.examples.complete.kafkatopubsub.transforms;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;
import org.apache.beam.examples.complete.kafkatopubsub.avro.AvroDataClass;
@@ -37,7 +38,6 @@ import org.apache.beam.sdk.values.PBegin;
import org.apache.beam.sdk.values.PCollection;
import org.apache.beam.sdk.values.PDone;
import org.apache.beam.sdk.values.TypeDescriptor;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableMap;
import org.apache.kafka.common.serialization.StringDeserializer;
@@ -120,7 +120,8 @@ public class FormatTransform {
MapElements.into(TypeDescriptor.of(PubsubMessage.class))
.via(
(String json) ->
- new PubsubMessage(json.getBytes(Charsets.UTF_8),
ImmutableMap.of())))
+ new PubsubMessage(
+ json.getBytes(StandardCharsets.UTF_8),
ImmutableMap.of())))
.apply(
"writePubsubMessagesToPubSub",
PubsubIO.writeMessages().to(options.getOutputTopic()));
}
diff --git
a/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/io/StreamingImpulseSource.java
b/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/io/StreamingImpulseSource.java
index 8f21e42d61e..871d7a5a398 100644
---
a/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/io/StreamingImpulseSource.java
+++
b/runners/flink/src/main/java/org/apache/beam/runners/flink/translation/wrappers/streaming/io/StreamingImpulseSource.java
@@ -17,8 +17,8 @@
*/
package org.apache.beam.runners.flink.translation.wrappers.streaming.io;
+import java.nio.charset.StandardCharsets;
import org.apache.beam.sdk.util.WindowedValue;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.flink.streaming.api.functions.source.RichParallelSourceFunction;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -60,7 +60,8 @@ public class StreamingImpulseSource extends
RichParallelSourceFunction<WindowedV
while (running && (messageCount == 0 || count < subtaskCount)) {
synchronized (ctx.getCheckpointLock()) {
ctx.collect(
-
WindowedValue.valueInGlobalWindow(String.valueOf(count).getBytes(Charsets.UTF_8)));
+ WindowedValue.valueInGlobalWindow(
+ String.valueOf(count).getBytes(StandardCharsets.UTF_8)));
count++;
}
diff --git
a/runners/flink/src/test/java/org/apache/beam/runners/flink/FlinkJobServerDriverTest.java
b/runners/flink/src/test/java/org/apache/beam/runners/flink/FlinkJobServerDriverTest.java
index 4a628eeb4fd..22516cbc963 100644
---
a/runners/flink/src/test/java/org/apache/beam/runners/flink/FlinkJobServerDriverTest.java
+++
b/runners/flink/src/test/java/org/apache/beam/runners/flink/FlinkJobServerDriverTest.java
@@ -25,7 +25,7 @@ import static org.hamcrest.core.Is.is;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
+import java.nio.charset.StandardCharsets;
import org.junit.Test;
/** Tests for {@link FlinkJobServerDriver}. */
@@ -104,7 +104,7 @@ public class FlinkJobServerDriverTest {
boolean success = false;
while (!success) {
newErr.flush();
- String output = baos.toString(Charsets.UTF_8.name());
+ String output = baos.toString(StandardCharsets.UTF_8.name());
if (output.contains("JobService started on localhost:")
&& output.contains("ArtifactStagingService started on localhost:")
&& output.contains("ExpansionService started on localhost:")) {
@@ -114,7 +114,8 @@ public class FlinkJobServerDriverTest {
}
}
assertThat(driver.getJobServerUrl(), is(not(nullValue())));
- assertThat(baos.toString(Charsets.UTF_8.name()),
containsString(driver.getJobServerUrl()));
+ assertThat(
+ baos.toString(StandardCharsets.UTF_8.name()),
containsString(driver.getJobServerUrl()));
assertThat(driverThread.isAlive(), is(true));
} catch (Throwable t) {
// restore to print exception
@@ -149,7 +150,7 @@ public class FlinkJobServerDriverTest {
boolean success = false;
while (!success) {
newErr.flush();
- String output = baos.toString(Charsets.UTF_8.name());
+ String output = baos.toString(StandardCharsets.UTF_8.name());
if (output.contains("JobService started on localhost:")
&& output.contains("ArtifactStagingService started on
localhost:")) {
success = true;
@@ -161,7 +162,8 @@ public class FlinkJobServerDriverTest {
}
}
assertThat(driver.getJobServerUrl(), is(not(nullValue())));
- assertThat(baos.toString(Charsets.UTF_8.name()),
containsString(driver.getJobServerUrl()));
+ assertThat(
+ baos.toString(StandardCharsets.UTF_8.name()),
containsString(driver.getJobServerUrl()));
assertThat(driverThread.isAlive(), is(true));
} catch (Throwable t) {
// restore to print exception
diff --git
a/runners/flink/src/test/java/org/apache/beam/runners/flink/FlinkPipelineExecutionEnvironmentTest.java
b/runners/flink/src/test/java/org/apache/beam/runners/flink/FlinkPipelineExecutionEnvironmentTest.java
index 9d898ed53a8..3b92c282c38 100644
---
a/runners/flink/src/test/java/org/apache/beam/runners/flink/FlinkPipelineExecutionEnvironmentTest.java
+++
b/runners/flink/src/test/java/org/apache/beam/runners/flink/FlinkPipelineExecutionEnvironmentTest.java
@@ -38,6 +38,7 @@ import java.io.Serializable;
import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -56,7 +57,6 @@ import org.apache.beam.sdk.transforms.windowing.Window;
import org.apache.beam.sdk.util.construction.PTransformMatchers;
import org.apache.beam.sdk.util.construction.PTransformTranslation;
import org.apache.beam.sdk.util.construction.resources.PipelineResources;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
import org.apache.flink.api.java.ExecutionEnvironment;
import org.apache.flink.api.java.RemoteEnvironment;
@@ -373,7 +373,7 @@ public class FlinkPipelineExecutionEnvironmentTest
implements Serializable {
}
replacementStdErr.flush();
assertThat(
- new String(byteArrayOutputStream.toByteArray(), Charsets.UTF_8),
+ new String(byteArrayOutputStream.toByteArray(),
StandardCharsets.UTF_8),
containsString(
"UnboundedSources present which rely on checkpointing, but
checkpointing is disabled."));
}
diff --git
a/runners/flink/src/test/java/org/apache/beam/runners/flink/FlinkSubmissionTest.java
b/runners/flink/src/test/java/org/apache/beam/runners/flink/FlinkSubmissionTest.java
index 22a9ce4f39a..cf860717def 100644
---
a/runners/flink/src/test/java/org/apache/beam/runners/flink/FlinkSubmissionTest.java
+++
b/runners/flink/src/test/java/org/apache/beam/runners/flink/FlinkSubmissionTest.java
@@ -20,6 +20,7 @@ package org.apache.beam.runners.flink;
import java.io.File;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.security.Permission;
import java.util.Collection;
@@ -30,7 +31,6 @@ import org.apache.beam.sdk.io.GenerateSequence;
import org.apache.beam.sdk.options.PipelineOptions;
import org.apache.beam.sdk.options.PipelineOptionsFactory;
import org.apache.beam.sdk.util.construction.resources.PipelineResources;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableMap;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.Iterables;
@@ -200,7 +200,7 @@ public class FlinkSubmissionTest {
RestOptions.PORT.key(),
flinkCluster.getRestPort());
- Files.write(file.toPath(), config.getBytes(Charsets.UTF_8));
+ Files.write(file.toPath(), config.getBytes(StandardCharsets.UTF_8));
// Create a new environment with the location of the Flink config for
CliFrontend
ImmutableMap<String, String> newEnv =
diff --git
a/runners/flink/src/test/java/org/apache/beam/runners/flink/translation/wrappers/streaming/ExecutableStageDoFnOperatorTest.java
b/runners/flink/src/test/java/org/apache/beam/runners/flink/translation/wrappers/streaming/ExecutableStageDoFnOperatorTest.java
index cf5b2b55512..2eb0545b779 100644
---
a/runners/flink/src/test/java/org/apache/beam/runners/flink/translation/wrappers/streaming/ExecutableStageDoFnOperatorTest.java
+++
b/runners/flink/src/test/java/org/apache/beam/runners/flink/translation/wrappers/streaming/ExecutableStageDoFnOperatorTest.java
@@ -103,7 +103,6 @@ import org.apache.beam.sdk.values.TupleTag;
import org.apache.beam.sdk.values.WindowingStrategy;
import org.apache.beam.vendor.grpc.v1p60p1.com.google.protobuf.ByteString;
import org.apache.beam.vendor.grpc.v1p60p1.com.google.protobuf.Struct;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableMap;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.Iterables;
@@ -818,7 +817,7 @@ public class ExecutableStageDoFnOperatorTest {
BagState<ByteString> state = // State from the SDK Harness is stored as
ByteStrings
operator.keyedStateInternals.state(
stateNamespace, StateTags.bag(stateId, ByteStringCoder.of()));
- state.add(ByteString.copyFrom("userstate".getBytes(Charsets.UTF_8)));
+
state.add(ByteString.copyFrom("userstate".getBytes(StandardCharsets.UTF_8)));
assertThat(testHarness.numKeyedStateEntries(), is(1));
// user timer that fires after the end of the window and after state
cleanup
@@ -966,7 +965,7 @@ public class ExecutableStageDoFnOperatorTest {
BagState<ByteString> state = // State from the SDK Harness is stored as
ByteStrings
operator.keyedStateInternals.state(
stateNamespace, StateTags.bag(stateId, ByteStringCoder.of()));
- state.add(ByteString.copyFrom("userstate".getBytes(Charsets.UTF_8)));
+
state.add(ByteString.copyFrom("userstate".getBytes(StandardCharsets.UTF_8)));
// No timers have been set for cleanup
assertThat(testHarness.numEventTimeTimers(), is(0));
// State has been created
@@ -988,8 +987,8 @@ public class ExecutableStageDoFnOperatorTest {
new ExecutableStageDoFnOperator.BagUserStateFactory<>(
test, stateBackend, NoopLock.get(), null);
- ByteString key1 = ByteString.copyFrom("key1", Charsets.UTF_8);
- ByteString key2 = ByteString.copyFrom("key2", Charsets.UTF_8);
+ ByteString key1 = ByteString.copyFrom("key1", StandardCharsets.UTF_8);
+ ByteString key2 = ByteString.copyFrom("key2", StandardCharsets.UTF_8);
Map<String, Map<String, ProcessBundleDescriptors.BagUserStateSpec>>
userStateMapMock =
Mockito.mock(Map.class);
diff --git
a/runners/flink/src/test/java/org/apache/beam/runners/flink/translation/wrappers/streaming/FlinkKeyUtilsTest.java
b/runners/flink/src/test/java/org/apache/beam/runners/flink/translation/wrappers/streaming/FlinkKeyUtilsTest.java
index cab45632ac5..cdf461b5fde 100644
---
a/runners/flink/src/test/java/org/apache/beam/runners/flink/translation/wrappers/streaming/FlinkKeyUtilsTest.java
+++
b/runners/flink/src/test/java/org/apache/beam/runners/flink/translation/wrappers/streaming/FlinkKeyUtilsTest.java
@@ -22,12 +22,12 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.coders.StringUtf8Coder;
import org.apache.beam.sdk.coders.VoidCoder;
import org.apache.beam.sdk.util.CoderUtils;
import org.apache.beam.vendor.grpc.v1p60p1.com.google.protobuf.ByteString;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import org.junit.Test;
/** Tests for {@link FlinkKeyUtils}. */
@@ -66,7 +66,7 @@ public class FlinkKeyUtilsTest {
@Test
@SuppressWarnings("ByteBufferBackingArray")
public void testFromEncodedKey() {
- ByteString input = ByteString.copyFrom("hello
world".getBytes(Charsets.UTF_8));
+ ByteString input = ByteString.copyFrom("hello
world".getBytes(StandardCharsets.UTF_8));
ByteBuffer encodedKey = FlinkKeyUtils.fromEncodedKey(input);
assertThat(encodedKey.array(), is(input.toByteArray()));
}
diff --git
a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java
b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java
index f905e136e83..1fedcd8f3a2 100644
---
a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java
+++
b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslator.java
@@ -42,6 +42,7 @@ import com.google.api.services.dataflow.model.Environment;
import com.google.api.services.dataflow.model.Job;
import com.google.api.services.dataflow.model.Step;
import com.google.api.services.dataflow.model.WorkerPool;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Collections;
@@ -110,7 +111,6 @@ import org.apache.beam.sdk.values.TupleTag;
import org.apache.beam.sdk.values.WindowingStrategy;
import org.apache.beam.vendor.grpc.v1p60p1.com.google.protobuf.ByteString;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.annotations.VisibleForTesting;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.Iterables;
import org.apache.commons.codec.EncoderException;
import org.apache.commons.codec.net.PercentCodec;
@@ -618,7 +618,7 @@ public class DataflowPipelineTranslator {
// For compatibility with URL encoding implementations that represent
space as +,
// always encode + as %2b even though we don't encode space as +.
private final PercentCodec percentCodec =
- new PercentCodec("+".getBytes(Charsets.US_ASCII), false);
+ new PercentCodec("+".getBytes(StandardCharsets.US_ASCII), false);
private StepTranslator(Translator translator, Step step) {
this.translator = translator;
@@ -764,7 +764,8 @@ public class DataflowPipelineTranslator {
try {
urlEncodedHints.put(
entry.getKey(),
- new String(percentCodec.encode(entry.getValue().toBytes()),
Charsets.US_ASCII));
+ new String(
+ percentCodec.encode(entry.getValue().toBytes()),
StandardCharsets.US_ASCII));
} catch (EncoderException e) {
// Should never happen.
throw new RuntimeException("Invalid value for resource hint: " +
entry.getKey(), e);
diff --git
a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/graph/Nodes.java
b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/graph/Nodes.java
index 6092d0d64de..d8243241700 100644
---
a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/graph/Nodes.java
+++
b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/graph/Nodes.java
@@ -29,11 +29,11 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
import org.apache.beam.runners.dataflow.worker.util.common.worker.Operation;
import
org.apache.beam.runners.dataflow.worker.util.common.worker.OutputReceiver;
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.extensions.gcp.util.Transport;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.MoreObjects;
/** Container class for different types of network nodes. All nodes only have
reference equality. */
@@ -59,7 +59,7 @@ public class Nodes {
ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
final JsonGenerator baseGenerator =
MoreObjects.firstNonNull(json.getFactory(),
Transport.getJsonFactory())
- .createJsonGenerator(byteStream, Charsets.UTF_8);
+ .createJsonGenerator(byteStream, StandardCharsets.UTF_8);
JsonGenerator generator =
new JsonGenerator() {
@Override
@@ -164,7 +164,7 @@ public class Nodes {
generator.enablePrettyPrint();
generator.serialize(json);
generator.flush();
- return byteStream.toString(Charsets.UTF_8.name());
+ return byteStream.toString(StandardCharsets.UTF_8.name());
} catch (IOException e) {
throw new RuntimeException(e);
}
diff --git
a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/util/common/worker/GroupingShuffleEntryIteratorTest.java
b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/util/common/worker/GroupingShuffleEntryIteratorTest.java
index 2421d7faf82..8c6a003cb72 100644
---
a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/util/common/worker/GroupingShuffleEntryIteratorTest.java
+++
b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/util/common/worker/GroupingShuffleEntryIteratorTest.java
@@ -42,7 +42,6 @@ import org.apache.beam.sdk.options.PipelineOptions;
import org.apache.beam.sdk.options.PipelineOptionsFactory;
import org.apache.beam.sdk.util.common.Reiterator;
import org.apache.beam.vendor.grpc.v1p60p1.com.google.protobuf.ByteString;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.Lists;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.junit.After;
@@ -130,10 +129,10 @@ public class GroupingShuffleEntryIteratorTest {
private static ShuffleEntry shuffleEntry(String key, String value) {
return new ShuffleEntry(
/* use key itself as position */
- ByteArrayShufflePosition.of(key.getBytes(Charsets.UTF_8)),
- ByteString.copyFrom(key.getBytes(Charsets.UTF_8)),
+ ByteArrayShufflePosition.of(key.getBytes(StandardCharsets.UTF_8)),
+ ByteString.copyFrom(key.getBytes(StandardCharsets.UTF_8)),
ByteString.copyFrom(new byte[0]),
- ByteString.copyFrom(value.getBytes(Charsets.UTF_8)));
+ ByteString.copyFrom(value.getBytes(StandardCharsets.UTF_8)));
}
@Test
diff --git
a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/windmill/state/WindmillStateInternalsTest.java
b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/windmill/state/WindmillStateInternalsTest.java
index 33e47623cd0..d06ed0f526c 100644
---
a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/windmill/state/WindmillStateInternalsTest.java
+++
b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/windmill/state/WindmillStateInternalsTest.java
@@ -80,7 +80,6 @@ import org.apache.beam.sdk.util.ByteStringOutputStream;
import org.apache.beam.sdk.util.CoderUtils;
import org.apache.beam.sdk.values.TimestampedValue;
import org.apache.beam.vendor.grpc.v1p60p1.com.google.protobuf.ByteString;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Supplier;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ArrayListMultimap;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
@@ -225,7 +224,7 @@ public class WindmillStateInternalsTest {
.forComputation("comp")
.forKey(
WindmillComputationKey.create(
- "comp", ByteString.copyFrom("dummyKey",
Charsets.UTF_8), 123),
+ "comp", ByteString.copyFrom("dummyKey",
StandardCharsets.UTF_8), 123),
17L,
workToken)
.forFamily(STATE_FAMILY),
@@ -240,7 +239,7 @@ public class WindmillStateInternalsTest {
.forComputation("comp")
.forKey(
WindmillComputationKey.create(
- "comp", ByteString.copyFrom("dummyNewKey",
Charsets.UTF_8), 123),
+ "comp", ByteString.copyFrom("dummyNewKey",
StandardCharsets.UTF_8), 123),
17L,
workToken)
.forFamily(STATE_FAMILY),
@@ -255,7 +254,7 @@ public class WindmillStateInternalsTest {
.forComputation("comp")
.forKey(
WindmillComputationKey.create(
- "comp", ByteString.copyFrom("dummyNewKey",
Charsets.UTF_8), 123),
+ "comp", ByteString.copyFrom("dummyNewKey",
StandardCharsets.UTF_8), 123),
17L,
workToken)
.forFamily(STATE_FAMILY),
@@ -2004,7 +2003,9 @@ public class WindmillStateInternalsTest {
}
// clear cache and recreate multimapState
- cache.forComputation("comp").invalidate(ByteString.copyFrom("dummyKey",
Charsets.UTF_8), 123);
+ cache
+ .forComputation("comp")
+ .invalidate(ByteString.copyFrom("dummyKey", StandardCharsets.UTF_8),
123);
resetUnderTest();
multimapState = underTest.state(NAMESPACE, addr);
diff --git
a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/windmill/state/WindmillStateReaderTest.java
b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/windmill/state/WindmillStateReaderTest.java
index 8dbfc35192b..b06d88bf4bc 100644
---
a/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/windmill/state/WindmillStateReaderTest.java
+++
b/runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/windmill/state/WindmillStateReaderTest.java
@@ -27,6 +27,7 @@ import static org.mockito.Mockito.when;
import com.google.api.client.util.Lists;
import com.google.common.collect.Maps;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.Arrays;
@@ -48,7 +49,6 @@ import org.apache.beam.sdk.transforms.windowing.BoundedWindow;
import org.apache.beam.sdk.util.ByteStringOutputStream;
import org.apache.beam.sdk.values.TimestampedValue;
import org.apache.beam.vendor.grpc.v1p60p1.com.google.protobuf.ByteString;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.Iterables;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.Range;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.io.BaseEncoding;
@@ -1151,8 +1151,8 @@ public class WindmillStateReaderTest {
.addFetchRanges(SortedListRange.newBuilder().setStart(beginning).setLimit(end))
.setFetchMaxBytes(WindmillStateReader.MAX_ORDERED_LIST_BYTES));
- final ByteString CONT_1 = ByteString.copyFrom("CONTINUATION_1",
Charsets.UTF_8);
- final ByteString CONT_2 = ByteString.copyFrom("CONTINUATION_2",
Charsets.UTF_8);
+ final ByteString CONT_1 = ByteString.copyFrom("CONTINUATION_1",
StandardCharsets.UTF_8);
+ final ByteString CONT_2 = ByteString.copyFrom("CONTINUATION_2",
StandardCharsets.UTF_8);
Windmill.KeyedGetDataResponse.Builder response1 =
Windmill.KeyedGetDataResponse.newBuilder()
.setKey(DATA_KEY)
@@ -1327,7 +1327,7 @@ public class WindmillStateReaderTest {
.setStateFamily(STATE_FAMILY)
.setFetchMaxBytes(WindmillStateReader.MAX_TAG_VALUE_PREFIX_BYTES));
- final ByteString CONT = ByteString.copyFrom("CONTINUATION",
Charsets.UTF_8);
+ final ByteString CONT = ByteString.copyFrom("CONTINUATION",
StandardCharsets.UTF_8);
Windmill.KeyedGetDataResponse.Builder response1 =
Windmill.KeyedGetDataResponse.newBuilder()
.setKey(DATA_KEY)
diff --git
a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/artifact/ArtifactStagingService.java
b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/artifact/ArtifactStagingService.java
index a8e5e2ab6a8..8c7a356b993 100644
---
a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/artifact/ArtifactStagingService.java
+++
b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/artifact/ArtifactStagingService.java
@@ -22,6 +22,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.channels.Channels;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.HashMap;
@@ -56,7 +57,6 @@ import
org.apache.beam.vendor.grpc.v1p60p1.com.google.protobuf.InvalidProtocolBu
import org.apache.beam.vendor.grpc.v1p60p1.io.grpc.Status;
import org.apache.beam.vendor.grpc.v1p60p1.io.grpc.StatusException;
import org.apache.beam.vendor.grpc.v1p60p1.io.grpc.stub.StreamObserver;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Preconditions;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Splitter;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
@@ -192,7 +192,7 @@ public class ArtifactStagingService
private ResourceId stagingDir(String stagingToken) {
return FileSystems.matchNewResource(root, true)
.resolve(
- Hashing.sha256().hashString(stagingToken,
Charsets.UTF_8).toString(),
+ Hashing.sha256().hashString(stagingToken,
StandardCharsets.UTF_8).toString(),
ResolveOptions.StandardResolveOptions.RESOLVE_DIRECTORY);
}
};
diff --git
a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/state/StateRequestHandlers.java
b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/state/StateRequestHandlers.java
index e2c45850dba..4e1c31744c1 100644
---
a/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/state/StateRequestHandlers.java
+++
b/runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/state/StateRequestHandlers.java
@@ -19,6 +19,7 @@ package org.apache.beam.runners.fnexecution.state;
import static
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Preconditions.checkState;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumMap;
@@ -54,7 +55,6 @@ import org.apache.beam.sdk.transforms.windowing.BoundedWindow;
import org.apache.beam.sdk.util.common.Reiterable;
import org.apache.beam.sdk.values.KV;
import org.apache.beam.vendor.grpc.v1p60p1.com.google.protobuf.ByteString;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
/**
@@ -655,7 +655,8 @@ public class StateRequestHandlers {
}
private static BeamFnApi.ProcessBundleRequest.CacheToken
createCacheToken() {
- ByteString token =
ByteString.copyFrom(UUID.randomUUID().toString().getBytes(Charsets.UTF_8));
+ ByteString token =
+
ByteString.copyFrom(UUID.randomUUID().toString().getBytes(StandardCharsets.UTF_8));
return BeamFnApi.ProcessBundleRequest.CacheToken.newBuilder()
.setUserState(BeamFnApi.ProcessBundleRequest.CacheToken.UserState.getDefaultInstance())
.setToken(token)
diff --git
a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/artifact/ArtifactRetrievalServiceTest.java
b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/artifact/ArtifactRetrievalServiceTest.java
index d6b48a93613..4d19e87c3d1 100644
---
a/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/artifact/ArtifactRetrievalServiceTest.java
+++
b/runners/java-fn-execution/src/test/java/org/apache/beam/runners/fnexecution/artifact/ArtifactRetrievalServiceTest.java
@@ -20,6 +20,7 @@ package org.apache.beam.runners.fnexecution.artifact;
import static org.junit.Assert.assertEquals;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -33,7 +34,6 @@ import
org.apache.beam.vendor.grpc.v1p60p1.io.grpc.ManagedChannel;
import
org.apache.beam.vendor.grpc.v1p60p1.io.grpc.inprocess.InProcessChannelBuilder;
import
org.apache.beam.vendor.grpc.v1p60p1.io.grpc.inprocess.InProcessServerBuilder;
import org.apache.beam.vendor.grpc.v1p60p1.io.grpc.testing.GrpcCleanupRule;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Strings;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableMap;
import org.junit.Before;
@@ -74,7 +74,7 @@ public class ArtifactRetrievalServiceTest {
for (Map.Entry<String, String> entry : files.entrySet()) {
Files.write(
Paths.get(stagingDir.toString(), entry.getKey()),
- entry.getValue().getBytes(Charsets.UTF_8));
+ entry.getValue().getBytes(StandardCharsets.UTF_8));
}
}
diff --git
a/runners/portability/java/src/main/java/org/apache/beam/runners/portability/testing/TestUniversalRunner.java
b/runners/portability/java/src/main/java/org/apache/beam/runners/portability/testing/TestUniversalRunner.java
index 533106869c6..a36c1e8b2ef 100644
---
a/runners/portability/java/src/main/java/org/apache/beam/runners/portability/testing/TestUniversalRunner.java
+++
b/runners/portability/java/src/main/java/org/apache/beam/runners/portability/testing/TestUniversalRunner.java
@@ -21,6 +21,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import com.google.auto.service.AutoService;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import org.apache.beam.runners.portability.PortableRunner;
@@ -33,7 +34,6 @@ import org.apache.beam.sdk.options.PipelineOptionsRegistrar;
import org.apache.beam.sdk.options.PortablePipelineOptions;
import org.apache.beam.sdk.runners.PipelineRunnerRegistrar;
import org.apache.beam.sdk.testing.TestPipelineOptions;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
import org.hamcrest.Matchers;
@@ -65,7 +65,8 @@ public class TestUniversalRunner extends
PipelineRunner<PipelineResult> {
testOptions.setJobEndpoint(
"localhost:"
+ new String(
-
Files.readAllBytes(Paths.get(localServicePortFilePath)), Charsets.UTF_8)
+
Files.readAllBytes(Paths.get(localServicePortFilePath)),
+ StandardCharsets.UTF_8)
.trim());
} catch (IOException e) {
throw new RuntimeException(
diff --git
a/sdks/java/build-tools/src/main/resources/beam/checkstyle/checkstyle.xml
b/sdks/java/build-tools/src/main/resources/beam/checkstyle/checkstyle.xml
index 3c4cfdfbc6f..5cee5d2f33e 100644
--- a/sdks/java/build-tools/src/main/resources/beam/checkstyle/checkstyle.xml
+++ b/sdks/java/build-tools/src/main/resources/beam/checkstyle/checkstyle.xml
@@ -119,6 +119,14 @@ page at http://checkstyle.sourceforge.net/config.html -->
<property name="message" value="You are using raw guava, please use
vendored guava classes."/>
</module>
+ <!-- Forbid guava Charset. -->
+ <module name="RegexpSinglelineJava">
+ <property name="id" value="ForbidGuavaCharset"/>
+ <property name="format"
value="((?:jre\.|\s)com\.google\.common\.base\.Charsets)"/>
+ <property name="severity" value="error"/>
+ <property name="message" value="You are using guava Charsets, please use
Java builtin StandardCharsets."/>
+ </module>
+
<!-- Forbid use of Charset.defaultCharset()-->
<module name="RegexpSinglelineJava">
<property name="id" value="ForbidDefaultCharset"/>
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/transforms/providers/LoggingTransformProvider.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/transforms/providers/LoggingTransformProvider.java
index 25efaeae2a0..2908171f5c0 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/transforms/providers/LoggingTransformProvider.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/transforms/providers/LoggingTransformProvider.java
@@ -19,6 +19,7 @@ package org.apache.beam.sdk.schemas.transforms.providers;
import com.google.auto.service.AutoService;
import com.google.auto.value.AutoValue;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -36,7 +37,6 @@ import org.apache.beam.sdk.transforms.SerializableFunction;
import org.apache.beam.sdk.values.PCollection;
import org.apache.beam.sdk.values.PCollectionRowTuple;
import org.apache.beam.sdk.values.Row;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableMap;
import org.slf4j.Logger;
@@ -166,7 +166,7 @@ public class LoggingTransformProvider
return new DoFn<Row, Row>() {
@ProcessElement
public void processElement(@Element Row row, OutputReceiver<Row> out) {
- String msg = prefix + new String(fn.apply(row), Charsets.UTF_8);
+ String msg = prefix + new String(fn.apply(row),
StandardCharsets.UTF_8);
// Looks like this is the best we can do.
//
https://stackoverflow.com/questions/2621701/setting-log-level-of-message-at-runtime-in-slf4j
switch (logLevel) {
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/errorhandling/BadRecord.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/errorhandling/BadRecord.java
index fd49078350c..558f912a6b1 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/errorhandling/BadRecord.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/errorhandling/BadRecord.java
@@ -24,6 +24,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintStream;
import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.schemas.AutoValueSchema;
@@ -34,7 +35,6 @@ import org.apache.beam.sdk.schemas.annotations.DefaultSchema;
import org.apache.beam.sdk.util.CoderUtils;
import org.apache.beam.sdk.util.Preconditions;
import org.apache.beam.sdk.values.TypeDescriptor;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -202,11 +202,11 @@ public abstract class BadRecord implements Serializable {
public Builder addExceptionStackTrace(Exception exception) throws
IOException {
ByteArrayOutputStream stream = new ByteArrayOutputStream();
- PrintStream printStream = new PrintStream(stream, false,
Charsets.UTF_8.name());
+ PrintStream printStream = new PrintStream(stream, false,
StandardCharsets.UTF_8.name());
exception.printStackTrace(printStream);
printStream.close();
- this.setExceptionStacktrace(new String(stream.toByteArray(),
Charsets.UTF_8));
+ this.setExceptionStacktrace(new String(stream.toByteArray(),
StandardCharsets.UTF_8));
return this;
}
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/ByteBuddyOnTimerInvokerFactory.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/ByteBuddyOnTimerInvokerFactory.java
index 7b9ac7e15c2..e318e82513c 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/ByteBuddyOnTimerInvokerFactory.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/ByteBuddyOnTimerInvokerFactory.java
@@ -22,6 +22,7 @@ import static
org.apache.beam.sdk.util.common.ReflectHelpers.findClassLoader;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
+import java.nio.charset.StandardCharsets;
import java.util.concurrent.ExecutionException;
import net.bytebuddy.ByteBuddy;
import net.bytebuddy.description.modifier.FieldManifestation;
@@ -43,7 +44,6 @@ import org.apache.beam.sdk.transforms.DoFn.OnTimer;
import org.apache.beam.sdk.transforms.DoFn.TimerId;
import
org.apache.beam.sdk.transforms.reflect.ByteBuddyDoFnInvokerFactory.DoFnMethodWithExtraParametersDelegation;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.CharMatcher;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.cache.CacheBuilder;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.cache.CacheLoader;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.cache.LoadingCache;
@@ -191,7 +191,7 @@ class ByteBuddyOnTimerInvokerFactory implements
OnTimerInvokerFactory {
"%s$%s$%s",
OnTimerInvoker.class.getSimpleName(),
CharMatcher.javaLetterOrDigit().retainFrom(timerId),
-
BaseEncoding.base64().omitPadding().encode(timerId.getBytes(Charsets.UTF_8)));
+
BaseEncoding.base64().omitPadding().encode(timerId.getBytes(StandardCharsets.UTF_8)));
DynamicType.Builder<?> builder =
new ByteBuddy()
@@ -241,7 +241,7 @@ class ByteBuddyOnTimerInvokerFactory implements
OnTimerInvokerFactory {
"%s$%s$%s",
OnTimerInvoker.class.getSimpleName(),
CharMatcher.javaLetterOrDigit().retainFrom(timerId),
-
BaseEncoding.base64().omitPadding().encode(timerId.getBytes(Charsets.UTF_8)));
+
BaseEncoding.base64().omitPadding().encode(timerId.getBytes(StandardCharsets.UTF_8)));
DynamicType.Builder<?> builder =
new ByteBuddy()
diff --git
a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/resourcehints/ResourceHints.java
b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/resourcehints/ResourceHints.java
index 2f034626acd..527a699568f 100644
---
a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/resourcehints/ResourceHints.java
+++
b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/resourcehints/ResourceHints.java
@@ -19,6 +19,7 @@ package org.apache.beam.sdk.transforms.resourcehints;
import static
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Preconditions.checkState;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
@@ -28,7 +29,6 @@ import org.apache.beam.model.pipeline.v1.RunnerApi;
import org.apache.beam.model.pipeline.v1.RunnerApi.StandardResourceHints;
import org.apache.beam.sdk.options.PipelineOptions;
import
org.apache.beam.vendor.grpc.v1p60p1.com.google.protobuf.ProtocolMessageEnum;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Preconditions;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Splitter;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableMap;
@@ -179,7 +179,7 @@ public class ResourceHints {
@Override
public byte[] toBytes() {
- return String.valueOf(value).getBytes(Charsets.US_ASCII);
+ return String.valueOf(value).getBytes(StandardCharsets.US_ASCII);
}
}
@@ -196,7 +196,7 @@ public class ResourceHints {
@Override
public byte[] toBytes() {
- return value.getBytes(Charsets.US_ASCII);
+ return value.getBytes(StandardCharsets.US_ASCII);
}
@Override
@@ -254,7 +254,7 @@ public class ResourceHints {
@Override
public byte[] toBytes() {
- return String.valueOf(value).getBytes(Charsets.US_ASCII);
+ return String.valueOf(value).getBytes(StandardCharsets.US_ASCII);
}
}
diff --git
a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/StructuralByteArrayTest.java
b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/StructuralByteArrayTest.java
index bd8fdd84fb0..cb0845796fe 100644
---
a/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/StructuralByteArrayTest.java
+++
b/sdks/java/core/src/test/java/org/apache/beam/sdk/coders/StructuralByteArrayTest.java
@@ -20,7 +20,7 @@ package org.apache.beam.sdk.coders;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
+import java.nio.charset.StandardCharsets;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -32,10 +32,10 @@ public final class StructuralByteArrayTest {
@Test
public void testStructuralByteArray() throws Exception {
assertEquals(
- new StructuralByteArray("test string".getBytes(Charsets.UTF_8)),
- new StructuralByteArray("test string".getBytes(Charsets.UTF_8)));
+ new StructuralByteArray("test
string".getBytes(StandardCharsets.UTF_8)),
+ new StructuralByteArray("test
string".getBytes(StandardCharsets.UTF_8)));
assertFalse(
- new StructuralByteArray("test string".getBytes(Charsets.UTF_8))
- .equals(new StructuralByteArray("diff
string".getBytes(Charsets.UTF_8))));
+ new StructuralByteArray("test string".getBytes(StandardCharsets.UTF_8))
+ .equals(new StructuralByteArray("diff
string".getBytes(StandardCharsets.UTF_8))));
}
}
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 7fd54039b1d..c4f83954e66 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
@@ -17,8 +17,8 @@
*/
package org.apache.beam.sdk.io;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.beam.sdk.io.WriteFiles.UNKNOWN_SHARDNUM;
-import static
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets.UTF_8;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
diff --git
a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/FileIOTest.java
b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/FileIOTest.java
index b87c9caa124..90b0822d9dc 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/FileIOTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/FileIOTest.java
@@ -31,6 +31,7 @@ import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Serializable;
import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import java.nio.file.CopyOption;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -69,7 +70,6 @@ import org.apache.beam.sdk.values.PCollection;
import org.apache.beam.sdk.values.PCollectionView;
import org.apache.beam.sdk.values.TypeDescriptor;
import org.apache.beam.sdk.values.TypeDescriptors;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import org.joda.time.Duration;
import org.junit.Rule;
import org.junit.Test;
@@ -368,10 +368,10 @@ public class FileIOTest implements Serializable {
public void testRead() throws IOException {
final String path = tmpFolder.newFile("file").getAbsolutePath();
final String pathGZ = tmpFolder.newFile("file.gz").getAbsolutePath();
- Files.write(new File(path).toPath(), "Hello
world".getBytes(Charsets.UTF_8));
+ Files.write(new File(path).toPath(), "Hello
world".getBytes(StandardCharsets.UTF_8));
try (Writer writer =
new OutputStreamWriter(
- new GZIPOutputStream(new FileOutputStream(pathGZ)),
Charsets.UTF_8)) {
+ new GZIPOutputStream(new FileOutputStream(pathGZ)),
StandardCharsets.UTF_8)) {
writer.write("Hello world");
}
diff --git
a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/TFRecordIOTest.java
b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/TFRecordIOTest.java
index acde8c91431..a38faf077e0 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/TFRecordIOTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/TFRecordIOTest.java
@@ -67,7 +67,6 @@ import org.apache.beam.sdk.transforms.DoFn;
import org.apache.beam.sdk.transforms.ParDo;
import org.apache.beam.sdk.transforms.display.DisplayData;
import org.apache.beam.sdk.values.PCollection;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.Lists;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.io.BaseEncoding;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.io.ByteStreams;
@@ -212,7 +211,7 @@ public class TFRecordIOTest {
@Category(NeedsRunner.class)
public void testReadInvalidRecord() throws Exception {
expectedException.expectMessage("Not a valid TFRecord. Fewer than 12
bytes.");
- runTestRead("bar".getBytes(Charsets.UTF_8), new String[0]);
+ runTestRead("bar".getBytes(StandardCharsets.UTF_8), new String[0]);
}
@Test
@@ -445,14 +444,14 @@ public class TFRecordIOTest {
static class ByteArrayToString extends DoFn<byte[], String> {
@ProcessElement
public void processElement(ProcessContext c) {
- c.output(new String(c.element(), Charsets.UTF_8));
+ c.output(new String(c.element(), StandardCharsets.UTF_8));
}
}
static class StringToByteArray extends DoFn<String, byte[]> {
@ProcessElement
public void processElement(ProcessContext c) {
- c.output(c.element().getBytes(Charsets.UTF_8));
+ c.output(c.element().getBytes(StandardCharsets.UTF_8));
}
}
diff --git
a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/TextIOReadTest.java
b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/TextIOReadTest.java
index 253308d1b93..8d9adbefd02 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/TextIOReadTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/TextIOReadTest.java
@@ -51,6 +51,7 @@ import java.nio.ByteBuffer;
import java.nio.channels.Channels;
import java.nio.channels.ReadableByteChannel;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
@@ -91,7 +92,6 @@ import org.apache.beam.sdk.transforms.windowing.Window;
import org.apache.beam.sdk.util.CoderUtils;
import org.apache.beam.sdk.values.KV;
import org.apache.beam.sdk.values.PCollection;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Joiner;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.Iterables;
@@ -642,7 +642,7 @@ public class TextIOReadTest {
try (PrintStream writer = new PrintStream(new
FileOutputStream(tmpFile))) {
for (String elem : expected) {
byte[] encodedElem =
CoderUtils.encodeToByteArray(StringUtf8Coder.of(), elem);
- String line = new String(encodedElem, Charsets.UTF_8);
+ String line = new String(encodedElem, StandardCharsets.UTF_8);
writer.println(line);
}
}
@@ -865,7 +865,7 @@ public class TextIOReadTest {
public void testProgressTextFile() throws IOException {
String file = "line1\nline2\nline3";
try (BoundedSource.BoundedReader<String> reader =
- prepareSource(file.getBytes(Charsets.UTF_8))
+ prepareSource(file.getBytes(StandardCharsets.UTF_8))
.createReader(PipelineOptionsFactory.create())) {
// Check preconditions before starting
assertEquals(0.0, reader.getFractionConsumed(), 1e-6);
@@ -901,7 +901,7 @@ public class TextIOReadTest {
@Test
public void testProgressAfterSplitting() throws IOException {
String file = "line1\nline2\nline3";
- BoundedSource<String> source =
prepareSource(file.getBytes(Charsets.UTF_8));
+ BoundedSource<String> source =
prepareSource(file.getBytes(StandardCharsets.UTF_8));
BoundedSource<String> remainder;
// Create the remainder, verifying properties pre- and post-splitting.
diff --git
a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/TextIOWriteTest.java
b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/TextIOWriteTest.java
index 312605f3fcc..695ff4474d7 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/TextIOWriteTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/TextIOWriteTest.java
@@ -39,6 +39,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.nio.channels.Channels;
import java.nio.channels.WritableByteChannel;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
@@ -73,7 +74,6 @@ import org.apache.beam.sdk.transforms.windowing.FixedWindows;
import org.apache.beam.sdk.transforms.windowing.Window;
import org.apache.beam.sdk.util.CoderUtils;
import org.apache.beam.sdk.values.PCollection;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Function;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Functions;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Predicate;
@@ -492,7 +492,7 @@ public class TextIOWriteTest {
List<String> expectedElements = new ArrayList<>(elems.length);
for (String elem : elems) {
byte[] encodedElem = CoderUtils.encodeToByteArray(StringUtf8Coder.of(),
elem);
- String line = new String(encodedElem, Charsets.UTF_8);
+ String line = new String(encodedElem, StandardCharsets.UTF_8);
expectedElements.add(line);
}
@@ -509,7 +509,7 @@ public class TextIOWriteTest {
private static List<String> readLinesFromFile(File f) throws IOException {
List<String> currentFile = new ArrayList<>();
- try (BufferedReader reader = Files.newBufferedReader(f.toPath(),
Charsets.UTF_8)) {
+ try (BufferedReader reader = Files.newBufferedReader(f.toPath(),
StandardCharsets.UTF_8)) {
while (true) {
String line = reader.readLine();
if (line == null) {
diff --git
a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/TextRowCountEstimatorTest.java
b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/TextRowCountEstimatorTest.java
index 17ca3ba85fd..e52d4112e11 100644
---
a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/TextRowCountEstimatorTest.java
+++
b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/TextRowCountEstimatorTest.java
@@ -20,8 +20,8 @@ package org.apache.beam.sdk.io;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import org.apache.beam.sdk.options.PipelineOptionsFactory;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.io.Files;
import org.junit.Assert;
import org.junit.Rule;
@@ -38,7 +38,7 @@ public class TextRowCountEstimatorTest {
@Test
public void testNonEmptyFiles() throws Exception {
File file1 = temporaryFolder.newFile("file1.txt");
- Writer writer = Files.newWriter(file1, Charsets.UTF_8);
+ Writer writer = Files.newWriter(file1, StandardCharsets.UTF_8);
for (int i = 0; i < 100; i++) {
writer.write("123123123\n");
}
@@ -47,7 +47,7 @@ public class TextRowCountEstimatorTest {
temporaryFolder.newFolder("testfolder");
temporaryFolder.newFolder("testfolder2");
file1 = temporaryFolder.newFile("testfolder/test2.txt");
- writer = Files.newWriter(file1, Charsets.UTF_8);
+ writer = Files.newWriter(file1, StandardCharsets.UTF_8);
for (int i = 0; i < 50; i++) {
writer.write("123123123\n");
}
@@ -71,7 +71,7 @@ public class TextRowCountEstimatorTest {
@Test
public void testEmptyFile() throws Exception {
File file1 = temporaryFolder.newFile("file1.txt");
- Writer writer = Files.newWriter(file1, Charsets.UTF_8);
+ Writer writer = Files.newWriter(file1, StandardCharsets.UTF_8);
for (int i = 0; i < 100; i++) {
writer.write("\n");
}
@@ -86,7 +86,7 @@ public class TextRowCountEstimatorTest {
@Test(expected = TextRowCountEstimator.NoEstimationException.class)
public void lotsOfNewLines() throws Exception {
File file1 = temporaryFolder.newFile("file1.txt");
- Writer writer = Files.newWriter(file1, Charsets.UTF_8);
+ Writer writer = Files.newWriter(file1, StandardCharsets.UTF_8);
for (int i = 0; i < 1000; i++) {
writer.write("\n");
}
diff --git
a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/WriteFilesTest.java
b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/WriteFilesTest.java
index 0ab8efac7eb..cc174002bb4 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/io/WriteFilesTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/io/WriteFilesTest.java
@@ -35,6 +35,7 @@ import static org.junit.Assert.assertTrue;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.text.DecimalFormat;
import java.util.ArrayList;
@@ -93,7 +94,6 @@ import org.apache.beam.sdk.values.PCollection.IsBounded;
import org.apache.beam.sdk.values.PCollectionView;
import org.apache.beam.sdk.values.PDone;
import org.apache.beam.sdk.values.ShardedKey;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Optional;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.Iterables;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.Lists;
@@ -1035,7 +1035,8 @@ public class WriteFilesTest {
List<String> actual = Lists.newArrayList();
for (File outputFile : outputFiles) {
List<String> actualShard = Lists.newArrayList();
- try (BufferedReader reader =
Files.newBufferedReader(outputFile.toPath(), Charsets.UTF_8)) {
+ try (BufferedReader reader =
+ Files.newBufferedReader(outputFile.toPath(),
StandardCharsets.UTF_8)) {
for (; ; ) {
String line = reader.readLine();
if (line == null) {
diff --git
a/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsFactoryTest.java
b/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsFactoryTest.java
index 2643fb556ff..291bb529788 100644
---
a/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsFactoryTest.java
+++
b/sdks/java/core/src/test/java/org/apache/beam/sdk/options/PipelineOptionsFactoryTest.java
@@ -59,6 +59,7 @@ import com.google.auto.service.AutoService;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -74,7 +75,6 @@ import org.apache.beam.sdk.testing.ExpectedLogs;
import org.apache.beam.sdk.testing.InterceptingUrlClassLoader;
import org.apache.beam.sdk.testing.RestoreSystemProperties;
import org.apache.beam.sdk.util.common.ReflectHelpers;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ArrayListMultimap;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.Collections2;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
@@ -1727,7 +1727,7 @@ public class PipelineOptionsFactoryTest {
assertFalse(
PipelineOptionsFactory.printHelpUsageAndExitIfNeeded(
arguments, new PrintStream(baos), false /* exit */));
- String output = new String(baos.toByteArray(), Charsets.UTF_8);
+ String output = new String(baos.toByteArray(), StandardCharsets.UTF_8);
assertEquals("", output);
}
@@ -1739,7 +1739,7 @@ public class PipelineOptionsFactoryTest {
assertTrue(
PipelineOptionsFactory.printHelpUsageAndExitIfNeeded(
arguments, new PrintStream(baos), false /* exit */));
- String output = new String(baos.toByteArray(), Charsets.UTF_8);
+ String output = new String(baos.toByteArray(), StandardCharsets.UTF_8);
assertThat(output, containsString("The set of registered options are:"));
assertThat(output,
containsString("org.apache.beam.sdk.options.PipelineOptions"));
assertThat(output, containsString("Use --help=<OptionsName> for detailed
help."));
@@ -1753,7 +1753,7 @@ public class PipelineOptionsFactoryTest {
assertTrue(
PipelineOptionsFactory.printHelpUsageAndExitIfNeeded(
arguments, new PrintStream(baos), false /* exit */));
- String output = new String(baos.toByteArray(), Charsets.UTF_8);
+ String output = new String(baos.toByteArray(), StandardCharsets.UTF_8);
assertThat(output,
containsString("org.apache.beam.sdk.options.PipelineOptions"));
assertThat(output, containsString("--runner"));
assertThat(output, containsString("Default: " + DEFAULT_RUNNER_NAME));
@@ -1769,7 +1769,7 @@ public class PipelineOptionsFactoryTest {
assertTrue(
PipelineOptionsFactory.printHelpUsageAndExitIfNeeded(
arguments, new PrintStream(baos), false /* exit */));
- String output = new String(baos.toByteArray(), Charsets.UTF_8);
+ String output = new String(baos.toByteArray(), StandardCharsets.UTF_8);
assertThat(output,
containsString("org.apache.beam.sdk.options.PipelineOptions"));
assertThat(output, containsString("--runner"));
assertThat(output, containsString("Default: " + DEFAULT_RUNNER_NAME));
@@ -1785,7 +1785,7 @@ public class PipelineOptionsFactoryTest {
assertTrue(
PipelineOptionsFactory.printHelpUsageAndExitIfNeeded(
arguments, new PrintStream(baos), false /* exit */));
- String output = new String(baos.toByteArray(), Charsets.UTF_8);
+ String output = new String(baos.toByteArray(), StandardCharsets.UTF_8);
assertThat(output,
containsString("org.apache.beam.sdk.options.PipelineOptions"));
assertThat(output, containsString("--runner"));
assertThat(output, containsString("Default: " + DEFAULT_RUNNER_NAME));
@@ -1815,7 +1815,7 @@ public class PipelineOptionsFactoryTest {
assertTrue(
PipelineOptionsFactory.printHelpUsageAndExitIfNeeded(
arguments, new PrintStream(baos), false /* exit */));
- String output = new String(baos.toByteArray(), Charsets.UTF_8);
+ String output = new String(baos.toByteArray(), StandardCharsets.UTF_8);
assertThat(output, containsString("Multiple matches found for
NameConflict"));
assertThat(
output,
@@ -1839,7 +1839,7 @@ public class PipelineOptionsFactoryTest {
assertTrue(
PipelineOptionsFactory.printHelpUsageAndExitIfNeeded(
arguments, new PrintStream(baos), false /* exit */));
- String output = new String(baos.toByteArray(), Charsets.UTF_8);
+ String output = new String(baos.toByteArray(), StandardCharsets.UTF_8);
assertThat(output, containsString("<Value | Value2>"));
}
@@ -1851,7 +1851,7 @@ public class PipelineOptionsFactoryTest {
assertTrue(
PipelineOptionsFactory.printHelpUsageAndExitIfNeeded(
arguments, new PrintStream(baos), false /* exit */));
- String output = new String(baos.toByteArray(), Charsets.UTF_8);
+ String output = new String(baos.toByteArray(), StandardCharsets.UTF_8);
assertThat(output, containsString("Unable to find option
org.apache.beam.sdk.Pipeline"));
assertThat(output, containsString("The set of registered options are:"));
assertThat(output,
containsString("org.apache.beam.sdk.options.PipelineOptions"));
@@ -1865,7 +1865,7 @@ public class PipelineOptionsFactoryTest {
assertTrue(
PipelineOptionsFactory.printHelpUsageAndExitIfNeeded(
arguments, new PrintStream(baos), false /* exit */));
- String output = new String(baos.toByteArray(), Charsets.UTF_8);
+ String output = new String(baos.toByteArray(), StandardCharsets.UTF_8);
// A hidden interface.
assertThat(
output,
not(containsString("org.apache.beam.sdk.options.DataflowPipelineDebugOptions")));
@@ -1877,7 +1877,7 @@ public class PipelineOptionsFactoryTest {
public void testProgrammaticPrintHelp() {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
PipelineOptionsFactory.printHelp(new PrintStream(baos));
- String output = new String(baos.toByteArray(), Charsets.UTF_8);
+ String output = new String(baos.toByteArray(), StandardCharsets.UTF_8);
assertThat(output, containsString("The set of registered options are:"));
assertThat(output,
containsString("org.apache.beam.sdk.options.PipelineOptions"));
}
@@ -1886,7 +1886,7 @@ public class PipelineOptionsFactoryTest {
public void testProgrammaticPrintHelpForSpecificType() {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
PipelineOptionsFactory.printHelp(new PrintStream(baos),
PipelineOptions.class);
- String output = new String(baos.toByteArray(), Charsets.UTF_8);
+ String output = new String(baos.toByteArray(), StandardCharsets.UTF_8);
assertThat(output,
containsString("org.apache.beam.sdk.options.PipelineOptions"));
assertThat(output, containsString("--runner"));
assertThat(output, containsString("Default: " + DEFAULT_RUNNER_NAME));
diff --git
a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/SchemaTranslationTest.java
b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/SchemaTranslationTest.java
index bd7a0da394a..3b22addbf54 100644
---
a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/SchemaTranslationTest.java
+++
b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/SchemaTranslationTest.java
@@ -24,6 +24,7 @@ import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertThrows;
import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
@@ -54,7 +55,6 @@ import org.apache.beam.sdk.schemas.logicaltypes.VariableBytes;
import org.apache.beam.sdk.schemas.logicaltypes.VariableString;
import org.apache.beam.sdk.values.Row;
import org.apache.beam.vendor.grpc.v1p60p1.com.google.protobuf.ByteString;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
import org.joda.time.Instant;
import org.junit.Test;
@@ -243,7 +243,8 @@ public class SchemaTranslationTest {
.setUrn("pythonsdk:value")
.setPayload(
ByteString.copyFrom(
- "some payload describing a python type",
Charsets.UTF_8))
+ "some payload describing a python type",
+ StandardCharsets.UTF_8))
.setRepresentation(
SchemaApi.FieldType.newBuilder()
.setAtomicType(SchemaApi.AtomicType.BYTES))
diff --git
a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/BufferedElementCountingOutputStreamTest.java
b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/BufferedElementCountingOutputStreamTest.java
index 5298d29dad1..0c9e0065f5a 100644
---
a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/BufferedElementCountingOutputStreamTest.java
+++
b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/BufferedElementCountingOutputStreamTest.java
@@ -29,12 +29,12 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Random;
import org.apache.beam.sdk.coders.ByteArrayCoder;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
import org.hamcrest.collection.IsIterableContainingInOrder;
import org.junit.Rule;
@@ -165,7 +165,7 @@ public class BufferedElementCountingOutputStreamTest {
public void testWritingBytesWhenFinishedThrows() throws Exception {
expectedException.expect(IOException.class);
expectedException.expectMessage("Stream has been finished.");
- testValues(toBytes("a")).write("b".getBytes(Charsets.UTF_8));
+ testValues(toBytes("a")).write("b".getBytes(StandardCharsets.UTF_8));
}
@Test
@@ -203,7 +203,7 @@ public class BufferedElementCountingOutputStreamTest {
private List<byte[]> toBytes(String... values) {
ImmutableList.Builder<byte[]> builder = ImmutableList.builder();
for (String value : values) {
- builder.add(value.getBytes(Charsets.UTF_8));
+ builder.add(value.getBytes(StandardCharsets.UTF_8));
}
return builder.build();
}
diff --git
a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/ExposedByteArrayInputStreamTest.java
b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/ExposedByteArrayInputStreamTest.java
index e87f6a2b0d0..d2679427465 100644
---
a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/ExposedByteArrayInputStreamTest.java
+++
b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/ExposedByteArrayInputStreamTest.java
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertSame;
import java.io.ByteArrayInputStream;
import java.io.IOException;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
+import java.nio.charset.StandardCharsets;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -33,7 +33,7 @@ import org.junit.runners.JUnit4;
@RunWith(JUnit4.class)
public class ExposedByteArrayInputStreamTest {
- private static final byte[] TEST_DATA = "Hello
World!".getBytes(Charsets.UTF_8);
+ private static final byte[] TEST_DATA = "Hello
World!".getBytes(StandardCharsets.UTF_8);
private ByteArrayInputStream stream = new ByteArrayInputStream(TEST_DATA);
@@ -74,6 +74,6 @@ public class ExposedByteArrayInputStreamTest {
public void testReadAllAfterReadPartial() throws IOException {
assertNotEquals(-1, exposedStream.read());
byte[] ret = exposedStream.readAll();
- assertArrayEquals("ello World!".getBytes(Charsets.UTF_8), ret);
+ assertArrayEquals("ello World!".getBytes(StandardCharsets.UTF_8), ret);
}
}
diff --git
a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/ExposedByteArrayOutputStreamTest.java
b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/ExposedByteArrayOutputStreamTest.java
index 7e1b213c85b..a4a105a89dd 100644
---
a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/ExposedByteArrayOutputStreamTest.java
+++
b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/ExposedByteArrayOutputStreamTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertSame;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
+import java.nio.charset.StandardCharsets;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -34,7 +34,7 @@ import org.junit.runners.JUnit4;
@RunWith(JUnit4.class)
public class ExposedByteArrayOutputStreamTest {
- private static final byte[] TEST_DATA = "Hello
World!".getBytes(Charsets.UTF_8);
+ private static final byte[] TEST_DATA = "Hello
World!".getBytes(StandardCharsets.UTF_8);
private ExposedByteArrayOutputStream exposedStream = new
ExposedByteArrayOutputStream();
private ByteArrayOutputStream stream = new ByteArrayOutputStream();
diff --git
a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/SerializableUtilsTest.java
b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/SerializableUtilsTest.java
index e15bd42dc3c..1f3ec0f427b 100644
---
a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/SerializableUtilsTest.java
+++
b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/SerializableUtilsTest.java
@@ -24,12 +24,12 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import org.apache.beam.sdk.coders.AtomicCoder;
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.coders.CoderException;
import org.apache.beam.sdk.testing.InterceptingUrlClassLoader;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
import org.junit.Rule;
import org.junit.Test;
@@ -93,7 +93,7 @@ public class SerializableUtilsTest {
expectedException.expect(IllegalArgumentException.class);
expectedException.expectMessage("unable to deserialize a bogus string");
SerializableUtils.deserializeFromByteArray(
- "this isn't legal".getBytes(Charsets.UTF_8), "a bogus string");
+ "this isn't legal".getBytes(StandardCharsets.UTF_8), "a bogus string");
}
/** A class that is not serializable by Java. */
diff --git
a/sdks/java/expansion-service/src/test/java/org/apache/beam/sdk/expansion/service/ExpansionServiceTest.java
b/sdks/java/expansion-service/src/test/java/org/apache/beam/sdk/expansion/service/ExpansionServiceTest.java
index 3bd87c2ae5c..1c8d515d5c8 100644
---
a/sdks/java/expansion-service/src/test/java/org/apache/beam/sdk/expansion/service/ExpansionServiceTest.java
+++
b/sdks/java/expansion-service/src/test/java/org/apache/beam/sdk/expansion/service/ExpansionServiceTest.java
@@ -33,6 +33,7 @@ import com.google.auto.service.AutoService;
import com.google.auto.value.AutoValue;
import java.io.IOException;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList;
@@ -60,7 +61,6 @@ import org.apache.beam.sdk.transforms.Impulse;
import org.apache.beam.sdk.util.ByteStringOutputStream;
import org.apache.beam.sdk.util.construction.PipelineTranslation;
import org.apache.beam.sdk.values.Row;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableMap;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.Iterables;
@@ -84,7 +84,7 @@ public class ExpansionServiceTest {
private ExpansionService expansionService = new ExpansionService();
public static final List<byte[]> BYTE_LIST =
ImmutableList.of("testing", "compound", "coders").stream()
- .map(str -> str.getBytes(Charsets.UTF_8))
+ .map(str -> str.getBytes(StandardCharsets.UTF_8))
.collect(Collectors.toList());
public static final Map<String, Long> BYTE_KV_LIST =
ImmutableList.of("testing", "compound", "coders").stream()
diff --git
a/sdks/java/extensions/avro/src/main/java/org/apache/beam/sdk/extensions/avro/AvroGenericCoderTranslator.java
b/sdks/java/extensions/avro/src/main/java/org/apache/beam/sdk/extensions/avro/AvroGenericCoderTranslator.java
index 67f386411d8..e56b95d7f8a 100644
---
a/sdks/java/extensions/avro/src/main/java/org/apache/beam/sdk/extensions/avro/AvroGenericCoderTranslator.java
+++
b/sdks/java/extensions/avro/src/main/java/org/apache/beam/sdk/extensions/avro/AvroGenericCoderTranslator.java
@@ -17,6 +17,7 @@
*/
package org.apache.beam.sdk.extensions.avro;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.List;
import org.apache.avro.Schema;
@@ -24,7 +25,6 @@ import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.extensions.avro.coders.AvroGenericCoder;
import
org.apache.beam.sdk.util.construction.CoderTranslation.TranslationContext;
import org.apache.beam.sdk.util.construction.CoderTranslator;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
/** Coder translator for AvroGenericCoder. */
public class AvroGenericCoderTranslator implements
CoderTranslator<AvroGenericCoder> {
@@ -35,13 +35,13 @@ public class AvroGenericCoderTranslator implements
CoderTranslator<AvroGenericCo
@Override
public byte[] getPayload(AvroGenericCoder from) {
- return from.getSchema().toString().getBytes(Charsets.UTF_8);
+ return from.getSchema().toString().getBytes(StandardCharsets.UTF_8);
}
@Override
public AvroGenericCoder fromComponents(
List<Coder<?>> components, byte[] payload, TranslationContext context) {
- Schema schema = new Schema.Parser().parse(new String(payload,
Charsets.UTF_8));
+ Schema schema = new Schema.Parser().parse(new String(payload,
StandardCharsets.UTF_8));
return AvroGenericCoder.of(schema);
}
}
diff --git
a/sdks/java/extensions/avro/src/test/java/org/apache/beam/sdk/extensions/avro/io/AvroIOTest.java
b/sdks/java/extensions/avro/src/test/java/org/apache/beam/sdk/extensions/avro/io/AvroIOTest.java
index 30a1a778725..2a0bc36f6e9 100644
---
a/sdks/java/extensions/avro/src/test/java/org/apache/beam/sdk/extensions/avro/io/AvroIOTest.java
+++
b/sdks/java/extensions/avro/src/test/java/org/apache/beam/sdk/extensions/avro/io/AvroIOTest.java
@@ -36,6 +36,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
@@ -100,7 +101,6 @@ import org.apache.beam.sdk.util.SerializableUtils;
import org.apache.beam.sdk.values.PCollection;
import org.apache.beam.sdk.values.PCollectionView;
import org.apache.beam.sdk.values.TimestampedValue;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.MoreObjects;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ArrayListMultimap;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
@@ -1436,7 +1436,7 @@ public class AvroIOTest implements Serializable {
"longKey",
100L,
"bytesKey",
- "bytesValue".getBytes(Charsets.UTF_8))));
+ "bytesValue".getBytes(StandardCharsets.UTF_8))));
writePipeline.run();
try (DataFileStream dataFileStream =
@@ -1444,7 +1444,7 @@ public class AvroIOTest implements Serializable {
assertEquals("stringValue", dataFileStream.getMetaString("stringKey"));
assertEquals(100L, dataFileStream.getMetaLong("longKey"));
assertArrayEquals(
- "bytesValue".getBytes(Charsets.UTF_8),
dataFileStream.getMeta("bytesKey"));
+ "bytesValue".getBytes(StandardCharsets.UTF_8),
dataFileStream.getMeta("bytesKey"));
}
}
diff --git
a/sdks/java/extensions/python/src/main/java/org/apache/beam/sdk/extensions/python/PythonExternalTransform.java
b/sdks/java/extensions/python/src/main/java/org/apache/beam/sdk/extensions/python/PythonExternalTransform.java
index e4e5f353344..c23a771f3cc 100644
---
a/sdks/java/extensions/python/src/main/java/org/apache/beam/sdk/extensions/python/PythonExternalTransform.java
+++
b/sdks/java/extensions/python/src/main/java/org/apache/beam/sdk/extensions/python/PythonExternalTransform.java
@@ -22,6 +22,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -61,7 +62,6 @@ import org.apache.beam.sdk.values.TupleTag;
import org.apache.beam.sdk.values.TypeDescriptor;
import org.apache.beam.vendor.grpc.v1p60p1.com.google.protobuf.ByteString;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.annotations.VisibleForTesting;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Preconditions;
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Strings;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
@@ -499,7 +499,8 @@ public class PythonExternalTransform<InputT extends PInput,
OutputT extends POut
requirementsFile.deleteOnExit();
try (Writer fout =
new OutputStreamWriter(
- new FileOutputStream(requirementsFile.getAbsolutePath()),
Charsets.UTF_8)) {
+ new FileOutputStream(requirementsFile.getAbsolutePath()),
+ StandardCharsets.UTF_8)) {
for (String pkg : extraPackages) {
fout.write(pkg);
fout.write('\n');
diff --git
a/sdks/java/extensions/python/src/main/java/org/apache/beam/sdk/extensions/python/PythonService.java
b/sdks/java/extensions/python/src/main/java/org/apache/beam/sdk/extensions/python/PythonService.java
index 4392f23c463..ab4d02ec838 100644
---
a/sdks/java/extensions/python/src/main/java/org/apache/beam/sdk/extensions/python/PythonService.java
+++
b/sdks/java/extensions/python/src/main/java/org/apache/beam/sdk/extensions/python/PythonService.java
@@ -24,13 +24,13 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.net.ServerSocket;
import java.net.Socket;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.TimeoutException;
import org.apache.beam.sdk.util.ReleaseInfo;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.annotations.VisibleForTesting;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.io.ByteStreams;
import org.slf4j.Logger;
@@ -106,7 +106,8 @@ public class PythonService {
new
ProcessBuilder(bootstrapCommand).redirectError(ProcessBuilder.Redirect.INHERIT).start();
bootstrap.getOutputStream().close();
BufferedReader reader =
- new BufferedReader(new InputStreamReader(bootstrap.getInputStream(),
Charsets.UTF_8));
+ new BufferedReader(
+ new InputStreamReader(bootstrap.getInputStream(),
StandardCharsets.UTF_8));
String lastLine = reader.readLine();
String lastNonEmptyLine = lastLine;
while (lastLine != null) {
diff --git a/sdks/java/extensions/sql/jdbc/build.gradle
b/sdks/java/extensions/sql/jdbc/build.gradle
index 41fddce7116..c5d462e0f5c 100644
--- a/sdks/java/extensions/sql/jdbc/build.gradle
+++ b/sdks/java/extensions/sql/jdbc/build.gradle
@@ -35,11 +35,11 @@ dependencies {
implementation "jline:jline:2.14.6"
permitUnusedDeclared "jline:jline:2.14.6" // BEAM-11761
implementation "sqlline:sqlline:1.4.0"
- implementation library.java.vendored_guava_32_1_2_jre
implementation library.java.vendored_calcite_1_28_0
permitUnusedDeclared library.java.vendored_calcite_1_28_0
testImplementation project(path: ":sdks:java:io:google-cloud-platform",
configuration: "testRuntimeMigration")
testImplementation library.java.junit
+ testImplementation library.java.vendored_guava_32_1_2_jre
// Depending on outputs so integrationTest can run with only test
dependencies.
// This enables us to test the JDBC jar being loaded on a custom classloader.
integrationTest sourceSets.test.output
diff --git
a/sdks/java/extensions/sql/jdbc/src/main/java/org/apache/beam/sdk/extensions/sql/jdbc/BeamSqlLine.java
b/sdks/java/extensions/sql/jdbc/src/main/java/org/apache/beam/sdk/extensions/sql/jdbc/BeamSqlLine.java
index ac049608ebc..8c87343cd7c 100644
---
a/sdks/java/extensions/sql/jdbc/src/main/java/org/apache/beam/sdk/extensions/sql/jdbc/BeamSqlLine.java
+++
b/sdks/java/extensions/sql/jdbc/src/main/java/org/apache/beam/sdk/extensions/sql/jdbc/BeamSqlLine.java
@@ -23,10 +23,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import org.checkerframework.checker.nullness.qual.Nullable;
import sqlline.SqlLine;
import sqlline.SqlLine.Status;
@@ -68,11 +68,11 @@ public class BeamSqlLine {
SqlLine sqlLine = new SqlLine();
if (outputStream != null) {
- sqlLine.setOutputStream(new PrintStream(outputStream, false,
Charsets.UTF_8.name()));
+ sqlLine.setOutputStream(new PrintStream(outputStream, false,
StandardCharsets.UTF_8.name()));
}
if (errorStream != null) {
- sqlLine.setErrorStream(new PrintStream(errorStream, false,
Charsets.UTF_8.name()));
+ sqlLine.setErrorStream(new PrintStream(errorStream, false,
StandardCharsets.UTF_8.name()));
}
return sqlLine.begin(modifiedArgs, inputStream, true);
diff --git
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/text/TextTableProviderTest.java
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/text/TextTableProviderTest.java
index e5a46f87700..e34106db1d9 100644
---
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/text/TextTableProviderTest.java
+++
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/meta/provider/text/TextTableProviderTest.java
@@ -21,6 +21,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsInAnyOrder;
import java.io.File;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import org.apache.beam.sdk.extensions.sql.SqlTransform;
import org.apache.beam.sdk.schemas.Schema;
@@ -33,7 +34,6 @@ import org.apache.beam.sdk.util.Sleeper;
import org.apache.beam.sdk.values.PCollection;
import org.apache.beam.sdk.values.Row;
import org.apache.beam.sdk.values.TypeDescriptors;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
@@ -81,7 +81,7 @@ public class TextTableProviderTest {
public void testLegacyDefaultCsv() throws Exception {
Files.write(
tempFolder.newFile("test.csv").toPath(),
- "hello,13\n\ngoodbye,42\n".getBytes(Charsets.UTF_8));
+ "hello,13\n\ngoodbye,42\n".getBytes(StandardCharsets.UTF_8));
String query = "SELECT * FROM test";
String ddl =
String.format(
@@ -105,7 +105,7 @@ public class TextTableProviderTest {
public void testLegacyTdfCsv() throws Exception {
Files.write(
tempFolder.newFile("test.csv").toPath(),
- "hello\t13\n\ngoodbye\t42\n".getBytes(Charsets.UTF_8));
+ "hello\t13\n\ngoodbye\t42\n".getBytes(StandardCharsets.UTF_8));
String query = "SELECT * FROM test";
String ddl =
@@ -138,7 +138,7 @@ public class TextTableProviderTest {
public void testExplicitCsv() throws Exception {
Files.write(
tempFolder.newFile("test.csv").toPath(),
- "hello,13\n\ngoodbye,42\n".getBytes(Charsets.UTF_8));
+ "hello,13\n\ngoodbye,42\n".getBytes(StandardCharsets.UTF_8));
String query = "SELECT * FROM test";
String ddl =
@@ -165,7 +165,8 @@ public class TextTableProviderTest {
@Test
public void testExplicitCsvExcel() throws Exception {
Files.write(
- tempFolder.newFile("test.csv").toPath(),
"hello\n\ngoodbye\n".getBytes(Charsets.UTF_8));
+ tempFolder.newFile("test.csv").toPath(),
+ "hello\n\ngoodbye\n".getBytes(StandardCharsets.UTF_8));
String query = "SELECT * FROM test";
String ddl =
@@ -191,7 +192,8 @@ public class TextTableProviderTest {
public void testLines() throws Exception {
// Data that looks like CSV but isn't parsed as it
Files.write(
- tempFolder.newFile("test.csv").toPath(),
"hello,13\ngoodbye,42\n".getBytes(Charsets.UTF_8));
+ tempFolder.newFile("test.csv").toPath(),
+ "hello,13\ngoodbye,42\n".getBytes(StandardCharsets.UTF_8));
String query = "SELECT * FROM test";
String ddl =
@@ -210,7 +212,8 @@ public class TextTableProviderTest {
@Test
public void testJson() throws Exception {
- Files.write(tempFolder.newFile("test.json").toPath(),
JSON_TEXT.getBytes(Charsets.UTF_8));
+ Files.write(
+ tempFolder.newFile("test.json").toPath(),
JSON_TEXT.getBytes(StandardCharsets.UTF_8));
String query = "SELECT * FROM test";
String ddl =
@@ -229,7 +232,8 @@ public class TextTableProviderTest {
public void testInvalidJson() throws Exception {
File deadLetterFile = new File(tempFolder.getRoot(), "dead-letter-file");
Files.write(
- tempFolder.newFile("test.json").toPath(),
INVALID_JSON_TEXT.getBytes(Charsets.UTF_8));
+ tempFolder.newFile("test.json").toPath(),
+ INVALID_JSON_TEXT.getBytes(StandardCharsets.UTF_8));
String query = "SELECT * FROM test";
String ddl =
diff --git
a/sdks/java/io/clickhouse/src/main/java/org/apache/beam/sdk/io/clickhouse/ClickHouseWriter.java
b/sdks/java/io/clickhouse/src/main/java/org/apache/beam/sdk/io/clickhouse/ClickHouseWriter.java
index c8c49a656e3..09a6ced44d3 100644
---
a/sdks/java/io/clickhouse/src/main/java/org/apache/beam/sdk/io/clickhouse/ClickHouseWriter.java
+++
b/sdks/java/io/clickhouse/src/main/java/org/apache/beam/sdk/io/clickhouse/ClickHouseWriter.java
@@ -21,12 +21,12 @@ import com.clickhouse.client.ClickHouseOutputStream;
import com.clickhouse.client.ClickHousePipedOutputStream;
import com.clickhouse.client.data.BinaryStreamUtils;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.List;
import org.apache.beam.sdk.io.clickhouse.TableSchema.ColumnType;
import org.apache.beam.sdk.values.Row;
import org.apache.beam.sdk.values.RowWithStorage;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Preconditions;
import org.joda.time.Days;
import org.joda.time.Instant;
@@ -60,7 +60,7 @@ public class ClickHouseWriter {
byte[] bytes;
if (value instanceof String) {
- bytes = ((String) value).getBytes(Charsets.UTF_8);
+ bytes = ((String) value).getBytes(StandardCharsets.UTF_8);
} else {
bytes = ((byte[]) value);
}
diff --git
a/sdks/java/io/contextualtextio/src/test/java/org/apache/beam/sdk/io/contextualtextio/ContextualTextIOTest.java
b/sdks/java/io/contextualtextio/src/test/java/org/apache/beam/sdk/io/contextualtextio/ContextualTextIOTest.java
index 48904cae430..2cc89a2a0dc 100644
---
a/sdks/java/io/contextualtextio/src/test/java/org/apache/beam/sdk/io/contextualtextio/ContextualTextIOTest.java
+++
b/sdks/java/io/contextualtextio/src/test/java/org/apache/beam/sdk/io/contextualtextio/ContextualTextIOTest.java
@@ -44,6 +44,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintStream;
import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
@@ -87,7 +88,6 @@ import org.apache.beam.sdk.transforms.windowing.Window;
import org.apache.beam.sdk.util.CoderUtils;
import org.apache.beam.sdk.values.PCollection;
import org.apache.beam.sdk.values.Row;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Joiner;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.Iterables;
@@ -524,7 +524,7 @@ public class ContextualTextIOTest {
try (PrintStream writer = new PrintStream(new
FileOutputStream(tmpFile))) {
for (String elem : input) {
byte[] encodedElem =
CoderUtils.encodeToByteArray(StringUtf8Coder.of(), elem);
- String line = new String(encodedElem, Charsets.UTF_8);
+ String line = new String(encodedElem, StandardCharsets.UTF_8);
writer.println(line);
}
}
@@ -548,7 +548,7 @@ public class ContextualTextIOTest {
for (int lineNum = 0; lineNum < numLines; ++lineNum) {
String elem = filename + " " + lineNum;
byte[] encodedElem =
CoderUtils.encodeToByteArray(StringUtf8Coder.of(), elem);
- String line = new String(encodedElem, Charsets.UTF_8);
+ String line = new String(encodedElem, StandardCharsets.UTF_8);
writer.println(line);
}
}
@@ -588,7 +588,7 @@ public class ContextualTextIOTest {
for (int lineNum = 0; lineNum < 10 + num; ++lineNum) {
String elem = filename + " " + lineNum;
byte[] encodedElem =
CoderUtils.encodeToByteArray(StringUtf8Coder.of(), elem);
- String line = new String(encodedElem, Charsets.UTF_8);
+ String line = new String(encodedElem, StandardCharsets.UTF_8);
writer.println(line);
}
}
@@ -817,7 +817,7 @@ public class ContextualTextIOTest {
try (PrintStream writer = new PrintStream(new
FileOutputStream(tmpFile))) {
for (String elem : expected) {
byte[] encodedElem =
CoderUtils.encodeToByteArray(StringUtf8Coder.of(), elem);
- String line = new String(encodedElem, Charsets.UTF_8);
+ String line = new String(encodedElem, StandardCharsets.UTF_8);
writer.println(line);
}
}
@@ -840,7 +840,7 @@ public class ContextualTextIOTest {
int lineNum = 0;
for (String elem : expected) {
byte[] encodedElem =
CoderUtils.encodeToByteArray(StringUtf8Coder.of(), elem);
- String line = new String(encodedElem, Charsets.UTF_8);
+ String line = new String(encodedElem, StandardCharsets.UTF_8);
writer.println(line);
actualExpected.add(lineNum + " " + filePath + " " + line);
lineNum++;
@@ -1121,7 +1121,7 @@ public class ContextualTextIOTest {
public void testProgressTextFile() throws IOException {
String file = "line1\nline2\nline3";
try (BoundedSource.BoundedReader<Row> reader =
- prepareSource(file.getBytes(Charsets.UTF_8))
+ prepareSource(file.getBytes(StandardCharsets.UTF_8))
.createReader(PipelineOptionsFactory.create())) {
// Check preconditions before starting
assertEquals(0.0, reader.getFractionConsumed(), 1e-6);
@@ -1157,7 +1157,7 @@ public class ContextualTextIOTest {
@Test
public void testProgressAfterSplitting() throws IOException {
String file = "line1\nline2\nline3";
- BoundedSource<Row> source = prepareSource(file.getBytes(Charsets.UTF_8));
+ BoundedSource<Row> source =
prepareSource(file.getBytes(StandardCharsets.UTF_8));
BoundedSource<Row> remainder;
// Create the remainder, verifying properties pre- and post-splitting.
diff --git
a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubReadSchemaTransformProviderTest.java
b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubReadSchemaTransformProviderTest.java
index dd5a9abd5ac..98aade888a3 100644
---
a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubReadSchemaTransformProviderTest.java
+++
b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/pubsub/PubsubReadSchemaTransformProviderTest.java
@@ -25,6 +25,7 @@ import com.google.protobuf.ByteString;
import com.google.protobuf.Timestamp;
import java.io.IOException;
import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@@ -47,7 +48,6 @@ import org.apache.beam.sdk.testing.PAssert;
import org.apache.beam.sdk.testing.TestPipeline;
import org.apache.beam.sdk.values.PCollectionRowTuple;
import org.apache.beam.sdk.values.Row;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableMap;
import org.junit.Rule;
@@ -170,7 +170,7 @@ public class PubsubReadSchemaTransformProviderTest {
PCollectionRowTuple begin = PCollectionRowTuple.empty(p);
Schema rawSchema = Schema.of(Schema.Field.of("payload",
Schema.FieldType.BYTES));
- byte[] payload = "some payload".getBytes(Charsets.UTF_8);
+ byte[] payload = "some payload".getBytes(StandardCharsets.UTF_8);
try (PubsubTestClientFactory clientFactory =
clientFactory(ImmutableList.of(incomingMessageOf(payload,
CLOCK.currentTimeMillis())))) {
@@ -211,7 +211,7 @@ public class PubsubReadSchemaTransformProviderTest {
.addStringField("attr")
.addMapField("attrMap", Schema.FieldType.STRING,
Schema.FieldType.STRING)
.build();
- byte[] payload = "some payload".getBytes(Charsets.UTF_8);
+ byte[] payload = "some payload".getBytes(StandardCharsets.UTF_8);
String attr = "attr value";
try (PubsubTestClientFactory clientFactory =
diff --git
a/sdks/java/io/kafka/src/test/java/org/apache/beam/sdk/io/kafka/ReadFromKafkaDoFnTest.java
b/sdks/java/io/kafka/src/test/java/org/apache/beam/sdk/io/kafka/ReadFromKafkaDoFnTest.java
index 612b20393d7..6ee3d9d96ef 100644
---
a/sdks/java/io/kafka/src/test/java/org/apache/beam/sdk/io/kafka/ReadFromKafkaDoFnTest.java
+++
b/sdks/java/io/kafka/src/test/java/org/apache/beam/sdk/io/kafka/ReadFromKafkaDoFnTest.java
@@ -21,6 +21,7 @@ import static
org.apache.beam.sdk.transforms.errorhandling.BadRecordRouter.BAD_R
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Collection;
@@ -57,7 +58,6 @@ import org.apache.beam.sdk.values.PValue;
import org.apache.beam.sdk.values.Row;
import org.apache.beam.sdk.values.TupleTag;
import org.apache.beam.sdk.values.TypeDescriptor;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableMap;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.Iterables;
@@ -257,8 +257,8 @@ public class ReadFromKafkaDoFnTest {
topicPartition.topic(),
topicPartition.partition(),
startOffset + i,
- key.getBytes(Charsets.UTF_8),
- value.getBytes(Charsets.UTF_8)));
+ key.getBytes(StandardCharsets.UTF_8),
+ value.getBytes(StandardCharsets.UTF_8)));
}
if (records.isEmpty()) {
return ConsumerRecords.empty();
diff --git
a/sdks/java/testing/tpcds/src/main/java/org/apache/beam/sdk/tpcds/QueryReader.java
b/sdks/java/testing/tpcds/src/main/java/org/apache/beam/sdk/tpcds/QueryReader.java
index 4983d52a642..8071bad84d7 100644
---
a/sdks/java/testing/tpcds/src/main/java/org/apache/beam/sdk/tpcds/QueryReader.java
+++
b/sdks/java/testing/tpcds/src/main/java/org/apache/beam/sdk/tpcds/QueryReader.java
@@ -17,11 +17,11 @@
*/
package org.apache.beam.sdk.tpcds;
+import java.nio.charset.StandardCharsets;
import java.util.Set;
import org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.sql.SqlNode;
import
org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.sql.parser.SqlParseException;
import
org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.sql.parser.SqlParser;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.io.Resources;
/**
@@ -39,7 +39,7 @@ public class QueryReader {
*/
public static String readQuery(String queryFileName) throws Exception {
String path = "queries/" + queryFileName + ".sql";
- return Resources.toString(Resources.getResource(path), Charsets.UTF_8);
+ return Resources.toString(Resources.getResource(path),
StandardCharsets.UTF_8);
}
/**
diff --git
a/sdks/java/testing/tpcds/src/main/java/org/apache/beam/sdk/tpcds/SqlTransformRunner.java
b/sdks/java/testing/tpcds/src/main/java/org/apache/beam/sdk/tpcds/SqlTransformRunner.java
index 1550a25b7c8..6efb7e7e065 100644
---
a/sdks/java/testing/tpcds/src/main/java/org/apache/beam/sdk/tpcds/SqlTransformRunner.java
+++
b/sdks/java/testing/tpcds/src/main/java/org/apache/beam/sdk/tpcds/SqlTransformRunner.java
@@ -21,6 +21,7 @@ import static java.util.stream.Collectors.toList;
import static org.apache.beam.sdk.util.Preconditions.checkStateNotNull;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -56,7 +57,6 @@ import org.apache.beam.sdk.values.TupleTag;
import org.apache.beam.sdk.values.TypeDescriptors;
import
org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.sql.SqlIdentifier;
import
org.apache.beam.vendor.calcite.v1_28_0.org.apache.calcite.sql.util.SqlBasicVisitor;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableMap;
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.io.Resources;
import org.apache.commons.csv.CSVFormat;
@@ -212,7 +212,7 @@ public class SqlTransformRunner {
private static org.apache.avro.Schema getAvroSchema(String tableName) throws
IOException {
String path = "schemas_avro/" + tableName + ".json";
return new org.apache.avro.Schema.Parser()
- .parse(Resources.toString(Resources.getResource(path),
Charsets.UTF_8));
+ .parse(Resources.toString(Resources.getResource(path),
StandardCharsets.UTF_8));
}
static org.apache.avro.Schema getProjectedSchema(
diff --git
a/sdks/java/testing/tpcds/src/main/java/org/apache/beam/sdk/tpcds/TableSchemaJSONLoader.java
b/sdks/java/testing/tpcds/src/main/java/org/apache/beam/sdk/tpcds/TableSchemaJSONLoader.java
index 485fa83a4a8..97116e14cdc 100644
---
a/sdks/java/testing/tpcds/src/main/java/org/apache/beam/sdk/tpcds/TableSchemaJSONLoader.java
+++
b/sdks/java/testing/tpcds/src/main/java/org/apache/beam/sdk/tpcds/TableSchemaJSONLoader.java
@@ -20,11 +20,11 @@ package org.apache.beam.sdk.tpcds;
import static org.apache.beam.sdk.util.Preconditions.checkArgumentNotNull;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.io.Resources;
import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.reflect.ClassPath;
import org.json.simple.JSONArray;
@@ -49,7 +49,7 @@ public class TableSchemaJSONLoader {
@SuppressWarnings({"rawtypes", "DefaultCharset"})
public static String parseTableSchema(String tableName) throws Exception {
String path = "schemas/" + tableName + ".json";
- String schema = Resources.toString(Resources.getResource(path),
Charsets.UTF_8);
+ String schema = Resources.toString(Resources.getResource(path),
StandardCharsets.UTF_8);
JSONObject jsonObject = (JSONObject) new JSONParser().parse(schema);
JSONArray jsonArray = (JSONArray) jsonObject.get("schema");
diff --git
a/sdks/java/transform-service/launcher/src/test/java/org/apache/beam/sdk/transformservice/launcher/TransformServiceLauncherTest.java
b/sdks/java/transform-service/launcher/src/test/java/org/apache/beam/sdk/transformservice/launcher/TransformServiceLauncherTest.java
index a9ae5360a85..b766d2b13a4 100644
---
a/sdks/java/transform-service/launcher/src/test/java/org/apache/beam/sdk/transformservice/launcher/TransformServiceLauncherTest.java
+++
b/sdks/java/transform-service/launcher/src/test/java/org/apache/beam/sdk/transformservice/launcher/TransformServiceLauncherTest.java
@@ -25,12 +25,12 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.UUID;
-import
org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Charsets;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -77,7 +77,7 @@ public class TransformServiceLauncherTest {
try (Writer fout =
new OutputStreamWriter(
- new FileOutputStream(requirementsFile.getAbsolutePath()),
Charsets.UTF_8)) {
+ new FileOutputStream(requirementsFile.getAbsolutePath()),
StandardCharsets.UTF_8)) {
fout.write("pypipackage1\n");
fout.write("pypipackage2\n");
}
@@ -118,7 +118,7 @@ public class TransformServiceLauncherTest {
dependency1.deleteOnExit();
try (Writer fout =
new OutputStreamWriter(
- new FileOutputStream(dependency1.getAbsolutePath()),
Charsets.UTF_8)) {
+ new FileOutputStream(dependency1.getAbsolutePath()),
StandardCharsets.UTF_8)) {
fout.write("tempdata\n");
}
@@ -128,7 +128,7 @@ public class TransformServiceLauncherTest {
dependency2.deleteOnExit();
try (Writer fout =
new OutputStreamWriter(
- new FileOutputStream(dependency2.getAbsolutePath()),
Charsets.UTF_8)) {
+ new FileOutputStream(dependency2.getAbsolutePath()),
StandardCharsets.UTF_8)) {
fout.write("tempdata\n");
}
@@ -140,7 +140,7 @@ public class TransformServiceLauncherTest {
requirementsFile.deleteOnExit();
try (Writer fout =
new OutputStreamWriter(
- new FileOutputStream(requirementsFile.getAbsolutePath()),
Charsets.UTF_8)) {
+ new FileOutputStream(requirementsFile.getAbsolutePath()),
StandardCharsets.UTF_8)) {
fout.write(dependency1.getAbsolutePath() + "\n");
fout.write(dependency2.getAbsolutePath() + "\n");
fout.write("pypipackage" + "\n");
