Skip to content

Commit bd9bf7c

Browse files
committed
OAK-11462: Remove usage of Guava Files.write() - oak-core
1 parent 7d46f39 commit bd9bf7c

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public void write(@NotNull String blobId,@NotNull String text) throws IOExceptio
131131
File textFile = getFile(stripLength(blobId));
132132
ensureParentExists(textFile);
133133
//TODO should we compress
134-
org.apache.jackrabbit.guava.common.io.Files.write(text, textFile, StandardCharsets.UTF_8);
134+
Files.writeString(textFile.toPath(), text);
135135
}
136136

137137
@Override

oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporterTest.java

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

2221
import java.io.File;
2322
import java.io.IOException;
2423
import java.io.PrintWriter;
2524
import java.io.StringWriter;
26-
import java.nio.charset.StandardCharsets;
25+
import java.nio.file.Files;
26+
import java.nio.file.Path;
2727
import java.text.MessageFormat;
2828
import java.util.Properties;
2929
import java.util.Set;
3030

31-
import org.apache.jackrabbit.guava.common.io.Files;
3231
import org.apache.felix.inventory.Format;
3332
import org.apache.jackrabbit.oak.api.CommitFailedException;
3433
import org.apache.jackrabbit.oak.api.Type;
@@ -314,7 +313,7 @@ public void importIndex_newIndex() throws Exception{
314313
info.save();
315314

316315
//Create index definitions json
317-
Files.write(json, new File(indexFolder, INDEX_DEFINITIONS_JSON), StandardCharsets.UTF_8);
316+
Files.writeString(indexFolder.toPath().resolve(INDEX_DEFINITIONS_JSON), json);
318317

319318
createIndexFolder(indexFolder, "/oak:index/fooIndex");
320319

@@ -554,11 +553,11 @@ private void createIndexFolder(File indexFolder, String indexPath) throws IOExce
554553
private void dumpIndexDefinitions(String... indexPaths) throws IOException {
555554
IndexDefinitionPrinter printer = new IndexDefinitionPrinter(store, () -> asList(indexPaths));
556555
printer.setFilter("{\"properties\":[\"*\", \"-:childOrder\"],\"nodes\":[\"*\", \"-:index-definition\"]}");
557-
File file = new File(temporaryFolder.getRoot(), INDEX_DEFINITIONS_JSON);
556+
Path file = temporaryFolder.getRoot().toPath().resolve(INDEX_DEFINITIONS_JSON);
558557
StringWriter sw = new StringWriter();
559558
PrintWriter pw = new PrintWriter(sw);
560559
printer.print(pw, Format.JSON, false);
561-
Files.write(sw.toString(), file, StandardCharsets.UTF_8);
560+
Files.writeString(file, sw.toString());
562561
}
563562

564563
private String importDataIncrementalUpdateBeforeSetupMethod() throws IOException, CommitFailedException {

0 commit comments

Comments
 (0)