From 1b08c26d3feb4a5bb94ea4dd916ff81228719d6f Mon Sep 17 00:00:00 2001 From: Shaoqiang Lu Date: Sun, 16 Jul 2023 12:13:16 +0800 Subject: [PATCH] Replace Charset.defaultCharset() with StandardCharsets.UTF_8 in tests Resolves #4417 (cherry picked from commit 14b6c66543213e4f8a4bd247b313079525390c1d) --- .../item/file/builder/FlatFileItemWriterBuilderTests.java | 6 +++--- .../batch/item/json/JsonFileItemWriterFunctionalTests.java | 3 +-- .../item/json/builder/JsonFileItemWriterBuilderTests.java | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemWriterBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemWriterBuilderTests.java index 1f94531a7..855876c32 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemWriterBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemWriterBuilderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2022 the original author or authors. + * Copyright 2016-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ import java.io.BufferedReader; import java.io.File; import java.io.IOException; import java.io.InputStreamReader; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import org.junit.jupiter.api.Test; @@ -266,7 +266,7 @@ class FlatFileItemWriterBuilderTests { WritableResource output = new FileSystemResource(File.createTempFile("foo", "txt")); - String encoding = Charset.defaultCharset().name(); + String encoding = StandardCharsets.UTF_8.name(); FlatFileItemWriter writer = new FlatFileItemWriterBuilder().name("foo") .resource(output) diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/json/JsonFileItemWriterFunctionalTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/json/JsonFileItemWriterFunctionalTests.java index 3612ba984..a8d24a253 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/json/JsonFileItemWriterFunctionalTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/json/JsonFileItemWriterFunctionalTests.java @@ -19,7 +19,6 @@ package org.springframework.batch.item.json; import java.io.File; import java.io.IOException; import java.math.BigDecimal; -import java.nio.charset.Charset; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -334,7 +333,7 @@ abstract class JsonFileItemWriterFunctionalTests { } private String getContent(File file) throws IOException { - return Files.readString(file.toPath(), Charset.defaultCharset()); + return Files.readString(file.toPath()); } } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/json/builder/JsonFileItemWriterBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/json/builder/JsonFileItemWriterBuilderTests.java index fc19f18c9..da3e032be 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/json/builder/JsonFileItemWriterBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/json/builder/JsonFileItemWriterBuilderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2018-2022 the original author or authors. + * Copyright 2018-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ package org.springframework.batch.item.json.builder; import java.io.File; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; import org.junit.jupiter.api.BeforeEach; @@ -112,7 +112,7 @@ class JsonFileItemWriterBuilderTests { boolean transactional = true; boolean shouldDeleteIfEmpty = true; boolean shouldDeleteIfExists = true; - String encoding = Charset.defaultCharset().name(); + String encoding = StandardCharsets.UTF_8.name(); String lineSeparator = "#"; FlatFileHeaderCallback headerCallback = Mockito.mock(); FlatFileFooterCallback footerCallback = Mockito.mock();