Skip to content

Commit 268d816

Browse files
committed
OAK-11462: Remove usage of Guava Files.write() - oak-run
1 parent bd9bf7c commit 268d816

File tree

4 files changed

+7
-11
lines changed

4 files changed

+7
-11
lines changed

oak-run/src/main/java/org/apache/jackrabbit/oak/index/merge/IndexDiff.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ static void extractAll(String extractFile, String extractTargetDirectory) {
7373

7474
private static void writeFile(Path p, JsonObject json) {
7575
try {
76-
Files.write(p, json.toString().getBytes());
76+
Files.writeString(p, json.toString());
7777
} catch (IOException e) {
7878
throw new IllegalStateException("Error writing file: " + p, e);
7979
}

oak-run/src/test/java/org/apache/jackrabbit/oak/index/ReindexIT.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
package org.apache.jackrabbit.oak.index;
2020

2121
import org.apache.jackrabbit.guava.common.collect.Iterators;
22-
import org.apache.jackrabbit.guava.common.io.Files;
2322
import org.apache.commons.io.output.ByteArrayOutputStream;
2423
import org.apache.jackrabbit.oak.api.PropertyState;
2524
import org.apache.jackrabbit.oak.api.Type;
@@ -51,7 +50,7 @@
5150
import java.io.File;
5251
import java.io.IOException;
5352
import java.io.PrintStream;
54-
import java.nio.charset.StandardCharsets;
53+
import java.nio.file.Files;
5554
import java.util.ArrayList;
5655
import java.util.List;
5756
import java.util.concurrent.TimeUnit;
@@ -339,7 +338,7 @@ public void newIndexDefinition() throws Exception{
339338
"}";
340339

341340
File jsonFile = temporaryFolder.newFile();
342-
Files.write(json, jsonFile, StandardCharsets.UTF_8);
341+
Files.writeString(jsonFile.toPath(), json);
343342

344343
File outDir = temporaryFolder.newFolder();
345344
File storeDir = fixture.getDir();

oak-run/src/test/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileBinaryResourceProviderTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@
1919
package org.apache.jackrabbit.oak.plugins.tika;
2020

2121
import java.io.File;
22-
import java.nio.charset.StandardCharsets;
22+
import java.nio.file.Files;
2323
import java.util.Map;
2424

25-
import org.apache.jackrabbit.guava.common.io.Files;
2625
import org.apache.commons.csv.CSVPrinter;
2726
import org.apache.jackrabbit.oak.spi.blob.MemoryBlobStore;
2827
import org.junit.Rule;
@@ -47,7 +46,7 @@ public void testGetBinaries() throws Exception {
4746
p.printRecord(null, null, "text/plain", null, "/c");
4847

4948
File dataFile = temporaryFolder.newFile();
50-
Files.write(sb, dataFile, StandardCharsets.UTF_8);
49+
Files.writeString(dataFile.toPath(), sb);
5150

5251
CSVFileBinaryResourceProvider provider = new CSVFileBinaryResourceProvider(dataFile, new MemoryBlobStore());
5352

oak-run/src/test/java/org/apache/jackrabbit/oak/plugins/tika/TikaHelperTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,11 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
2019
package org.apache.jackrabbit.oak.plugins.tika;
2120

2221
import java.io.File;
23-
import java.nio.charset.StandardCharsets;
22+
import java.nio.file.Files;
2423

25-
import org.apache.jackrabbit.guava.common.io.Files;
2624
import org.junit.Rule;
2725
import org.junit.Test;
2826
import org.junit.rules.TemporaryFolder;
@@ -55,7 +53,7 @@ public void indexedTypes() throws Exception {
5553
" </parser>\n" +
5654
" </parsers>\n" +
5755
"</properties>";
58-
Files.write(configText, config, StandardCharsets.UTF_8);
56+
Files.writeString(config.toPath(), configText);
5957
TikaHelper tika = new TikaHelper(config);
6058
assertFalse(tika.isIndexed("application/xml"));
6159
}

0 commit comments

Comments
 (0)