This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-11078 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit b59ef3119c0d345cf266becc1862b1ba7dae9865 Author: Julian Reschke <[email protected]> AuthorDate: Wed Sep 4 09:10:56 2024 +0100 OAK-11078: Remove usage of Guava checkArgument (oak-store-document) --- oak-store-document/pom.xml | 4 ++++ .../jackrabbit/oak/plugins/document/BatchCommit.java | 5 ++--- .../jackrabbit/oak/plugins/document/Branch.java | 20 ++++++++++---------- .../jackrabbit/oak/plugins/document/CommitQueue.java | 4 ++-- .../oak/plugins/document/DocumentNodeStore.java | 14 ++++++-------- .../plugins/document/DocumentNodeStoreBuilder.java | 13 +++++++------ .../plugins/document/DocumentNodeStoreMBeanImpl.java | 6 +++--- .../oak/plugins/document/JournalDiffLoader.java | 6 +++--- .../oak/plugins/document/JournalEntry.java | 6 +++--- .../oak/plugins/document/JournalPropertyHandler.java | 8 +++----- .../oak/plugins/document/NodeDocument.java | 5 +++-- .../apache/jackrabbit/oak/plugins/document/Path.java | 8 ++++---- .../jackrabbit/oak/plugins/document/Range.java | 8 ++++---- .../oak/plugins/document/SplitDocumentCleanUp.java | 6 +++--- .../oak/plugins/document/UnmergedBranches.java | 6 +++--- .../plugins/document/bundlor/CompositeMatcher.java | 6 ++---- .../plugins/document/bundlor/DocumentBundlor.java | 8 ++++---- .../plugins/document/bundlor/IncludeAllMatcher.java | 6 +++--- .../oak/plugins/document/mongo/MongoUtils.java | 10 +++------- .../document/secondary/PathFilteringDiff.java | 5 ++--- .../oak/plugins/document/util/TimeInterval.java | 4 ++-- 21 files changed, 76 insertions(+), 82 deletions(-) diff --git a/oak-store-document/pom.xml b/oak-store-document/pom.xml index 4a444d4d67..0a5005567f 100644 --- a/oak-store-document/pom.xml +++ b/oak-store-document/pom.xml @@ -147,6 +147,10 @@ </dependency> <!-- General utility libraries --> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommit.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommit.java index 2dd3770eba..0439a63d01 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommit.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommit.java @@ -24,12 +24,11 @@ import java.util.concurrent.Future; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - +import org.apache.commons.lang3.Validate; import org.apache.jackrabbit.guava.common.collect.Lists; import org.apache.jackrabbit.guava.common.util.concurrent.Futures; import org.apache.jackrabbit.guava.common.util.concurrent.SettableFuture; -import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument; import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState; import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES; @@ -64,7 +63,7 @@ final class BatchCommit { } Callable<NodeDocument> enqueue(final UpdateOp op) { - checkArgument(op.getId().equals(id), + Validate.isTrue(op.getId().equals(id), "Cannot add UpdateOp with id %s to BatchCommit with id %s", op.getId(), id); Callable<NodeDocument> result; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Branch.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Branch.java index 6948b8f152..6348562e39 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Branch.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Branch.java @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.plugins.document; -import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; import static org.apache.jackrabbit.guava.common.collect.Iterables.filter; import static org.apache.jackrabbit.guava.common.collect.Iterables.transform; @@ -32,6 +31,7 @@ import java.util.TreeMap; import java.util.concurrent.ConcurrentSkipListMap; import java.util.function.Predicate; +import org.apache.commons.lang3.Validate; import org.apache.jackrabbit.guava.common.collect.Iterables; import org.apache.jackrabbit.guava.common.collect.Sets; @@ -77,7 +77,7 @@ class Branch { @NotNull RevisionVector base, @NotNull ReferenceQueue<Object> queue, @Nullable Object guard) { - checkArgument(!requireNonNull(base).isBranch(), "base is not a trunk revision: %s", base); + Validate.isTrue(!requireNonNull(base).isBranch(), "base is not a trunk revision: %s", base); this.base = base; this.commits = new ConcurrentSkipListMap<Revision, BranchCommit>(commits.comparator()); for (Revision r : commits) { @@ -126,10 +126,10 @@ class Branch { * branch revision. */ void rebase(@NotNull Revision head, @NotNull RevisionVector base) { - checkArgument(requireNonNull(head).isBranch(), "Not a branch revision: %s", head); - checkArgument(!requireNonNull(base).isBranch(), "Not a trunk revision: %s", base); + Validate.isTrue(requireNonNull(head).isBranch(), "Not a branch revision: %s", head); + Validate.isTrue(!requireNonNull(base).isBranch(), "Not a trunk revision: %s", base); Revision last = commits.lastKey(); - checkArgument(head.compareRevisionTime(last) > 0); + Validate.isTrue(head.compareRevisionTime(last) > 0); commits.put(head, new RebaseCommit(base, head, commits)); } @@ -140,9 +140,9 @@ class Branch { * @throws IllegalArgumentException if r is not a branch revision. */ void addCommit(@NotNull Revision r) { - checkArgument(requireNonNull(r).isBranch(), "Not a branch revision: %s", r); + Validate.isTrue(requireNonNull(r).isBranch(), "Not a branch revision: %s", r); Revision last = commits.lastKey(); - checkArgument(commits.comparator().compare(r, last) > 0); + Validate.isTrue(commits.comparator().compare(r, last) > 0); commits.put(r, new BranchCommitImpl(commits.get(last).getBase(), r)); } @@ -201,7 +201,7 @@ class Branch { * @throws IllegalArgumentException if r is not a branch revision. */ public void removeCommit(@NotNull Revision r) { - checkArgument(requireNonNull(r).isBranch(), "Not a branch revision: %s", r); + Validate.isTrue(requireNonNull(r).isBranch(), "Not a branch revision: %s", r); commits.remove(r); } @@ -252,7 +252,7 @@ class Branch { * {@code false} otherwise. */ public boolean isHead(@NotNull Revision rev) { - checkArgument(requireNonNull(rev).isBranch(), + Validate.isTrue(requireNonNull(rev).isBranch(), "Not a branch revision: %s", rev); return requireNonNull(rev).equals(commits.lastKey()); } @@ -266,7 +266,7 @@ class Branch { * @throws IllegalArgumentException if r is not a branch revision. */ Iterable<Path> getModifiedPathsUntil(@NotNull final Revision r) { - checkArgument(requireNonNull(r).isBranch(), + Validate.isTrue(requireNonNull(r).isBranch(), "Not a branch revision: %s", r); if (!commits.containsKey(r)) { return Collections.emptyList(); diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitQueue.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitQueue.java index 17b5e791d4..e8e45f8a0a 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitQueue.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitQueue.java @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.plugins.document; -import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; import java.util.HashSet; @@ -31,6 +30,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; +import org.apache.commons.lang3.Validate; import org.apache.jackrabbit.guava.common.collect.Maps; import org.apache.jackrabbit.oak.stats.StatisticsProvider; @@ -83,7 +83,7 @@ final class CommitQueue { @NotNull SortedSet<Revision> createRevisions(int num) { - checkArgument(num > 0); + Validate.isTrue(num > 0); SortedSet<Revision> revs = new TreeSet<Revision>(StableRevisionComparator.INSTANCE); Revision rev = null; synchronized (this) { diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java index 5283f9a03f..eca7dc1c9c 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.plugins.document; -import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState; import static org.apache.jackrabbit.guava.common.collect.Iterables.partition; @@ -128,10 +127,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - +import org.apache.commons.lang3.Validate; import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.guava.common.base.Strings; - import org.apache.jackrabbit.guava.common.base.Suppliers; import org.apache.jackrabbit.guava.common.collect.ImmutableList; import org.apache.jackrabbit.guava.common.collect.ImmutableMap; @@ -1010,7 +1008,7 @@ public final class DocumentNodeStore } void setRoot(@NotNull RevisionVector newHead) { - checkArgument(!newHead.isBranch()); + Validate.isTrue(!newHead.isBranch()); root = getRoot(newHead); } @@ -3251,8 +3249,8 @@ public final class DocumentNodeStore private Commit newTrunkCommit(@NotNull Changes changes, @NotNull RevisionVector base) { - checkArgument(!requireNonNull(base).isBranch(), - "base must not be a branch revision: " + base); + Validate.isTrue(!requireNonNull(base).isBranch(), + "base must not be a branch revision: %s", base); // build commit before revision is created by the commit queue (OAK-7869) CommitBuilder commitBuilder = newCommitBuilder(base, null); @@ -3278,8 +3276,8 @@ public final class DocumentNodeStore private Commit newBranchCommit(@NotNull Changes changes, @NotNull RevisionVector base, @Nullable DocumentNodeStoreBranch branch) { - checkArgument(requireNonNull(base).isBranch(), - "base must be a branch revision: " + base); + Validate.isTrue(requireNonNull(base).isBranch(), + "base must be a branch revision: %s", base); checkOpen(); Revision commitRevision = newRevision(); diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java index 155ab1b893..a79db61b37 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java @@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.plugins.document; import static java.util.Objects.isNull; import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.toUnmodifiableSet; -import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument; + import static org.apache.jackrabbit.guava.common.base.Suppliers.ofInstance; import static org.apache.jackrabbit.oak.plugins.document.CommitQueue.DEFAULT_SUSPEND_TIMEOUT; import static org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.DEFAULT_JOURNAL_GC_MAX_AGE_MILLIS; @@ -36,6 +36,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.Predicate; import java.util.function.Supplier; +import org.apache.commons.lang3.Validate; import org.apache.jackrabbit.guava.common.cache.Cache; import org.apache.jackrabbit.guava.common.cache.CacheBuilder; import org.apache.jackrabbit.guava.common.cache.RemovalCause; @@ -557,11 +558,11 @@ public class DocumentNodeStoreBuilder<T extends DocumentNodeStoreBuilder<T>> { int prevDocCachePercentage, int childrenCachePercentage, int diffCachePercentage) { - checkArgument(nodeCachePercentage >= 0); - checkArgument(prevDocCachePercentage >= 0); - checkArgument(childrenCachePercentage>= 0); - checkArgument(diffCachePercentage >= 0); - checkArgument(nodeCachePercentage + prevDocCachePercentage + childrenCachePercentage + + Validate.isTrue(nodeCachePercentage >= 0); + Validate.isTrue(prevDocCachePercentage >= 0); + Validate.isTrue(childrenCachePercentage>= 0); + Validate.isTrue(diffCachePercentage >= 0); + Validate.isTrue(nodeCachePercentage + prevDocCachePercentage + childrenCachePercentage + diffCachePercentage < 100); this.nodeCachePercentage = nodeCachePercentage; this.prevDocCachePercentage = prevDocCachePercentage; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreMBeanImpl.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreMBeanImpl.java index f3ade339c1..1e488b2745 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreMBeanImpl.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreMBeanImpl.java @@ -24,6 +24,7 @@ import java.util.TimeZone; import javax.management.openmbean.CompositeData; +import org.apache.commons.lang3.Validate; import org.apache.jackrabbit.api.stats.RepositoryStatistics; import org.apache.jackrabbit.api.stats.TimeSeries; import org.apache.jackrabbit.oak.commons.PathUtils; @@ -33,7 +34,6 @@ import org.apache.jackrabbit.stats.TimeSeriesStatsUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; import static org.apache.jackrabbit.guava.common.collect.Iterables.filter; import static org.apache.jackrabbit.guava.common.collect.Iterables.toArray; @@ -170,8 +170,8 @@ final class DocumentNodeStoreMBeanImpl extends AnnotatedStandardMBean implements @Override public int recover(String path, int clusterId) { requireNonNull(path, "path must not be null"); - checkArgument(PathUtils.isAbsolute(path), "path must be absolute"); - checkArgument(clusterId >= 0, "clusterId must not be a negative"); + Validate.isTrue(PathUtils.isAbsolute(path), "path must be absolute"); + Validate.isTrue(clusterId >= 0, "clusterId must not be a negative"); DocumentStore docStore = nodeStore.getDocumentStore(); boolean isActive = false; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java index 46e5ea88b0..ebd023b7db 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.util.Map; import java.util.concurrent.TimeUnit; +import org.apache.commons.lang3.Validate; import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.oak.cache.CacheStats; @@ -31,7 +32,6 @@ import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; import static org.apache.commons.io.FileUtils.byteCountToDisplaySize; import static org.apache.jackrabbit.oak.plugins.document.JournalEntry.asId; @@ -58,8 +58,8 @@ class JournalDiffLoader implements DiffCache.Loader { this.base = requireNonNull(base); this.node = requireNonNull(node); this.ns = requireNonNull(ns); - checkArgument(base.getPath().equals(node.getPath()), - "nodes must have matching paths: {} != {}", + Validate.isTrue(base.getPath().equals(node.getPath()), + "nodes must have matching paths: %s != %s", base.getPath(), node.getPath()); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalEntry.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalEntry.java index b0d9edbee8..d122b0cdf6 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalEntry.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalEntry.java @@ -25,6 +25,7 @@ import java.util.Map; import java.util.Set; import java.util.function.Consumer; +import org.apache.commons.lang3.Validate; import org.apache.jackrabbit.guava.common.collect.AbstractIterator; import org.apache.jackrabbit.guava.common.collect.Iterables; import org.apache.jackrabbit.guava.common.collect.Lists; @@ -44,7 +45,6 @@ import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; import static org.apache.jackrabbit.oak.plugins.document.Collection.JOURNAL; @@ -280,7 +280,7 @@ public final class JournalEntry extends Document { @Nullable JournalPropertyHandler journalPropertyHandler) throws IOException { requireNonNull(path); - checkArgument(requireNonNull(from).getClusterId() == requireNonNull(to).getClusterId()); + Validate.isTrue(requireNonNull(from).getClusterId() == requireNonNull(to).getClusterId()); if (from.compareRevisionTime(to) >= 0) { return 0; @@ -700,7 +700,7 @@ public final class JournalEntry extends Document { } TreeNode(MapFactory mapFactory, TreeNode parent, String name) { - checkArgument(!name.contains("/"), + Validate.isTrue(!name.contains("/"), "name must not contain '/': {}", name); this.mapFactory = mapFactory; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalPropertyHandler.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalPropertyHandler.java index 2b007b55ab..64f4ce8375 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalPropertyHandler.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalPropertyHandler.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.jackrabbit.oak.plugins.document; import java.util.List; import java.util.Map; +import org.apache.commons.lang3.Validate; import org.apache.jackrabbit.guava.common.collect.Maps; import org.apache.jackrabbit.oak.plugins.document.spi.JournalProperty; import org.apache.jackrabbit.oak.plugins.document.spi.JournalPropertyBuilder; @@ -30,8 +30,6 @@ import org.apache.jackrabbit.oak.plugins.document.util.Utils; import org.apache.jackrabbit.oak.spi.commit.CommitContext; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; -import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument; - class JournalPropertyHandler { private final Map<String, JournalPropertyBuilder<JournalProperty>> builders = Maps.newHashMap(); @@ -93,8 +91,8 @@ class JournalPropertyHandler { if (o == null){ return null; } - checkArgument(o instanceof JournalProperty, "CommitContext entry for name [%s] " + - "having value [%s] is not of type JournalEntry", name, o); + Validate.isTrue(o instanceof JournalProperty, + "CommitContext entry for name [%s] having value [%s] is not of type JournalEntry", name, o); return (JournalProperty) o; } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java index e13c271c9a..9e52435314 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java @@ -18,7 +18,7 @@ package org.apache.jackrabbit.oak.plugins.document; import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.toSet; -import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument; + import static org.apache.jackrabbit.guava.common.collect.ImmutableList.copyOf; import static org.apache.jackrabbit.guava.common.collect.Iterables.filter; import static org.apache.jackrabbit.guava.common.collect.Iterables.mergeSorted; @@ -51,6 +51,7 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.Function; import java.util.function.Predicate; +import org.apache.commons.lang3.Validate; import org.apache.jackrabbit.guava.common.collect.AbstractIterator; import org.apache.jackrabbit.guava.common.collect.ImmutableList; import org.apache.jackrabbit.guava.common.collect.Iterables; @@ -736,7 +737,7 @@ public final class NodeDocument extends Document { final Revision changeRev, final Branch branch, final Set<Revision> collisions) { - checkArgument(!baseRev.isBranch() || branch != null, + Validate.isTrue(!baseRev.isBranch() || branch != null, "Branch must be non-null if baseRev is a branch revision"); RevisionVector head = context.getHeadRevision(); RevisionVector lower = branch != null ? branch.getBase() : baseRev; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Path.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Path.java index 404637c930..d4511215a1 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Path.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Path.java @@ -21,13 +21,13 @@ package org.apache.jackrabbit.oak.plugins.document; import java.util.Arrays; import java.util.Objects; +import org.apache.commons.lang3.Validate; import org.apache.jackrabbit.oak.cache.CacheValue; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.commons.StringUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; import static org.apache.jackrabbit.guava.common.collect.Iterables.elementsEqual; @@ -67,7 +67,7 @@ public final class Path implements CacheValue, Comparable<Path> { */ public Path(@NotNull Path parent, @NotNull String name) { this(requireNonNull(parent), requireNonNull(name), -1); - checkArgument(!name.isEmpty(), "name cannot be the empty String"); + Validate.isTrue(!name.isEmpty(), "name cannot be the empty String"); } /** @@ -79,8 +79,8 @@ public final class Path implements CacheValue, Comparable<Path> { */ public Path(@NotNull String name) { this(null, requireNonNull(name), -1); - checkArgument(!name.isEmpty(), "name cannot be the empty String"); - checkArgument(name.indexOf('/') == -1, "name must not contain path separator: {}", name); + Validate.isTrue(!name.isEmpty(), "name cannot be the empty String"); + Validate.isTrue(name.indexOf('/') == -1, "name must not contain path separator: %s", name); } /** diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Range.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Range.java index ba31a03ed2..04264b7f32 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Range.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Range.java @@ -16,9 +16,9 @@ */ package org.apache.jackrabbit.oak.plugins.document; -import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; +import org.apache.commons.lang3.Validate; import org.jetbrains.annotations.NotNull; /** @@ -40,11 +40,11 @@ final class Range { this.high = requireNonNull(high); this.low = requireNonNull(low); this.height = height; - checkArgument(high.getClusterId() == low.getClusterId(), + Validate.isTrue(high.getClusterId() == low.getClusterId(), "Revisions from have the same clusterId"); - checkArgument(high.compareRevisionTime(low) >= 0, + Validate.isTrue(high.compareRevisionTime(low) >= 0, "High Revision must be later than low Revision, high=%s low=%s" ,high, low); - checkArgument(height >= 0); + Validate.isTrue(height >= 0); } /** diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitDocumentCleanUp.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitDocumentCleanUp.java index ecfe5ae124..b3173084c6 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitDocumentCleanUp.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitDocumentCleanUp.java @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.plugins.document; -import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument; import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES; import static org.apache.jackrabbit.oak.plugins.document.NodeDocument.SplitDocType.INTERMEDIATE; import static org.apache.jackrabbit.oak.plugins.document.NodeDocument.SplitDocType.NONE; @@ -25,6 +24,7 @@ import java.io.Closeable; import java.io.IOException; import java.util.List; +import org.apache.commons.lang3.Validate; import org.apache.jackrabbit.guava.common.collect.Lists; import org.apache.jackrabbit.oak.commons.log.LogSilencer; import org.apache.jackrabbit.oak.plugins.document.VersionGarbageCollector.VersionGCStats; @@ -135,7 +135,7 @@ public class SplitDocumentCleanUp implements Closeable { private void disconnectFromIntermediate(NodeDocument splitDoc, Revision rev) { - checkArgument(splitDoc.getSplitDocType() == INTERMEDIATE, + Validate.isTrue(splitDoc.getSplitDocType() == INTERMEDIATE, "Illegal type: %s", splitDoc.getSplitDocType()); String splitDocId = splitDoc.getId(); @@ -168,7 +168,7 @@ public class SplitDocumentCleanUp implements Closeable { final void markStaleOnMain(NodeDocument main, Revision rev, int height) { - checkArgument(main.getSplitDocType() == NONE, + Validate.isTrue(main.getSplitDocType() == NONE, "Illegal type: %s", main.getSplitDocType()); UpdateOp update = new UpdateOp(main.getId(), false); diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnmergedBranches.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnmergedBranches.java index 1dba5d89aa..07478eb670 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnmergedBranches.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnmergedBranches.java @@ -24,6 +24,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Predicate; +import org.apache.commons.lang3.Validate; import org.apache.jackrabbit.oak.plugins.document.Branch.BranchCommit; import org.apache.jackrabbit.oak.plugins.document.Branch.BranchReference; import org.apache.jackrabbit.oak.plugins.document.util.Utils; @@ -32,7 +33,6 @@ import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; /** @@ -121,9 +121,9 @@ class UnmergedBranches { Branch create(@NotNull RevisionVector base, @NotNull Revision initial, @Nullable Object guard) { - checkArgument(!requireNonNull(base).isBranch(), + Validate.isTrue(!requireNonNull(base).isBranch(), "base is not a trunk revision: %s", base); - checkArgument(requireNonNull(initial).isBranch(), + Validate.isTrue(requireNonNull(initial).isBranch(), "initial is not a branch revision: %s", initial); SortedSet<Revision> commits = new TreeSet<Revision>(StableRevisionComparator.INSTANCE); commits.add(initial); diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/CompositeMatcher.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/CompositeMatcher.java index 10fff3759a..5826f19e7e 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/CompositeMatcher.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/CompositeMatcher.java @@ -16,15 +16,13 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.jackrabbit.oak.plugins.document.bundlor; import java.util.List; +import org.apache.commons.lang3.Validate; import org.apache.jackrabbit.guava.common.collect.Lists; -import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument; - class CompositeMatcher implements Matcher { private final List<Matcher> matchers; @@ -45,7 +43,7 @@ class CompositeMatcher implements Matcher { */ private CompositeMatcher(List<Matcher> matchers) { for (Matcher m : matchers){ - checkArgument(m.isMatch(), "Non matching matcher found in [%s]", matchers); + Validate.isTrue(m.isMatch(), "Non matching matcher found in [%s]", matchers); } this.matchers = matchers; } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlor.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlor.java index 3545b371c5..f767fa4850 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlor.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlor.java @@ -22,6 +22,7 @@ package org.apache.jackrabbit.oak.plugins.document.bundlor; import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.Validate; import org.apache.jackrabbit.guava.common.collect.ImmutableList; import org.apache.jackrabbit.guava.common.collect.Lists; import org.apache.jackrabbit.oak.api.PropertyState; @@ -29,7 +30,6 @@ import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.spi.state.NodeState; -import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument; import static org.apache.jackrabbit.oak.api.Type.STRINGS; import static org.apache.jackrabbit.oak.plugins.memory.PropertyStates.createProperty; @@ -77,7 +77,7 @@ public class DocumentBundlor { private final List<Include> includes; public static DocumentBundlor from(NodeState nodeState){ - checkArgument(nodeState.hasProperty(PROP_PATTERN), "NodeState [%s] does not have required " + + Validate.isTrue(nodeState.hasProperty(PROP_PATTERN), "NodeState [%s] does not have required " + "property [%s]", nodeState, PROP_PATTERN); return DocumentBundlor.from(nodeState.getStrings(PROP_PATTERN)); } @@ -91,12 +91,12 @@ public class DocumentBundlor { } public static DocumentBundlor from(PropertyState prop){ - checkArgument(META_PROP_PATTERN.equals(prop.getName())); + Validate.isTrue(META_PROP_PATTERN.equals(prop.getName())); return from(prop.getValue(Type.STRINGS)); } private DocumentBundlor(List<Include> includes) { - checkArgument(!includes.isEmpty(), "Include list cannot be empty"); + Validate.isTrue(!includes.isEmpty(), "Include list cannot be empty"); this.includes = ImmutableList.copyOf(includes); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/IncludeAllMatcher.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/IncludeAllMatcher.java index 65c712e8fa..3689b2f010 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/IncludeAllMatcher.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/IncludeAllMatcher.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.jackrabbit.oak.plugins.document.bundlor; -import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument; import static org.apache.jackrabbit.oak.commons.PathUtils.concat; +import org.apache.commons.lang3.Validate; + /** * Matcher which matches all child nodes */ @@ -30,7 +30,7 @@ class IncludeAllMatcher implements Matcher { private final int depth; IncludeAllMatcher(String matchingPath, int depth) { - checkArgument(depth > 0); + Validate.isTrue(depth > 0); this.matchingPath = matchingPath; this.depth = depth; } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoUtils.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoUtils.java index 58f8348ba5..007e35c34c 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoUtils.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoUtils.java @@ -16,10 +16,9 @@ */ package org.apache.jackrabbit.oak.plugins.document.mongo; -import java.util.Arrays; import java.util.Set; -import java.util.stream.Collectors; +import org.apache.commons.lang3.Validate; import org.apache.jackrabbit.guava.common.collect.Sets; import com.mongodb.BasicDBObject; import com.mongodb.MongoCommandException; @@ -34,7 +33,6 @@ import com.mongodb.client.FindIterable; import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; import com.mongodb.client.model.IndexOptions; -import com.mongodb.connection.ServerVersion; import com.mongodb.internal.connection.MongoWriteConcernWithResponseException; import org.apache.jackrabbit.oak.plugins.document.DocumentStoreException.Type; @@ -44,8 +42,6 @@ import org.bson.conversions.Bson; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument; - /** * Provides static utility methods for MongoDB. */ @@ -92,7 +88,7 @@ class MongoUtils { boolean unique, boolean sparse) throws MongoException { - checkArgument(fields.length == ascending.length); + Validate.isTrue(fields.length == ascending.length); BasicDBObject index = new BasicDBObject(); for (int i = 0; i < fields.length; i++) { index.put(fields[i], ascending[i] ? 1 : -1); @@ -116,7 +112,7 @@ class MongoUtils { String[] fields, boolean[] ascending, String filter) throws MongoException { - checkArgument(fields.length == ascending.length); + Validate.isTrue(fields.length == ascending.length); BasicDBObject index = new BasicDBObject(); for (int i = 0; i < fields.length; i++) { index.put(fields[i], ascending[i] ? 1 : -1); diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/PathFilteringDiff.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/PathFilteringDiff.java index 9c76bfa3ec..a24ef9b407 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/PathFilteringDiff.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/PathFilteringDiff.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.jackrabbit.oak.plugins.document.secondary; import java.util.List; +import org.apache.commons.lang3.Validate; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.plugins.document.AbstractDocumentNodeState; import org.apache.jackrabbit.oak.plugins.document.RevisionVector; @@ -31,7 +31,6 @@ import org.apache.jackrabbit.oak.spi.state.NodeState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument; import static org.apache.jackrabbit.oak.plugins.document.secondary.DelegatingDocumentNodeState.PROP_LAST_REV; import static org.apache.jackrabbit.oak.plugins.document.secondary.DelegatingDocumentNodeState.PROP_REVISION; import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE; @@ -95,7 +94,7 @@ class PathFilteringDiff extends ApplyDiff { } private AbstractDocumentNodeState asDocumentState(NodeState state, String name){ - checkArgument(state instanceof AbstractDocumentNodeState, "Node %s (%s) at [%s/%s] is not" + + Validate.isTrue(state instanceof AbstractDocumentNodeState, "Node %s (%s) at [%s/%s] is not" + " of expected type i.e. AbstractDocumentNodeState. Parent %s (%s)", state, state.getClass(), parent.getPath(), name, parent, parent.getClass()); return (AbstractDocumentNodeState) state; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimeInterval.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimeInterval.java index ec6af23ded..3a2663f3b8 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimeInterval.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimeInterval.java @@ -18,7 +18,7 @@ */ package org.apache.jackrabbit.oak.plugins.document.util; -import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument; +import org.apache.commons.lang3.Validate; /** * A class representing a time interval, with utility methods to derive related @@ -30,7 +30,7 @@ public class TimeInterval { public final long toMs; public TimeInterval(long fromMs, long toMs) { - checkArgument(fromMs <= toMs, "start must be <= end"); + Validate.isTrue(fromMs <= toMs, "start must be <= end"); this.fromMs = fromMs; this.toMs = toMs; }
