Revert "OAK-11742 : removed usage of Guava's ordering with JDK comparator (#2314)"

This reverts commit ee6c57e.

Author: reschke

oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/SharedDataStoreUtils.java

@@ -16,18 +16,20 @@
  */
 package org.apache.jackrabbit.oak.plugins.blob.datastore;
 
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import org.apache.jackrabbit.guava.common.base.Splitter;
 import org.apache.jackrabbit.guava.common.collect.FluentIterable;
+import org.apache.jackrabbit.guava.common.collect.Ordering;
 import org.apache.jackrabbit.core.data.DataRecord;
 import org.apache.jackrabbit.oak.commons.collections.SetUtils;
 import org.apache.jackrabbit.oak.plugins.blob.SharedDataStore;
 import org.apache.jackrabbit.oak.spi.blob.BlobStore;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Utility class for {@link SharedDataStore}.
@@ -51,7 +53,14 @@ public static boolean isShared(BlobStore blobStore) {
      * @return the earliest record
      */
     public static DataRecord getEarliestRecord(List<DataRecord> recs) {
-        return Collections.min(recs, Comparator.comparing(DataRecord::getLastModified, Comparator.naturalOrder()));
+        return Ordering.natural().onResultOf(
+                new Function<DataRecord, Long>() {
+                    @Override
+                    @Nullable
+                    public Long apply(@NotNull DataRecord input) {
+                        return input.getLastModified();
+                    }
+                }::apply).min(recs);
     }
 
     /**

oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java

@@ -29,7 +29,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jackrabbit.oak.api.PropertyValue;
@@ -106,6 +105,7 @@
 import org.slf4j.LoggerFactory;
 
 import org.apache.jackrabbit.guava.common.collect.AbstractIterator;
+import org.apache.jackrabbit.guava.common.collect.Ordering;
 
 /**
  * Represents a parsed query.
@@ -124,7 +124,12 @@ public class QueryImpl implements Query {
 
     private boolean potentiallySlowTraversalQueryLogged;
 
-    private static final Comparator<QueryIndex> MINIMAL_COST_ORDERING = Comparator.comparingDouble(QueryIndex::getMinimumCost);
+    private static final Ordering<QueryIndex> MINIMAL_COST_ORDERING = new Ordering<QueryIndex>() {
+        @Override
+        public int compare(QueryIndex left, QueryIndex right) {
+            return Double.compare(left.getMinimumCost(), right.getMinimumCost());
+        }
+    };
 
     SourceImpl source;
     private String statement;
@@ -1087,8 +1092,8 @@ private SelectorExecutionPlan getBestSelectorExecutionPlan(
 
         // Sort the indexes according to their minimum cost to be able to skip the remaining indexes if the cost of the
         // current index is below the minimum cost of the next index.
-        List<? extends QueryIndex> queryIndexes = indexProvider.getQueryIndexes(rootState).stream()
-                .sorted(MINIMAL_COST_ORDERING).collect(Collectors.toList());
+        List<? extends QueryIndex> queryIndexes = MINIMAL_COST_ORDERING
+                .sortedCopy(indexProvider.getQueryIndexes(rootState));
         List<OrderEntry> sortOrder = getSortOrder(filter); 
         for (int i = 0; i < queryIndexes.size(); i++) {
             QueryIndex index = queryIndexes.get(i);

oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapEntry.java

@@ -21,10 +21,10 @@
 import static java.util.Objects.requireNonNull;
 import static org.apache.jackrabbit.oak.segment.MapRecord.HASH_MASK;
 
-import java.util.Comparator;
 import java.util.Map;
 
 import org.apache.jackrabbit.guava.common.collect.ComparisonChain;
+import org.apache.jackrabbit.guava.common.collect.Ordering;
 import org.apache.jackrabbit.oak.commons.conditions.Validate;
 import org.apache.jackrabbit.oak.spi.state.AbstractChildNodeEntry;
 import org.jetbrains.annotations.NotNull;
@@ -152,7 +152,7 @@ public int compareTo(@NotNull MapEntry that) {
         return ComparisonChain.start()
                 .compare(getHash() & HASH_MASK, that.getHash() & HASH_MASK)
                 .compare(name, that.name)
-                .compare(value, that.value, Comparator.nullsLast(Comparator.naturalOrder()))
+                .compare(value, that.value, Ordering.natural().nullsLast())
                 .result();
     }
 

oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java

@@ -51,6 +51,7 @@
 
 import org.apache.jackrabbit.guava.common.cache.Cache;
 import org.apache.jackrabbit.guava.common.collect.AbstractIterator;
+import org.apache.jackrabbit.guava.common.collect.Ordering;
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.commons.PathUtils;
 import org.apache.jackrabbit.oak.commons.collections.DequeUtils;
@@ -2550,7 +2551,7 @@ private static final class ValueComparator implements
 
         static final Comparator<Entry<Revision, String>> REVERSE = Collections.reverseOrder(INSTANCE);
 
-        private static final Comparator<String> STRING_ORDERING = Comparator.nullsFirst(Comparator.naturalOrder());
+        private static final Ordering<String> STRING_ORDERING = Ordering.natural().nullsFirst();
 
         @Override
         public int compare(Entry<Revision, String> o1,