Skip to content

Commit 6707f8b

Browse files
original-brownbearoriginal-brownbear
committed
Cleanup missing use of StandardCharsets
Random annoyance that I figured, I'd just fix globally: We can do a bit of a cleaner job when doing byte <-> string conversion here and there.
1 parent 9c8750b commit 6707f8b

File tree

55 files changed

+97
-99
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+97
-99
lines changed

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ConcatFilesTask.java

+9-6
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
*/
99
package org.elasticsearch.gradle.internal;
1010

11+
import com.google.common.collect.Iterables;
12+
1113
import org.gradle.api.DefaultTask;
1214
import org.gradle.api.file.FileCollection;
1315
import org.gradle.api.tasks.Input;
@@ -85,7 +87,7 @@ public void setAdditionalLines(List<String> additionalLines) {
8587
public void concatFiles() throws IOException {
8688
if (getHeaderLine() != null) {
8789
getTarget().getParentFile().mkdirs();
88-
Files.write(getTarget().toPath(), (getHeaderLine() + '\n').getBytes(StandardCharsets.UTF_8));
90+
Files.writeString(getTarget().toPath(), getHeaderLine() + '\n');
8991
}
9092

9193
// To remove duplicate lines
@@ -95,11 +97,12 @@ public void concatFiles() throws IOException {
9597
uniqueLines.addAll(Files.readAllLines(f.toPath(), StandardCharsets.UTF_8));
9698
}
9799
}
98-
Files.write(getTarget().toPath(), uniqueLines, StandardCharsets.UTF_8, StandardOpenOption.APPEND);
99-
100-
for (String additionalLine : additionalLines) {
101-
Files.write(getTarget().toPath(), (additionalLine + '\n').getBytes(StandardCharsets.UTF_8), StandardOpenOption.APPEND);
102-
}
100+
Files.write(
101+
getTarget().toPath(),
102+
Iterables.concat(uniqueLines, additionalLines),
103+
StandardCharsets.UTF_8,
104+
StandardOpenOption.APPEND
105+
);
103106
}
104107

105108
}

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DependenciesInfoTask.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public void generateDependenciesInfo() throws IOException {
155155
output.append(dep.getGroup() + ":" + dep.getName() + "," + dep.getVersion() + "," + url + "," + licenseType + "\n");
156156
}
157157

158-
Files.write(outputFile.toPath(), output.toString().getBytes("UTF-8"), StandardOpenOption.CREATE);
158+
Files.writeString(outputFile.toPath(), output.toString(), StandardOpenOption.CREATE);
159159
}
160160

