This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-11462
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/OAK-11462 by this push:
new 268d816c93 OAK-11462: Remove usage of Guava Files.write() - oak-run
268d816c93 is described below
commit 268d816c93b050b57dc24ef81fa1d6dca48b2f5d
Author: Julian Reschke <[email protected]>
AuthorDate: Thu Feb 6 14:56:41 2025 +0100
OAK-11462: Remove usage of Guava Files.write() - oak-run
---
.../main/java/org/apache/jackrabbit/oak/index/merge/IndexDiff.java | 2 +-
.../src/test/java/org/apache/jackrabbit/oak/index/ReindexIT.java | 5 ++---
.../oak/plugins/tika/CSVFileBinaryResourceProviderTest.java | 5 ++---
.../java/org/apache/jackrabbit/oak/plugins/tika/TikaHelperTest.java | 6 ++----
4 files changed, 7 insertions(+), 11 deletions(-)
diff --git
a/oak-run/src/main/java/org/apache/jackrabbit/oak/index/merge/IndexDiff.java
b/oak-run/src/main/java/org/apache/jackrabbit/oak/index/merge/IndexDiff.java
index c20d4a4abc..c3a429c10f 100644
--- a/oak-run/src/main/java/org/apache/jackrabbit/oak/index/merge/IndexDiff.java
+++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/index/merge/IndexDiff.java
@@ -73,7 +73,7 @@ public class IndexDiff {
private static void writeFile(Path p, JsonObject json) {
try {
- Files.write(p, json.toString().getBytes());
+ Files.writeString(p, json.toString());
} catch (IOException e) {
throw new IllegalStateException("Error writing file: " + p, e);
}
diff --git
a/oak-run/src/test/java/org/apache/jackrabbit/oak/index/ReindexIT.java
b/oak-run/src/test/java/org/apache/jackrabbit/oak/index/ReindexIT.java
index 74bc528e9d..4ff446d16f 100644
--- a/oak-run/src/test/java/org/apache/jackrabbit/oak/index/ReindexIT.java
+++ b/oak-run/src/test/java/org/apache/jackrabbit/oak/index/ReindexIT.java
@@ -19,7 +19,6 @@
package org.apache.jackrabbit.oak.index;
import org.apache.jackrabbit.guava.common.collect.Iterators;
-import org.apache.jackrabbit.guava.common.io.Files;
import org.apache.commons.io.output.ByteArrayOutputStream;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
@@ -51,7 +50,7 @@ import javax.jcr.query.RowIterator;
import java.io.File;
import java.io.IOException;
import java.io.PrintStream;
-import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -339,7 +338,7 @@ public class ReindexIT extends
LuceneAbstractIndexCommandTest {
"}";
File jsonFile = temporaryFolder.newFile();
- Files.write(json, jsonFile, StandardCharsets.UTF_8);
+ Files.writeString(jsonFile.toPath(), json);
File outDir = temporaryFolder.newFolder();
File storeDir = fixture.getDir();
diff --git
a/oak-run/src/test/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileBinaryResourceProviderTest.java
b/oak-run/src/test/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileBinaryResourceProviderTest.java
index 62e4c676c5..65f2964daa 100644
---
a/oak-run/src/test/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileBinaryResourceProviderTest.java
+++
b/oak-run/src/test/java/org/apache/jackrabbit/oak/plugins/tika/CSVFileBinaryResourceProviderTest.java
@@ -19,10 +19,9 @@
package org.apache.jackrabbit.oak.plugins.tika;
import java.io.File;
-import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.util.Map;
-import org.apache.jackrabbit.guava.common.io.Files;
import org.apache.commons.csv.CSVPrinter;
import org.apache.jackrabbit.oak.spi.blob.MemoryBlobStore;
import org.junit.Rule;
@@ -47,7 +46,7 @@ public class CSVFileBinaryResourceProviderTest {
p.printRecord(null, null, "text/plain", null, "/c");
File dataFile = temporaryFolder.newFile();
- Files.write(sb, dataFile, StandardCharsets.UTF_8);
+ Files.writeString(dataFile.toPath(), sb);
CSVFileBinaryResourceProvider provider = new
CSVFileBinaryResourceProvider(dataFile, new MemoryBlobStore());
diff --git
a/oak-run/src/test/java/org/apache/jackrabbit/oak/plugins/tika/TikaHelperTest.java
b/oak-run/src/test/java/org/apache/jackrabbit/oak/plugins/tika/TikaHelperTest.java
index 3409de9c91..48ef18dca6 100644
---
a/oak-run/src/test/java/org/apache/jackrabbit/oak/plugins/tika/TikaHelperTest.java
+++
b/oak-run/src/test/java/org/apache/jackrabbit/oak/plugins/tika/TikaHelperTest.java
@@ -16,13 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.plugins.tika;
import java.io.File;
-import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
-import org.apache.jackrabbit.guava.common.io.Files;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
@@ -55,7 +53,7 @@ public class TikaHelperTest {
" </parser>\n" +
" </parsers>\n" +
"</properties>";
- Files.write(configText, config, StandardCharsets.UTF_8);
+ Files.writeString(config.toPath(), configText);
TikaHelper tika = new TikaHelper(config);
assertFalse(tika.isIndexed("application/xml"));
}
