OAK-10287: switch oak-benchmarks-lucene to shaded guava (#973)

apache · Jun 9, 2023 · 136bf14 · 136bf14
1 parent 488cca5
commit 136bf14
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 30 deletions.
diff --git a/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/benchmark/HybridIndexTest.java b/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/benchmark/HybridIndexTest.java
@@ -43,10 +43,10 @@
 import javax.jcr.query.QueryManager;
 import javax.jcr.query.QueryResult;
 
-import com.google.common.base.Joiner;
-import com.google.common.collect.Iterators;
-import com.google.common.collect.Lists;
-import com.google.common.util.concurrent.MoreExecutors;
+import org.apache.jackrabbit.guava.common.base.Joiner;
+import org.apache.jackrabbit.guava.common.collect.Iterators;
+import org.apache.jackrabbit.guava.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.util.concurrent.MoreExecutors;
 import org.apache.commons.io.FileUtils;
 import org.apache.jackrabbit.oak.Oak;
 import org.apache.jackrabbit.oak.api.Type;
@@ -92,7 +92,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
 import static java.util.Collections.singleton;
 import static java.util.Collections.singletonList;
 import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.DECLARING_NODE_TYPES;

diff --git a/.../java/org/apache/jackrabbit/oak/benchmark/LuceneFullTextWithoutGlobalIndexSearchTest.java b/.../java/org/apache/jackrabbit/oak/benchmark/LuceneFullTextWithoutGlobalIndexSearchTest.java
@@ -35,7 +35,7 @@
 import java.io.File;
 import java.io.IOException;
 
-import static com.google.common.collect.ImmutableSet.of;
+import static org.apache.jackrabbit.guava.common.collect.ImmutableSet.of;
 
 /*
 Similar to {@Link LuceneFullTextWithGlobalIndexSearchTest}. The only diff being this doesn't configure a global full text index

diff --git a/.../java/org/apache/jackrabbit/oak/benchmark/LucenePropertyFTIndexedContentAvailability.java b/.../java/org/apache/jackrabbit/oak/benchmark/LucenePropertyFTIndexedContentAvailability.java
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.oak.benchmark;
 
-import static com.google.common.collect.ImmutableSet.of;
+import static org.apache.jackrabbit.guava.common.collect.ImmutableSet.of;
 import java.io.File;
 import javax.jcr.Repository;
 import org.apache.jackrabbit.oak.Oak;

diff --git a/.../apache/jackrabbit/oak/benchmark/LucenePropertyFTSeparatedIndexedContentAvailability.java b/.../apache/jackrabbit/oak/benchmark/LucenePropertyFTSeparatedIndexedContentAvailability.java
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.oak.benchmark;
 
-import static com.google.common.collect.ImmutableSet.of;
+import static org.apache.jackrabbit.guava.common.collect.ImmutableSet.of;
 
 import java.io.File;
 

diff --git a/...ks-lucene/src/main/java/org/apache/jackrabbit/oak/benchmark/LucenePropertySearchTest.java b/...ks-lucene/src/main/java/org/apache/jackrabbit/oak/benchmark/LucenePropertySearchTest.java
@@ -36,7 +36,7 @@
 import java.io.File;
 import java.io.IOException;
 
-import static com.google.common.collect.ImmutableSet.of;
+import static org.apache.jackrabbit.guava.common.collect.ImmutableSet.of;
 
 public class LucenePropertySearchTest extends SearchTest {
 

diff --git a/...ks-lucene/src/main/java/org/apache/jackrabbit/oak/benchmark/util/OakLuceneIndexUtils.java b/...ks-lucene/src/main/java/org/apache/jackrabbit/oak/benchmark/util/OakLuceneIndexUtils.java
@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.oak.benchmark.util;
 
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.base.Strings;
+import org.apache.jackrabbit.guava.common.collect.Lists;
 import org.apache.jackrabbit.commons.JcrUtils;
 import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
 import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants;

diff --git a/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/run/LuceneMain.java b/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/run/LuceneMain.java
@@ -17,7 +17,7 @@
 package org.apache.jackrabbit.oak.run;
 
 
-import com.google.common.collect.ImmutableMap;
+import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
 import org.apache.jackrabbit.oak.run.commons.Command;
 import org.apache.jackrabbit.oak.run.commons.Modes;
 import org.apache.jackrabbit.oak.run.commons.Utils;

diff --git a/...n/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/AggregateNodeSearcher.java b/...n/java/org/apache/jackrabbit/oak/scalability/benchmarks/search/AggregateNodeSearcher.java
@@ -19,7 +19,7 @@
 
 package org.apache.jackrabbit.oak.scalability.benchmarks.search;
 
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.Lists;
 
 import org.apache.jackrabbit.api.security.user.Authorizable;
 import org.jetbrains.annotations.NotNull;

diff --git a/...rc/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityBlobSearchSuite.java b/...rc/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityBlobSearchSuite.java
@@ -18,8 +18,8 @@
  */
 package org.apache.jackrabbit.oak.scalability.suites;
 
-import static com.google.common.collect.Lists.newArrayList;
-import static com.google.common.collect.Lists.newArrayListWithCapacity;
+import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
+import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
 
 import java.util.List;
 import java.util.Random;
@@ -38,9 +38,9 @@
 import javax.jcr.nodetype.NodeType;
 import javax.jcr.version.VersionException;
 
-import com.google.common.base.Stopwatch;
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.base.Stopwatch;
+import org.apache.jackrabbit.guava.common.base.Strings;
+import org.apache.jackrabbit.guava.common.collect.Lists;
 
 import org.apache.commons.io.output.NullOutputStream;
 import org.apache.commons.math.stat.descriptive.SynchronizedDescriptiveStatistics;

diff --git a/...n/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeRelationshipSuite.java b/...n/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeRelationshipSuite.java
@@ -30,7 +30,7 @@
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-import com.google.common.collect.ImmutableList;
+import org.apache.jackrabbit.guava.common.collect.ImmutableList;
 import org.apache.commons.math.stat.descriptive.SynchronizedDescriptiveStatistics;
 import org.apache.jackrabbit.api.JackrabbitSession;
 import org.apache.jackrabbit.api.security.user.Authorizable;
@@ -48,10 +48,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Splitter;
-import com.google.common.base.StandardSystemProperty;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import org.apache.jackrabbit.guava.common.base.Splitter;
+import org.apache.jackrabbit.guava.common.base.StandardSystemProperty;
+import org.apache.jackrabbit.guava.common.collect.Lists;
+import org.apache.jackrabbit.guava.common.collect.Maps;
 
 /**
  * The suite test will incrementally increase the load and execute searches.

diff --git a/...cene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeSuite.java b/...cene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeSuite.java
@@ -18,8 +18,8 @@
  */
 package org.apache.jackrabbit.oak.scalability.suites;
 
-import static com.google.common.collect.Lists.newArrayList;
-import static com.google.common.collect.Lists.newArrayListWithCapacity;
+import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
+import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
 
 import java.util.Calendar;
 import java.util.List;
@@ -34,11 +34,11 @@
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-import com.google.common.base.Splitter;
-import com.google.common.base.StandardSystemProperty;
-import com.google.common.base.Stopwatch;
-import com.google.common.base.Strings;
-import com.google.common.collect.Maps;
+import org.apache.jackrabbit.guava.common.base.Splitter;
+import org.apache.jackrabbit.guava.common.base.StandardSystemProperty;
+import org.apache.jackrabbit.guava.common.base.Stopwatch;
+import org.apache.jackrabbit.guava.common.base.Strings;
+import org.apache.jackrabbit.guava.common.collect.Maps;
 
 import org.apache.commons.math.stat.descriptive.SynchronizedDescriptiveStatistics;
 import org.apache.jackrabbit.commons.JcrUtils;