161161
@Input

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/doc/RestTestsFromDocSnippetTask.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.io.File;
2525
import java.io.IOException;
2626
import java.io.PrintWriter;
27+
import java.nio.charset.StandardCharsets;
2728
import java.nio.file.Files;
2829
import java.nio.file.Path;
2930
import java.util.ArrayList;
@@ -440,7 +441,7 @@ private PrintWriter setupCurrent(Snippet test) {
440441
// Now setup the writer
441442
try {
442443
Files.createDirectories(dest.getParent());
443-
current = new PrintWriter(dest.toFile(), "UTF-8");
444+
current = new PrintWriter(dest.toFile(), StandardCharsets.UTF_8);
444445
return current;
445446
} catch (IOException e) {
446447
throw new RuntimeException(e);

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/FilePermissionsTask.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public void checkInvalidPermissions() throws IOException {
106106
}
107107

108108
outputMarker.getParentFile().mkdirs();
109-
Files.write(outputMarker.toPath(), "done".getBytes("UTF-8"));
109+
Files.writeString(outputMarker.toPath(), "done");
110110
}
111111

112112
@OutputFile

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ForbiddenPatternsTask.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public void checkInvalidPatterns() throws IOException {
135135

136136
File outputMarker = getOutputMarker();
137137
outputMarker.getParentFile().mkdirs();
138-
Files.write(outputMarker.toPath(), "done".getBytes(StandardCharsets.UTF_8));
138+
Files.writeString(outputMarker.toPath(), "done");
139139
}
140140

141141
@OutputFile

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ThirdPartyAuditTask.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ private String runForbiddenAPIsCli() throws IOException {
364364
}
365365
final String forbiddenApisOutput;
366366
try (ByteArrayOutputStream outputStream = errorOut) {
367-
forbiddenApisOutput = outputStream.toString(StandardCharsets.UTF_8.name());
367+
forbiddenApisOutput = outputStream.toString(StandardCharsets.UTF_8);
368368
}
369369
if (EXPECTED_EXIT_CODES.contains(result.getExitValue()) == false) {
370370
throw new IllegalStateException("Forbidden APIs cli failed: " + forbiddenApisOutput);
@@ -397,7 +397,7 @@ private Set<String> runJdkJarHellCheck() throws IOException {
397397
}
398398
final String jdkJarHellCheckList;
399399
try (ByteArrayOutputStream outputStream = standardOut) {
400-
jdkJarHellCheckList = outputStream.toString(StandardCharsets.UTF_8.name());
400+
jdkJarHellCheckList = outputStream.toString(StandardCharsets.UTF_8);
401401
}
402402
return new TreeSet<>(Arrays.asList(jdkJarHellCheckList.split("\\r?\\n")));
403403
}

‎build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/ConcatFilesTaskTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ public void testConcatenationWithUnique() throws IOException {
6060
file2.getParentFile().mkdirs();
6161
file1.createNewFile();
6262
file2.createNewFile();
63-
Files.write(file1.toPath(), ("Hello" + System.lineSeparator() + "Hello").getBytes(StandardCharsets.UTF_8));
64-
Files.write(file2.toPath(), ("Hello" + System.lineSeparator() + "नमस्ते").getBytes(StandardCharsets.UTF_8));
63+
Files.writeString(file1.toPath(), "Hello" + System.lineSeparator() + "Hello");
64+
Files.writeString(file2.toPath(), "Hello" + System.lineSeparator() + "नमस्ते");
6565

6666
concatFilesTask.setFiles(project.fileTree(file1.getParentFile().getParentFile()));
6767

‎build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/precommit/DependencyLicensesTaskTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ private void createFileIn(File parent, String name, String content) throws IOExc
244244
Path file = parent.toPath().resolve(name);
245245
file.toFile().createNewFile();
246246

247-
Files.write(file, content.getBytes(StandardCharsets.UTF_8));
247+
Files.writeString(file, content);
248248
}
249249

250250
private TaskProvider<DependencyLicensesTask> createDependencyLicensesTask(Project project) {

‎build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/precommit/FilePermissionsTaskTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.junit.Test;
1919

2020
import java.io.File;
21-
import java.nio.charset.Charset;
21+
import java.nio.charset.StandardCharsets;
2222
import java.nio.file.Files;
2323
import java.util.List;
2424
import java.util.stream.Collectors;
@@ -61,7 +61,7 @@ public void testCheckPermissionsWhenNoFileExists() throws Exception {
6161
filePermissionsTask.checkInvalidPermissions();
6262

6363
File outputMarker = new File(project.getBuildDir(), "markers/filePermissions");
64-
List<String> result = Files.readAllLines(outputMarker.toPath(), Charset.forName("UTF-8"));
64+
List<String> result = Files.readAllLines(outputMarker.toPath(), StandardCharsets.UTF_8);
6565
assertEquals("done", result.get(0));
6666
}
6767

@@ -80,7 +80,7 @@ public void testCheckPermissionsWhenNoExecutableFileExists() throws Exception {
8080
filePermissionsTask.checkInvalidPermissions();
8181

8282
File outputMarker = new File(project.getBuildDir(), "markers/filePermissions");
83-
List<String> result = Files.readAllLines(outputMarker.toPath(), Charset.forName("UTF-8"));
83+
List<String> result = Files.readAllLines(outputMarker.toPath(), StandardCharsets.UTF_8);
8484
assertEquals("done", result.get(0));
8585

8686
file.delete();

‎build-tools/src/main/java/org/elasticsearch/gradle/LoggedExec.java

+1-6
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import java.io.IOException;
3939
import java.io.OutputStream;
4040
import java.io.UncheckedIOException;
41-
import java.io.UnsupportedEncodingException;
4241
import java.nio.charset.StandardCharsets;
4342
import java.nio.file.Files;
4443
import java.util.List;
@@ -193,11 +192,7 @@ public void run() {
193192
execSpec.setWorkingDir(getWorkingDir().get());
194193
}
195194
if (getStandardInput().isPresent()) {
196-
try {
197-
execSpec.setStandardInput(new ByteArrayInputStream(getStandardInput().get().getBytes("UTF-8")));
198-
} catch (UnsupportedEncodingException e) {
199-
throw new GradleException("Cannot set standard input", e);
200-
}
195+
execSpec.setStandardInput(new ByteArrayInputStream(getStandardInput().get().getBytes(StandardCharsets.UTF_8)));
201196
}
202197
});
203198
int exitValue = execResult.getExitValue();

‎build-tools/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchCluster.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import java.io.File;
4343
import java.io.IOException;
4444
import java.io.UncheckedIOException;
45-
import java.nio.charset.StandardCharsets;
4645
import java.nio.file.Files;
4746
import java.security.GeneralSecurityException;
4847
import java.util.Collection;
@@ -533,7 +532,7 @@ public void writeUnicastHostsFiles() {
533532
String unicastUris = nodes.stream().flatMap(node -> node.getAllTransportPortURI().stream()).collect(Collectors.joining("\n"));
534533
nodes.forEach(node -> {
535534
try {
536-
Files.write(node.getConfigDir().resolve("unicast_hosts.txt"), unicastUris.getBytes(StandardCharsets.UTF_8));
535+
Files.writeString(node.getConfigDir().resolve("unicast_hosts.txt"), unicastUris);
537536
} catch (IOException e) {
538537
throw new UncheckedIOException("Failed to write unicast_hosts for " + this, e);
539538
}

‎distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/cli/InstallPluginActionTests.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ static void writePluginSecurityPolicy(Path pluginDir, String... permissions) thr
317317
securityPolicyContent.append("\";");
318318
}
319319
securityPolicyContent.append("\n};\n");
320-
Files.write(pluginDir.resolve("plugin-security.policy"), securityPolicyContent.toString().getBytes(StandardCharsets.UTF_8));
320+
Files.writeString(pluginDir.resolve("plugin-security.policy"), securityPolicyContent.toString());
321321
}
322322

323323
static InstallablePlugin createStablePlugin(String name, Path structure, boolean hasNamedComponentFile, String... additionalProps)
@@ -787,10 +787,10 @@ public void testConfig() throws Exception {
787787
public void testExistingConfig() throws Exception {
788788
Path envConfigDir = env.v2().configDir().resolve("fake");
789789
Files.createDirectories(envConfigDir);
790-
Files.write(envConfigDir.resolve("custom.yml"), "existing config".getBytes(StandardCharsets.UTF_8));
790+
Files.writeString(envConfigDir.resolve("custom.yml"), "existing config");
791791
Path configDir = pluginDir.resolve("config");
792792
Files.createDirectory(configDir);
793-
Files.write(configDir.resolve("custom.yml"), "new config".getBytes(StandardCharsets.UTF_8));
793+
Files.writeString(configDir.resolve("custom.yml"), "new config");
794794
Files.createFile(configDir.resolve("other.yml"));
795795
InstallablePlugin pluginZip = createPluginZip("fake", pluginDir);
796796
installPlugin(pluginZip);
@@ -1033,13 +1033,13 @@ URL openUrl(String urlString) throws IOException {
10331033
Path shaFile = temp.apply("shas").resolve("downloaded.zip" + shaExtension);
10341034
byte[] zipbytes = Files.readAllBytes(pluginZipPath);
10351035
String checksum = shaCalculator.apply(zipbytes);
1036-
Files.write(shaFile, checksum.getBytes(StandardCharsets.UTF_8));
1036+
Files.writeString(shaFile, checksum);
10371037
return shaFile.toUri().toURL();
10381038
} else if ((url + ".asc").equals(urlString)) {
10391039
final Path ascFile = temp.apply("asc").resolve("downloaded.zip" + ".asc");
10401040
final byte[] zipBytes = Files.readAllBytes(pluginZipPath);
10411041
final String asc = signature.apply(zipBytes, secretKey);
1042-
Files.write(ascFile, asc.getBytes(StandardCharsets.UTF_8));
1042+
Files.writeString(ascFile, asc);
10431043
return ascFile.toUri().toURL();
10441044
}
10451045
return null;

‎libs/entitlement/qa/entitlement-test-plugin/src/main/java/org/elasticsearch/entitlement/qa/test/NioFilesActions.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ static void checkFilesReadAllLinesWithCharset() throws IOException {
426426
@EntitlementTest(expectedAccess = PLUGINS)
427427
static void checkFilesWrite() throws IOException {
428428
var directory = EntitledActions.createTempDirectoryForWrite();
429-
Files.write(directory.resolve("file"), "foo".getBytes(StandardCharsets.UTF_8));
429+
Files.writeString(directory.resolve("file"), "foo");
430430
}
431431

432432
@EntitlementTest(expectedAccess = PLUGINS)

‎modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/URLDecodeProcessorTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ protected boolean isSupportedValue(Object value) {
4848

4949
private static boolean isValidUrlEncodedString(String s) {
5050
try {
51-
URLDecoder.decode(s, "UTF-8");
51+
URLDecoder.decode(s, StandardCharsets.UTF_8);
5252
return true;
5353
} catch (Exception e) {
5454
return false;

‎modules/lang-mustache/src/test/java/org/elasticsearch/script/mustache/MustacheTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ public void testUrlEncoderWithParam() throws Exception {
425425
assertScript(
426426
"{{#url}}prefix_{{s}}{{/url}}",
427427
singletonMap("s", random),
428-
equalTo("prefix_" + URLEncoder.encode(random, StandardCharsets.UTF_8.name()))
428+
equalTo("prefix_" + URLEncoder.encode(random, StandardCharsets.UTF_8))
429429
);
430430
}
431431

‎modules/lang-painless/src/doc/java/org/elasticsearch/painless/ContextApiSpecGenerator.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public static void main(String[] args) throws IOException {
4646
PrintStream jsonStream = new PrintStream(
4747
Files.newOutputStream(json, StandardOpenOption.CREATE_NEW, StandardOpenOption.WRITE),
4848
false,
49-
StandardCharsets.UTF_8.name()
49+
StandardCharsets.UTF_8
5050
)
5151
) {
5252

@@ -63,7 +63,7 @@ public static void main(String[] args) throws IOException {
6363
PrintStream jsonStream = new PrintStream(
6464
Files.newOutputStream(json, StandardOpenOption.CREATE_NEW, StandardOpenOption.WRITE),
6565
false,
66-
StandardCharsets.UTF_8.name()
66+
StandardCharsets.UTF_8
6767
)
6868
) {
6969

‎modules/transport-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4HttpServerTransportTests.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595

9696
import java.io.IOException;
9797
import java.net.InetSocketAddress;
98-
import java.nio.charset.Charset;
9998
import java.nio.charset.StandardCharsets;
10099
import java.util.ArrayList;
101100
import java.util.Collection;
@@ -351,14 +350,14 @@ public void dispatchBadRequest(final RestChannel channel, final ThreadContext th
351350
final TransportAddress remoteAddress = randomFrom(transport.boundAddress().boundAddresses());
352351

353352
try (Netty4HttpClient client = new Netty4HttpClient()) {
354-
final String url = "/" + new String(new byte[maxInitialLineLength], Charset.forName("UTF-8"));
353+
final String url = "/" + new String(new byte[maxInitialLineLength], StandardCharsets.UTF_8);
355354
final FullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, url);
356355

357356
final FullHttpResponse response = client.send(remoteAddress.address(), request);
358357
try {
359358
assertThat(response.status(), equalTo(HttpResponseStatus.BAD_REQUEST));
360359
assertThat(
361-
new String(response.content().array(), Charset.forName("UTF-8")),
360+
new String(response.content().array(), StandardCharsets.UTF_8),
362361
containsString("you sent a bad request and you should feel bad")
363362
);
364363
} finally {

‎plugins/analysis-icu/src/main/java/org/elasticsearch/plugin/analysis/icu/IcuCollationTokenFilterFactory.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.elasticsearch.index.analysis.AbstractTokenFilterFactory;
2222

2323
import java.io.IOException;
24-
import java.nio.charset.Charset;
24+
import java.nio.charset.StandardCharsets;
2525
import java.nio.file.Files;
2626
import java.nio.file.InvalidPathException;
2727

@@ -51,7 +51,7 @@ public IcuCollationTokenFilterFactory(IndexSettings indexSettings, Environment e
5151
if (rules != null) {
5252
Exception failureToResolve = null;
5353
try {
54-
rules = Streams.copyToString(Files.newBufferedReader(environment.configDir().resolve(rules), Charset.forName("UTF-8")));
54+
rules = Streams.copyToString(Files.newBufferedReader(environment.configDir().resolve(rules), StandardCharsets.UTF_8));
5555
} catch (IOException | SecurityException | InvalidPathException e) {
5656
failureToResolve = e;
5757
}

‎plugins/mapper-annotated-text/src/test/java/org/elasticsearch/index/mapper/annotatedtext/AnnotatedTextHighlighterTests.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import org.elasticsearch.test.ESTestCase;
4646

4747
import java.net.URLEncoder;
48+
import java.nio.charset.StandardCharsets;
4849
import java.text.BreakIterator;
4950
import java.util.ArrayList;
5051
import java.util.Locale;
@@ -167,7 +168,7 @@ public void testAnnotatedTextStructuredMatch() throws Exception {
167168
// on marked-up
168169
// content using an "annotated_text" type field.
169170
String url = "https://en.wikipedia.org/wiki/Key_Word_in_Context";
170-
String encodedUrl = URLEncoder.encode(url, "UTF-8");
171+
String encodedUrl = URLEncoder.encode(url, StandardCharsets.UTF_8);
171172
String annotatedWord = "[highlighting](" + encodedUrl + ")";
172173
String highlightedAnnotatedWord = "[highlighting]("
173174
+ AnnotatedPassageFormatter.SEARCH_HIT_TYPE

‎qa/no-bootstrap-tests/src/test/java/org/elasticsearch/bootstrap/SpawnerNoBootstrapTests.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.elasticsearch.test.MockLog;
2828

2929
import java.io.IOException;
30-
import java.nio.charset.StandardCharsets;
3130
import java.nio.file.Files;
3231
import java.nio.file.Path;
3332
import java.nio.file.attribute.PosixFileAttributeView;
@@ -270,7 +269,7 @@ public void testSpawnerHandlingOfDesktopServicesStoreFiles() throws IOException
270269
private void createControllerProgram(final Path outputFile) throws IOException {
271270
final Path outputDir = outputFile.getParent();
272271
Files.createDirectories(outputDir);
273-
Files.write(outputFile, CONTROLLER_SOURCE.getBytes(StandardCharsets.UTF_8));
272+
Files.writeString(outputFile, CONTROLLER_SOURCE);
274273
final PosixFileAttributeView view = Files.getFileAttributeView(outputFile, PosixFileAttributeView.class);
275274
if (view != null) {
276275
final Set<PosixFilePermission> perms = new HashSet<>();

‎qa/packaging/src/test/java/org/elasticsearch/packaging/util/FileUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ public static String slurpTxtorGz(Path file) {
208208
public static String slurpAllLogs(Path logPath, String activeLogFile, String rotatedLogFilesGlob) {
209209
StringJoiner logFileJoiner = new StringJoiner("\n");
210210
try {
211-
logFileJoiner.add(new String(Files.readAllBytes(logPath.resolve(activeLogFile)), StandardCharsets.UTF_8));
211+
logFileJoiner.add(Files.readString(logPath.resolve(activeLogFile)));
212212

213213
for (Path rotatedLogFile : FileUtils.lsGlob(logPath, rotatedLogFilesGlob)) {
214214
logFileJoiner.add(FileUtils.slurpTxtorGz(rotatedLogFile));

‎server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedFileIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ public void afterIndexShardClosed(ShardId sid, @Nullable IndexShard indexShard,
217217
return;
218218
}
219219
BytesStreamOutput os = new BytesStreamOutput();
220-
PrintStream out = new PrintStream(os, false, StandardCharsets.UTF_8.name());
220+
PrintStream out = new PrintStream(os, false, StandardCharsets.UTF_8);
221221
CheckIndex.Status status = store.checkIndex(out);
222222
out.flush();
223223
if (status.clean == false) {

‎server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestFileSettingsIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ private void writeJSONFile(String node, String json) throws Exception {
129129

130130
logger.info("--> writing JSON config to node {} with path {}", node, tempFilePath);
131131
logger.info(Strings.format(json, version));
132-
Files.write(tempFilePath, Strings.format(json, version).getBytes(StandardCharsets.UTF_8));
132+
Files.writeString(tempFilePath, Strings.format(json, version));
133133
Files.move(tempFilePath, fileSettingsService.watchedFile(), StandardCopyOption.ATOMIC_MOVE);
134134
}
135135

‎server/src/internalClusterTest/java/org/elasticsearch/readiness/ReadinessClusterIT.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.junit.Before;
3030

3131
import java.io.IOException;
32-
import java.nio.charset.StandardCharsets;
3332
import java.nio.file.Files;
3433
import java.nio.file.Path;
3534
import java.nio.file.StandardCopyOption;
@@ -252,7 +251,7 @@ private void writeFileSettings(String json) throws Exception {
252251
Path fileSettings = configDir.resolve("operator").resolve("settings.json");
253252
Files.createDirectories(fileSettings.getParent());
254253

255-
Files.write(tempFilePath, Strings.format(json, version).getBytes(StandardCharsets.UTF_8));
254+
Files.writeString(tempFilePath, Strings.format(json, version));
256255
Files.move(tempFilePath, fileSettings, StandardCopyOption.ATOMIC_MOVE);
257256
logger.info("--> New file settings: [{}]", Strings.format(json, version));
258257
}

0 commit comments

Comments
 (0)