This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 528e4b50ac OAK-11462: Remove usage of Guava Files.write() (#2059)
528e4b50ac is described below
commit 528e4b50ac906802f9709e017f0be8626c0af36d
Author: Julian Reschke <resc...@apache.org>
AuthorDate: Thu Feb 13 14:37:53 2025 +0100
OAK-11462: Remove usage of Guava Files.write() (#2059)
* OAK-11462: Remove usage of Guava Files.write() - oak-core
* OAK-11462: Remove usage of Guava Files.write() - oak-run
* OAK-11462: Remove usage of Guava Files.write() - oak-upgrade
* OAK-11462: Remove usage of Guava Files.write() - whitespace fixed
---
.../oak/plugins/index/datastore/DataStoreTextWriter.java | 2 +-
.../oak/plugins/index/importer/IndexImporterTest.java | 11 +++++------
.../java/org/apache/jackrabbit/oak/index/merge/IndexDiff.java | 2 +-
.../test/java/org/apache/jackrabbit/oak/index/ReindexIT.java | 5 ++---
.../oak/plugins/tika/CSVFileBinaryResourceProviderTest.java | 5 ++---
.../apache/jackrabbit/oak/plugins/tika/TikaHelperTest.java | 6 ++----
.../oak/upgrade/blob/LengthCachingDataStoreTest.java | 7 +++----
7 files changed, 16 insertions(+), 22 deletions(-)
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextWriter.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextWriter.java
index 38394983c6..b9ea2643a6 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextWriter.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextWriter.java
@@ -131,7 +131,7 @@ public class DataStoreTextWriter implements TextWriter,
Closeable, PreExtractedT
File textFile = getFile(stripLength(blobId));
ensureParentExists(textFile);
//TODO should we compress
- org.apache.jackrabbit.guava.common.io.Files.write(text, textFile,
StandardCharsets.UTF_8);
+ Files.writeString(textFile.toPath(), text);
}
@Override
diff --git
a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporterTest.java
b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporterTest.java
index 72d4166108..121c56e038 100644
---
a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporterTest.java
+++
b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporterTest.java
@@ -16,19 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.plugins.index.importer;
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.text.MessageFormat;
import java.util.Properties;
import java.util.Set;
-import org.apache.jackrabbit.guava.common.io.Files;
import org.apache.felix.inventory.Format;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.Type;
@@ -314,7 +313,7 @@ public class IndexImporterTest {
info.save();
//Create index definitions json
- Files.write(json, new File(indexFolder, INDEX_DEFINITIONS_JSON),
StandardCharsets.UTF_8);
+
Files.writeString(indexFolder.toPath().resolve(INDEX_DEFINITIONS_JSON), json);
createIndexFolder(indexFolder, "/oak:index/fooIndex");
@@ -554,11 +553,11 @@ public class IndexImporterTest {
private void dumpIndexDefinitions(String... indexPaths) throws IOException
{
IndexDefinitionPrinter printer = new IndexDefinitionPrinter(store, ()
-> asList(indexPaths));
printer.setFilter("{\"properties\":[\"*\",
\"-:childOrder\"],\"nodes\":[\"*\", \"-:index-definition\"]}");
- File file = new File(temporaryFolder.getRoot(),
INDEX_DEFINITIONS_JSON);
+ Path file =
temporaryFolder.getRoot().toPath().resolve(INDEX_DEFINITIONS_JSON);
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
printer.print(pw, Format.JSON, false);
- Files.write(sw.toString(), file, StandardCharsets.UTF_8);
+ Files.writeString(file, sw.toString());
}
private String importDataIncrementalUpdateBeforeSetupMethod() throws
IOException, CommitFailedException {
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"));
}
diff --git
a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStoreTest.java
b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStoreTest.java
index 9823d58610..dd05787e0f 100644
---
a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStoreTest.java
+++
b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/blob/LengthCachingDataStoreTest.java
@@ -27,11 +27,10 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.nio.charset.Charset;
+import java.nio.file.Files;
import java.util.Properties;
import java.util.Random;
-import org.apache.jackrabbit.guava.common.io.Files;
import org.apache.jackrabbit.core.data.DataIdentifier;
import org.apache.jackrabbit.core.data.DataRecord;
import org.apache.jackrabbit.core.data.DataStoreException;
@@ -50,7 +49,7 @@ public class LengthCachingDataStoreTest {
File root = tempFolder.getRoot();
File mappingFile = new File(root, "mapping.txt");
String text = "1000|foo\n2000|bar";
- Files.write(text, mappingFile, Charset.defaultCharset());
+ Files.writeString(mappingFile.toPath(), text);
LengthCachingDataStore fds = new LengthCachingDataStore();
fds.setDelegateClass(FileDataStore.class.getName());
@@ -92,7 +91,7 @@ public class LengthCachingDataStoreTest {
File mappingFile = new File(tempFolder.getRoot(), "mapping.txt");
String text = String.format("%s|%s", data.length,
dr.getIdentifier().toString());
- Files.write(text, mappingFile, Charset.defaultCharset());
+ Files.writeString(mappingFile.toPath(), text);
LengthCachingDataStore fds = new LengthCachingDataStore();
fds.setDelegateClass(FileDataStore.class.getName());
