This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-11445
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/OAK-11445 by this push:
new 405720fae2 OAK-11445: Remove usage of Guava Files.toString() - oak-run
405720fae2 is described below
commit 405720fae20b3aaf690b3b77d2ac6e1679778c17
Author: Julian Reschke <[email protected]>
AuthorDate: Thu Jan 30 17:33:24 2025 +0100
OAK-11445: Remove usage of Guava Files.toString() - oak-run
---
.../jackrabbit/oak/exporter/NodeStateSerializer.java | 6 ++++--
.../oak/exporter/NodeStateSerializerTest.java | 5 ++---
.../jackrabbit/oak/index/LuceneIndexCommandIT.java | 20 ++++++++++----------
3 files changed, 16 insertions(+), 15 deletions(-)
diff --git
a/oak-run/src/main/java/org/apache/jackrabbit/oak/exporter/NodeStateSerializer.java
b/oak-run/src/main/java/org/apache/jackrabbit/oak/exporter/NodeStateSerializer.java
index f8e84bbeb5..f92104a372 100644
---
a/oak-run/src/main/java/org/apache/jackrabbit/oak/exporter/NodeStateSerializer.java
+++
b/oak-run/src/main/java/org/apache/jackrabbit/oak/exporter/NodeStateSerializer.java
@@ -27,8 +27,8 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.Writer;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
-import org.apache.jackrabbit.guava.common.io.Files;
import com.google.gson.stream.JsonWriter;
import org.apache.jackrabbit.oak.commons.conditions.Validate;
import org.apache.jackrabbit.oak.commons.json.JsopWriter;
@@ -127,7 +127,9 @@ public class NodeStateSerializer {
}
private String getFilter() throws IOException {
- return filterFile != null ? Files.toString(filterFile,
StandardCharsets.UTF_8) : filter;
+ return filterFile != null
+ ? new String(Files.readAllBytes(filterFile.toPath()),
StandardCharsets.UTF_8)
+ : filter;
}
public String getFileName() {
diff --git
a/oak-run/src/test/java/org/apache/jackrabbit/oak/exporter/NodeStateSerializerTest.java
b/oak-run/src/test/java/org/apache/jackrabbit/oak/exporter/NodeStateSerializerTest.java
index 5930f0974b..98e289a246 100644
---
a/oak-run/src/test/java/org/apache/jackrabbit/oak/exporter/NodeStateSerializerTest.java
+++
b/oak-run/src/test/java/org/apache/jackrabbit/oak/exporter/NodeStateSerializerTest.java
@@ -16,14 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.exporter;
import java.io.File;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.util.Collections;
-import org.apache.jackrabbit.guava.common.io.Files;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.json.BlobDeserializer;
import org.apache.jackrabbit.oak.json.JsonDeserializer;
@@ -66,7 +65,7 @@ public class NodeStateSerializerTest {
File json = new File(folder.getRoot(), serializer.getFileName());
assertTrue(json.exists());
- String text = Files.toString(json, StandardCharsets.UTF_8);
+ String text = new String(Files.readAllBytes(json.toPath()),
StandardCharsets.UTF_8);
NodeState nodeState2 = deserialize(text);
assertTrue(EqualsDiff.equals(builder.getNodeState(), nodeState2));
}
diff --git
a/oak-run/src/test/java/org/apache/jackrabbit/oak/index/LuceneIndexCommandIT.java
b/oak-run/src/test/java/org/apache/jackrabbit/oak/index/LuceneIndexCommandIT.java
index 8805e0ce0f..964a605b05 100644
---
a/oak-run/src/test/java/org/apache/jackrabbit/oak/index/LuceneIndexCommandIT.java
+++
b/oak-run/src/test/java/org/apache/jackrabbit/oak/index/LuceneIndexCommandIT.java
@@ -16,20 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.index;
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.Before;
import org.junit.Test;
-import static java.nio.charset.Charset.defaultCharset;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
@@ -65,8 +62,9 @@ public class LuceneIndexCommandIT extends
LuceneAbstractIndexCommandTest {
assertTrue(info.exists());
assertTrue(defns.exists());
- assertThat(Files.toString(info, defaultCharset()),
containsString("/oak:index/uuid"));
- assertThat(Files.toString(info, defaultCharset()),
containsString("/oak:index/fooIndex"));
+ String s = new String(Files.readAllBytes(info.toPath()),
StandardCharsets.UTF_8);
+ assertThat(s, containsString("/oak:index/uuid"));
+ assertThat(s, containsString("/oak:index/fooIndex"));
}
@Test
@@ -93,8 +91,9 @@ public class LuceneIndexCommandIT extends
LuceneAbstractIndexCommandTest {
assertTrue(info.exists());
- assertThat(Files.toString(info, defaultCharset()),
not(containsString("/oak:index/uuid")));
- assertThat(Files.toString(info, defaultCharset()),
containsString("/oak:index/fooIndex"));
+ String s = new String(Files.readAllBytes(info.toPath()),
StandardCharsets.UTF_8);
+ assertThat(s, not(containsString("/oak:index/uuid")));
+ assertThat(s, containsString("/oak:index/fooIndex"));
}
@Test
@@ -122,7 +121,8 @@ public class LuceneIndexCommandIT extends
LuceneAbstractIndexCommandTest {
assertFalse(new File(outDir,
IndexCommand.INDEX_DEFINITIONS_JSON).exists());
assertTrue(report.exists());
- assertThat(Files.toString(report, defaultCharset()),
containsString("/oak:index/fooIndex"));
+ String s = new String(Files.readAllBytes(report.toPath()),
StandardCharsets.UTF_8);
+ assertThat(s, containsString("/oak:index/fooIndex"));
}
@Test
