[jackrabbit-oak] branch trunk updated: OAK-10338 - Do not use platform-dependent newlines in for files generated when creating a FlatFileStore (#1018)

[reschke]

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 e1d3e3e8db OAK-10338 - Do not use platform-dependent newlines in for 
files generated when creating a FlatFileStore (#1018)
e1d3e3e8db is described below

commit e1d3e3e8db16010cf2d3dc422d657b6c907089d1
Author: Nuno Santos <nsan...@adobe.com>
AuthorDate: Thu Jul 6 15:55:32 2023 +0200

    OAK-10338 - Do not use platform-dependent newlines in for files generated 
when creating a FlatFileStore (#1018)
    
    * Do not use platform-dependent newlines in External sort, instead use the 
newline character. ('\n')
    
    * Change test to tolerate different line endings.
    
    * Change test to tolerate different line endings.
    
    * Revert changes.
    
    * Revert changes.
---
 .../document/flatfile/pipelined/PipelinedMergeSortTaskTest.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMergeSortTaskTest.java
 
b/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMergeSortTaskTest.java
index 51ffc2f10a..5275474457 100644
--- 
a/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMergeSortTaskTest.java
+++ 
b/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMergeSortTaskTest.java
@@ -59,7 +59,7 @@ public class PipelinedMergeSortTaskTest {
         File singleFileToMerge = getTestFile("pipelined/merge-stage-1.json");
         PipelinedMergeSortTask.Result result = runTest(singleFileToMerge);
         Path resultFile = result.getFlatFileStoreFile().toPath();
-        assertEquals(Files.readString(singleFileToMerge.toPath(), 
FLATFILESTORE_CHARSET), Files.readString(resultFile, FLATFILESTORE_CHARSET));
+        assertEquals(Files.readAllLines(singleFileToMerge.toPath(), 
FLATFILESTORE_CHARSET), Files.readAllLines(resultFile, FLATFILESTORE_CHARSET));
     }
 
     @Test
@@ -71,7 +71,7 @@ public class PipelinedMergeSortTaskTest {
         PipelinedMergeSortTask.Result result = runTest(merge1, merge2);
         Path resultFile = result.getFlatFileStoreFile().toPath();
         LOG.info("Result: {}\n{}", resultFile, Files.readString(resultFile, 
FLATFILESTORE_CHARSET));
-        assertEquals(Files.readString(expected.toPath(), 
FLATFILESTORE_CHARSET), Files.readString(resultFile, FLATFILESTORE_CHARSET));
+        assertEquals(Files.readAllLines(expected.toPath(), 
FLATFILESTORE_CHARSET), Files.readAllLines(resultFile, FLATFILESTORE_CHARSET));
     }
 
     private File getTestFile(String name) {
@@ -96,7 +96,8 @@ public class PipelinedMergeSortTaskTest {
         // Run the merge task
         PipelinedMergeSortTask.Result result = mergeSortTask.call();
         File[] filesInWorkDir = sortRoot.listFiles();
-        if (filesInWorkDir == null) throw new IllegalStateException("The sort 
work directory is not a directory: " + sortRoot);
+        if (filesInWorkDir == null)
+            throw new IllegalStateException("The sort work directory is not a 
directory: " + sortRoot);
         assertEquals("The sort work directory should contain only the flat 
file store, the intermediate files should have been deleted after merged. 
Instead it contains: " + Arrays.toString(filesInWorkDir),
                 1, filesInWorkDir.length);
         assertTrue(result.getFlatFileStoreFile().exists());