Skip to content

Commit 3b56ba9

Browse files
martinlippertmartinlippert
committed
fix deprecations
1 parent 062a0ab commit 3b56ba9

File tree

1 file changed

+20
-19
lines changed

1 file changed

+20
-19
lines changed

‎headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerMultipleFilesTest.java‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2020 Pivotal, Inc.
2+
* Copyright (c) 2020, 2025 Pivotal, Inc.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License v1.0
55
* which accompanies this distribution, and is available at
@@ -15,6 +15,7 @@
1515

1616
import java.io.File;
1717
import java.net.URI;
18+
import java.nio.charset.Charset;
1819
import java.nio.file.Files;
1920
import java.nio.file.attribute.FileTime;
2021
import java.util.List;
@@ -86,7 +87,7 @@ public void setup() throws Exception {
8687
void testUpdateChangedSingleDocumentOnDisc() throws Exception {
8788
String changedDocURI = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
8889
File file = new File(new URI(changedDocURI));
89-
String originalContent = FileUtils.readFileToString(file);
90+
String originalContent = FileUtils.readFileToString(file, Charset.defaultCharset());
9091
FileTime modifiedTime = Files.getLastModifiedTime(file.toPath());
9192

9293
try {
@@ -95,7 +96,7 @@ void testUpdateChangedSingleDocumentOnDisc() throws Exception {
9596
assertTrue(SpringIndexerTest.containsSymbol(symbols, "@/mapping1", changedDocURI));
9697

9798
String newContent = originalContent.replace("mapping1", "mapping1-CHANGED");
98-
FileUtils.writeStringToFile(new File(new URI(changedDocURI)), newContent);
99+
FileUtils.writeStringToFile(new File(new URI(changedDocURI)), newContent, Charset.defaultCharset());
99100
Files.setLastModifiedTime(file.toPath(), FileTime.fromMillis(modifiedTime.toMillis() + 1000));
100101

101102
TestFileScanListener fileScanListener = new TestFileScanListener();
@@ -114,7 +115,7 @@ void testUpdateChangedSingleDocumentOnDisc() throws Exception {
114115
fileScanListener.assertScannedUri(changedDocURI, 1);
115116
}
116117
finally {
117-
FileUtils.writeStringToFile(new File(new URI(changedDocURI)), originalContent);
118+
FileUtils.writeStringToFile(new File(new URI(changedDocURI)), originalContent, Charset.defaultCharset());
118119
}
119120
}
120121

@@ -123,30 +124,30 @@ void testUpdateChangedMultipleDocumentsOnDisc() throws Exception {
123124

124125
String doc1URI = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
125126
File file1 = new File(new URI(doc1URI));
126-
String original1Content = FileUtils.readFileToString(file1);
127+
String original1Content = FileUtils.readFileToString(file1, Charset.defaultCharset());
127128
FileTime modifiedTime1 = Files.getLastModifiedTime(file1.toPath());
128129

129130
String doc2URI = directory.toPath().resolve("src/main/java/org/test/MainClass.java").toUri().toString();
130131
File file2 = new File(new URI(doc2URI));
131-
String original2Content = FileUtils.readFileToString(file2);
132+
String original2Content = FileUtils.readFileToString(file2, Charset.defaultCharset());
132133
FileTime modifiedTime2 = Files.getLastModifiedTime(file2.toPath());
133134

134135
String doc3URI = directory.toPath().resolve("src/main/java/org/test/sub/MappingClassSubpackage.java").toUri().toString();
135136
File file3 = new File(new URI(doc3URI));
136-
String original3Content = FileUtils.readFileToString(file3);
137+
String original3Content = FileUtils.readFileToString(file3, Charset.defaultCharset());
137138
FileTime modifiedTime3 = Files.getLastModifiedTime(file3.toPath());
138139

139140
try {
140141
String new1Content = original1Content.replace("mapping1", "mapping1-CHANGED");
141-
FileUtils.writeStringToFile(new File(new URI(doc1URI)), new1Content);
142+
FileUtils.writeStringToFile(new File(new URI(doc1URI)), new1Content, Charset.defaultCharset());
142143
Files.setLastModifiedTime(file1.toPath(), FileTime.fromMillis(modifiedTime1.toMillis() + 1000));
143144

144145
String new2Content = original2Content.replace("\"/embedded-foo-mapping\"", "\"/embedded-foo-mapping-CHANGED\"");
145-
FileUtils.writeStringToFile(new File(new URI(doc2URI)), new2Content);
146+
FileUtils.writeStringToFile(new File(new URI(doc2URI)), new2Content, Charset.defaultCharset());
146147
Files.setLastModifiedTime(file2.toPath(), FileTime.fromMillis(modifiedTime2.toMillis() + 1000));
147148

148149
String new3Content = original3Content.replace("classlevel", "classlevel-CHANGED");
149-
FileUtils.writeStringToFile(new File(new URI(doc3URI)), new3Content);
150+
FileUtils.writeStringToFile(new File(new URI(doc3URI)), new3Content, Charset.defaultCharset());
150151
Files.setLastModifiedTime(file3.toPath(), FileTime.fromMillis(modifiedTime3.toMillis() + 1000));
151152

152153
CompletableFuture<Void> updateFuture = indexer.updateDocuments(new String[]{doc1URI, doc2URI, doc3URI}, "test triggered");
@@ -167,9 +168,9 @@ void testUpdateChangedMultipleDocumentsOnDisc() throws Exception {
167168
assertTrue(SpringIndexerTest.containsSymbol(symbols3, "@/classlevel-CHANGED/mapping-subpackage", doc3URI, 7, 1, 7, 38));
168169
}
169170
finally {
170-
FileUtils.writeStringToFile(new File(new URI(doc1URI)), original1Content);
171-
FileUtils.writeStringToFile(new File(new URI(doc2URI)), original2Content);
172-
FileUtils.writeStringToFile(new File(new URI(doc3URI)), original3Content);
171+
FileUtils.writeStringToFile(new File(new URI(doc1URI)), original1Content, Charset.defaultCharset());
172+
FileUtils.writeStringToFile(new File(new URI(doc2URI)), original2Content, Charset.defaultCharset());
173+
FileUtils.writeStringToFile(new File(new URI(doc3URI)), original3Content, Charset.defaultCharset());
173174
}
174175
}
175176

@@ -195,23 +196,23 @@ void testDontScanUnchangedDocumentAmongMultipleChangedFiles() throws Exception {
195196

196197
String doc1URI = directory.toPath().resolve("src/main/java/org/test/SimpleMappingClass.java").toUri().toString();
197198
File file1 = new File(new URI(doc1URI));
198-
String original1Content = FileUtils.readFileToString(file1);
199+
String original1Content = FileUtils.readFileToString(file1, Charset.defaultCharset());
199200
FileTime modifiedTime1 = Files.getLastModifiedTime(file1.toPath());
200201

201202
String doc2URI = directory.toPath().resolve("src/main/java/org/test/MainClass.java").toUri().toString();
202203

203204
String doc3URI = directory.toPath().resolve("src/main/java/org/test/sub/MappingClassSubpackage.java").toUri().toString();
204205
File file3 = new File(new URI(doc3URI));
205-
String original3Content = FileUtils.readFileToString(file3);
206+
String original3Content = FileUtils.readFileToString(file3, Charset.defaultCharset());
206207
FileTime modifiedTime3 = Files.getLastModifiedTime(file3.toPath());
207208

208209
try {
209210
String new1Content = original1Content.replace("mapping1", "mapping1-CHANGED");
210-
FileUtils.writeStringToFile(file1, new1Content);
211+
FileUtils.writeStringToFile(file1, new1Content, Charset.defaultCharset());
211212
Files.setLastModifiedTime(file1.toPath(), FileTime.fromMillis(modifiedTime1.toMillis() + 1000));
212213

213214
String new3Content = original3Content.replace("classlevel", "classlevel-CHANGED");
214-
FileUtils.writeStringToFile(new File(new URI(doc3URI)), new3Content);
215+
FileUtils.writeStringToFile(new File(new URI(doc3URI)), new3Content, Charset.defaultCharset());
215216
Files.setLastModifiedTime(file3.toPath(), FileTime.fromMillis(modifiedTime3.toMillis() + 1000));
216217

217218
TestFileScanListener fileScanListener = new TestFileScanListener();
@@ -238,8 +239,8 @@ void testDontScanUnchangedDocumentAmongMultipleChangedFiles() throws Exception {
238239
fileScanListener.assertScannedUri(doc3URI, 1);
239240
}
240241
finally {
241-
FileUtils.writeStringToFile(file1, original1Content);
242-
FileUtils.writeStringToFile(new File(new URI(doc3URI)), original3Content);
242+
FileUtils.writeStringToFile(file1, original1Content, Charset.defaultCharset());
243+
FileUtils.writeStringToFile(new File(new URI(doc3URI)), original3Content, Charset.defaultCharset());
243244
}
244245
}
245246

0 commit comments

Comments
 (0)