This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-10044
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 334d704fdc1fae5fe3429adffe906fca7e1e6b0e
Author: Julian Reschke <julian.resc...@gmx.de>
AuthorDate: Mon Dec 19 16:40:46 2022 +0100
OAK-10044: oak-run-commons JDK11 Javadoc fixes
---
.../index/indexer/document/flatfile/MergeRunner.java | 20 ++++++++++----------
.../MultithreadedTraverseWithSortStrategy.java | 4 ++--
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/MergeRunner.java
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/MergeRunner.java
index d7dc7624d1..258952e295 100644
---
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/MergeRunner.java
+++
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/MergeRunner.java
@@ -58,11 +58,11 @@ import static
org.apache.jackrabbit.oak.index.indexer.document.flatfile.FlatFile
* </ol>
* Strategy -
* <ol>
- * <li>Wait for n files</li>
- * <li>construct new list of files to be merged by checking if its
already merged</li>
+ * <li>Wait for n files
+ * <li>construct new list of files to be merged by checking if its
already merged
* and create intermediate merge file
* (if final merge) merge all intermediate merge files and create sorted
file
- * <li>add all merged files to merged list</li>
+ * <li>add all merged files to merged list
* </ol>
*
* <h3>Merge task explanation -</h3>
@@ -106,14 +106,14 @@ import static
org.apache.jackrabbit.oak.index.indexer.document.flatfile.FlatFile
*
* <h3>Force Stop Explanation -</h3>
* <ol>
- * <li>On receiving MERGE_FORCE_STOP_POISON_PILL in SORTED_FILE_QUEUE from
parent thread, all un-started tasks will be skipped.</li>
- * <li>No more tasks will be created on MERGE_FORCE_STOP_POISON_PILL
message is received.</li>
- * <li>Running merge will continue to finish.</li>
- * <li>Final merge will not be performed.</li>
- * <li>This will not result in lose of data under conditions that -</li>
+ * <li>On receiving MERGE_FORCE_STOP_POISON_PILL in SORTED_FILE_QUEUE from
parent thread, all un-started tasks will be skipped.
+ * <li>No more tasks will be created on MERGE_FORCE_STOP_POISON_PILL
message is received.
+ * <li>Running merge will continue to finish.
+ * <li>Final merge will not be performed.
+ * <li>This will not result in lose of data under conditions that -
* <ol>
- * <li>Files will not be removed until merge task is completed.
Parent thread should add unmerged files to the SORTED_FILE_QUEUE on retry.</li>
- * <li>Merged files will still be under the merge folder. Parent
thread should add those files to the SORTED_FILE_QUEUE on retry.</li>
+ * <li>Files will not be removed until merge task is completed.
Parent thread should add unmerged files to the SORTED_FILE_QUEUE on retry.
+ * <li>Merged files will still be under the merge folder. Parent
thread should add those files to the SORTED_FILE_QUEUE on retry.
* </ol>
* </li>
* </ol>
diff --git
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/MultithreadedTraverseWithSortStrategy.java
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/MultithreadedTraverseWithSortStrategy.java
index d207de7bad..3900ed4baa 100644
---
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/MultithreadedTraverseWithSortStrategy.java
+++
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/MultithreadedTraverseWithSortStrategy.java
@@ -132,13 +132,13 @@ import static
org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentTrav
* If some state information is found, that means,
some data was already dumped. So to avoid again downloading that data, we
create two tasks-
* Suppose the traversing range of this sort-work-dir
is - _modified in [10, 100) and the state information is (50, doc_id)
* <ol>
- * <li>First task will download docs with
_modified = 50 and _id < doc_id</li>
+ * <li>First task will download docs with
_modified = 50 and _id < doc_id</li>
* <li>Second task downloads docs with _modified
in [51, 100) </li>
* </ol>
* </li>
* </ol>
* </li>
- * <li>If multiple retries have happened, there would be a list
of sort-work-dirs from each of the runs i.e. a List<List<File>>.</li>
+ * <li>If multiple retries have happened, there would be a list
of sort-work-dirs from each of the runs i.e. a {@code List<List<File>>}.</li>
* <li>The list should be sorted in order of run i.e. first list
would be the list of dirs from first run and last list would be the list of
files from the most recent run
* which failed.</li>
* <li>The data dump files from each of sort-work-dirs of every
run would be considered, but for creating further tasks for downloading
remaining data
