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
The following commit(s) were added to refs/heads/OAK-11078 by this push:
new c0cd736af4 OAK-11078: Remove usage of Guava checkArgument (oak-core)
c0cd736af4 is described below
commit c0cd736af4627739f0186c55bec24632adc26171
Author: Julian Reschke <[email protected]>
AuthorDate: Wed Sep 4 10:15:47 2024 +0100
OAK-11078: Remove usage of Guava checkArgument (oak-core)
---
oak-core/pom.xml | 4 ++++
.../java/org/apache/jackrabbit/oak/core/ImmutableRoot.java | 6 +++---
.../main/java/org/apache/jackrabbit/oak/core/MutableTree.java | 5 +++--
.../apache/jackrabbit/oak/namepath/impl/GlobalNameMapper.java | 8 ++++----
.../apache/jackrabbit/oak/namepath/impl/LocalNameMapper.java | 6 +++---
.../jackrabbit/oak/plugins/identifier/IdentifierManager.java | 4 ++--
.../apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java | 6 +++---
.../jackrabbit/oak/plugins/index/AsyncIndexerService.java | 5 ++---
.../org/apache/jackrabbit/oak/plugins/index/IndexUtils.java | 5 ++---
.../apache/jackrabbit/oak/plugins/index/cursor/Cursors.java | 4 ++--
.../plugins/index/datastore/DataStoreTextProviderService.java | 5 ++---
.../oak/plugins/index/datastore/DataStoreTextWriter.java | 5 ++---
.../oak/plugins/index/importer/IndexDefinitionUpdater.java | 5 ++---
.../jackrabbit/oak/plugins/index/importer/IndexImporter.java | 7 +++----
.../jackrabbit/oak/plugins/index/importer/IndexerInfo.java | 7 +++----
.../oak/plugins/index/property/PropertyIndexInfoProvider.java | 6 ++----
.../jackrabbit/oak/plugins/tree/factories/TreeFactory.java | 5 ++---
.../jackrabbit/oak/plugins/tree/impl/AbstractMutableTree.java | 11 +++++------
.../jackrabbit/oak/plugins/tree/impl/TreeProviderService.java | 5 ++---
.../oak/plugins/version/ReadWriteVersionManager.java | 4 ++--
.../java/org/apache/jackrabbit/oak/query/ast/AndImpl.java | 5 ++---
.../main/java/org/apache/jackrabbit/oak/query/ast/OrImpl.java | 5 ++---
.../apache/jackrabbit/oak/security/user/UserManagerImpl.java | 5 ++---
.../oak/plugins/nodetype/write/NodeTypeRegistryTest.java | 6 +++---
24 files changed, 62 insertions(+), 72 deletions(-)
diff --git a/oak-core/pom.xml b/oak-core/pom.xml
index 5857946782..736f7a26e2 100644
--- a/oak-core/pom.xml
+++ b/oak-core/pom.xml
@@ -295,6 +295,10 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableRoot.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableRoot.java
index 5a6a718eb6..4c9ee28e1e 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableRoot.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableRoot.java
@@ -18,12 +18,12 @@
*/
package org.apache.jackrabbit.oak.core;
-import static
org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
import static org.apache.jackrabbit.oak.commons.PathUtils.elements;
import java.io.InputStream;
import java.util.Map;
+import org.apache.commons.lang3.Validate;
import org.apache.jackrabbit.oak.api.AuthInfo;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.ContentSession;
@@ -71,7 +71,7 @@ public final class ImmutableRoot implements Root, ReadOnly {
}
public ImmutableRoot(@NotNull ImmutableTree rootTree) {
- checkArgument(rootTree.isRoot());
+ Validate.isTrue(rootTree.isRoot());
this.rootTree = rootTree;
this.authInfo = AuthInfo.EMPTY;
this.wspName = null;
@@ -90,7 +90,7 @@ public final class ImmutableRoot implements Root, ReadOnly {
@NotNull
@Override
public ImmutableTree getTree(@NotNull String path) {
- checkArgument(PathUtils.isAbsolute(path));
+ Validate.isTrue(PathUtils.isAbsolute(path));
ImmutableTree child = rootTree;
for (String name : elements(path)) {
child = child.getChild(name);
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableTree.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableTree.java
index 7c2b722326..7945216a3c 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableTree.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableTree.java
@@ -19,10 +19,11 @@
package org.apache.jackrabbit.oak.core;
import static java.util.Objects.requireNonNull;
-import static
org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
+
import static org.apache.jackrabbit.oak.commons.PathUtils.elements;
import static org.apache.jackrabbit.oak.commons.PathUtils.isAbsolute;
+import org.apache.commons.lang3.Validate;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
@@ -284,7 +285,7 @@ final class MutableTree extends AbstractMutableTree {
*/
@NotNull
MutableTree getTree(@NotNull String path) {
- checkArgument(isAbsolute(requireNonNull(path)));
+ Validate.isTrue(isAbsolute(requireNonNull(path)));
beforeRead();
MutableTree child = this;
for (String name : elements(path)) {
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/GlobalNameMapper.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/GlobalNameMapper.java
index 8920e570c8..ab1788c644 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/GlobalNameMapper.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/GlobalNameMapper.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.namepath.impl;
-import static
org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
import static java.util.Collections.emptyList;
import static java.util.Collections.emptyMap;
import static java.util.Objects.requireNonNull;
@@ -37,6 +36,7 @@ import java.util.Map.Entry;
import javax.jcr.RepositoryException;
+import org.apache.commons.lang3.Validate;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.namepath.NameMapper;
@@ -117,8 +117,8 @@ public class GlobalNameMapper implements NameMapper {
public String getJcrName(@NotNull String oakName) {
// Sanity checks, can be turned to assertions if needed for performance
requireNonNull(oakName);
- checkArgument(!isHiddenName(oakName), oakName);
- checkArgument(!isExpandedName(oakName), oakName);
+ Validate.isTrue(!isHiddenName(oakName), oakName);
+ Validate.isTrue(!isExpandedName(oakName), oakName);
return oakName;
}
@@ -149,7 +149,7 @@ public class GlobalNameMapper implements NameMapper {
@Nullable
protected String getOakNameFromExpanded(String expandedName) {
- checkArgument(expandedName.startsWith("{"));
+ Validate.isTrue(expandedName.startsWith("{"));
int brace = expandedName.indexOf('}', 1);
if (brace > 0) {
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/LocalNameMapper.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/LocalNameMapper.java
index 101f2acec1..91582c95b3 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/LocalNameMapper.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/impl/LocalNameMapper.java
@@ -17,10 +17,10 @@
package org.apache.jackrabbit.oak.namepath.impl;
import static java.util.Objects.requireNonNull;
-import static
org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
import java.util.Map;
+import org.apache.commons.lang3.Validate;
import org.apache.jackrabbit.oak.api.Root;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -55,8 +55,8 @@ public class LocalNameMapper extends GlobalNameMapper {
@Override @NotNull
public synchronized String getJcrName(@NotNull String oakName) {
requireNonNull(oakName);
- checkArgument(!oakName.startsWith(":"), oakName); // hidden name
- checkArgument(!isExpandedName(oakName), oakName); // expanded name
+ Validate.isTrue(!oakName.startsWith(":"), oakName); // hidden name
+ Validate.isTrue(!isExpandedName(oakName), oakName); // expanded name
if (!local.isEmpty()) {
int colon = oakName.indexOf(':');
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
index 50abff87a0..ee2c66d29f 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
@@ -27,6 +27,7 @@ import javax.jcr.query.Query;
import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.guava.common.collect.Iterators;
+import org.apache.commons.lang3.Validate;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.PropertyValue;
@@ -50,7 +51,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 org.apache.jackrabbit.guava.common.collect.Iterators.filter;
import static
org.apache.jackrabbit.guava.common.collect.Iterators.singletonIterator;
import static org.apache.jackrabbit.guava.common.collect.Iterators.transform;
@@ -130,7 +130,7 @@ public class IdentifierManager {
? identifier
: identifier.substring(0, k);
- checkArgument(UUIDUtils.isValidUUID(uuid), "Not a valid identifier
'" + identifier + '\'');
+ Validate.isTrue(UUIDUtils.isValidUUID(uuid), "Not a valid
identifier '%s'", identifier);
Tree tree = resolveUUIDToTree(createPropertyValue(uuid));
if (tree == null) {
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
index e840a98957..742cda6a7c 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
@@ -18,7 +18,6 @@
*/
package org.apache.jackrabbit.oak.plugins.index;
-import static
org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
import static java.util.Objects.requireNonNull;
import static
org.apache.jackrabbit.guava.common.base.Throwables.getStackTraceAsString;
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
@@ -51,6 +50,7 @@ import javax.management.openmbean.TabularData;
import com.codahale.metrics.MetricRegistry;
import org.apache.jackrabbit.guava.common.collect.Lists;
+import org.apache.commons.lang3.Validate;
import org.apache.jackrabbit.api.stats.TimeSeries;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -244,8 +244,8 @@ public class AsyncIndexUpdate implements Runnable,
Closeable {
if (IndexConstants.ASYNC_REINDEX_VALUE.equals(asyncName)){
return asyncName;
}
- checkArgument(asyncName.endsWith("async"), "async name [%s] does not
confirm to " +
- "naming pattern of ending with 'async'", asyncName);
+ Validate.isTrue(asyncName.endsWith("async"), "async name [%s] does not
confirm to naming pattern of ending with 'async'",
+ asyncName);
return asyncName;
}
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerService.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerService.java
index 22fdcbe40d..953aed44b7 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerService.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerService.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.plugins.index;
import java.io.Closeable;
@@ -26,6 +25,7 @@ import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeUnit;
+import org.apache.commons.lang3.Validate;
import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.guava.common.io.Closer;
import org.apache.jackrabbit.oak.api.jmx.IndexStatsMBean;
@@ -54,7 +54,6 @@ import
org.osgi.service.metatype.annotations.ObjectClassDefinition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static
org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
import static
org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils.registerMBean;
@Component(
@@ -215,7 +214,7 @@ public class AsyncIndexerService {
List<AsyncConfig> result = Lists.newArrayList();
for (String config : configs) {
int idOfEq = config.indexOf(CONFIG_SEP);
- checkArgument(idOfEq > 0, "Invalid config provided [%s]",
Arrays.toString(configs));
+ Validate.isTrue(idOfEq > 0, "Invalid config provided [%s]",
Arrays.toString(configs));
String[] configElements = config.split(String.valueOf(CONFIG_SEP));
String name = configElements[0].trim();
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUtils.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUtils.java
index 076ef54029..da70b52a09 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUtils.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUtils.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.index;
-import static
org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
import static org.apache.jackrabbit.JcrConstants.NT_UNSTRUCTURED;
import static org.apache.jackrabbit.oak.api.Type.NAME;
@@ -42,6 +41,7 @@ import java.util.stream.StreamSupport;
import javax.jcr.RepositoryException;
+import org.apache.commons.lang3.Validate;
import org.apache.jackrabbit.guava.common.collect.ImmutableList;
import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.guava.common.collect.Sets;
@@ -248,8 +248,7 @@ public final class IndexUtils {
Set<String> asyncNames =
Sets.newHashSet(async.getValue(Type.STRINGS));
asyncNames.remove(IndexConstants.INDEXING_MODE_NRT);
asyncNames.remove(IndexConstants.INDEXING_MODE_SYNC);
- checkArgument(!asyncNames.isEmpty(), "No valid async name found
for " +
- "index [%s], definition %s", indexPath, idxState);
+ Validate.isTrue(!asyncNames.isEmpty(), "No valid async name found
for index [%s], definition %s", indexPath, idxState);
return Iterables.getOnlyElement(asyncNames);
}
return null;
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/cursor/Cursors.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/cursor/Cursors.java
index 3502f3c2ab..afcf034dce 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/cursor/Cursors.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/cursor/Cursors.java
@@ -18,6 +18,7 @@ package org.apache.jackrabbit.oak.plugins.index.cursor;
import java.util.List;
+import org.apache.commons.lang3.Validate;
import org.apache.jackrabbit.oak.query.FilterIterators;
import org.apache.jackrabbit.oak.spi.query.Cursor;
import org.apache.jackrabbit.oak.spi.query.Filter;
@@ -26,7 +27,6 @@ import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.PrefetchNodeStore;
import static java.util.Objects.requireNonNull;
-import static
org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
/**
* This utility class provides factory methods to create commonly used types of
@@ -105,7 +105,7 @@ public class Cursors {
*/
public static Cursor newAncestorCursor(Cursor c, int level, QueryLimits
settings) {
requireNonNull(c);
- checkArgument(level >= 1);
+ Validate.isTrue(level >= 1);
return new AncestorCursor(c, level, settings);
}
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextProviderService.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextProviderService.java
index bd3a2ce812..c963d284c3 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextProviderService.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextProviderService.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.plugins.index.datastore;
import java.io.File;
import java.io.IOException;
+import org.apache.commons.lang3.Validate;
import
org.apache.jackrabbit.oak.plugins.index.fulltext.PreExtractedTextProvider;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
@@ -33,7 +33,6 @@ import
org.osgi.service.metatype.annotations.AttributeDefinition;
import org.osgi.service.metatype.annotations.Designate;
import org.osgi.service.metatype.annotations.ObjectClassDefinition;
-import static
org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
import static java.util.Objects.requireNonNull;
@Component(
@@ -65,7 +64,7 @@ public class DataStoreTextProviderService {
String dirPath = config.dir();
requireNonNull(dirPath, "Directory path not configured via 'dir'");
File dir = new File(dirPath);
- checkArgument(dir.exists(), "Directory %s does not exist",
dir.getAbsolutePath());
+ Validate.isTrue(dir.exists(), "Directory %s does not exist",
dir.getAbsolutePath());
textWriter = new DataStoreTextWriter(dir, true);
reg =
context.registerService(PreExtractedTextProvider.class.getName(), textWriter,
null);
}
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextWriter.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextWriter.java
index 2b24df1c8e..969a22cb37 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextWriter.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/datastore/DataStoreTextWriter.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.plugins.index.datastore;
import java.io.BufferedWriter;
@@ -31,6 +30,7 @@ import java.util.concurrent.Callable;
import org.apache.jackrabbit.guava.common.collect.Sets;
import org.apache.jackrabbit.guava.common.io.Files;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.Validate;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore;
import org.apache.jackrabbit.oak.plugins.blob.datastore.InMemoryDataRecord;
@@ -42,7 +42,6 @@ import org.jetbrains.annotations.NotNull;
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.base.Preconditions.checkState;
@@ -71,7 +70,7 @@ public class DataStoreTextWriter implements TextWriter,
Closeable, PreExtractedT
public DataStoreTextWriter(File directory, boolean readOnlyMode) throws
IOException {
if (!directory.exists()) {
- checkArgument(directory.mkdirs(), "Cannot create directory %s",
directory.getAbsolutePath());
+ Validate.isTrue(directory.mkdirs(), "Cannot create directory %s",
directory.getAbsolutePath());
}
this.directory = directory;
this.readOnlyMode = readOnlyMode;
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexDefinitionUpdater.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexDefinitionUpdater.java
index ccaa3636fc..5e444db935 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexDefinitionUpdater.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexDefinitionUpdater.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.plugins.index.importer;
import java.io.File;
@@ -27,6 +26,7 @@ import java.util.Set;
import org.apache.jackrabbit.guava.common.collect.Maps;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.Validate;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.commons.PathUtils;
@@ -43,7 +43,6 @@ import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-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.index.importer.NodeStoreUtils.childBuilder;
import static
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
@@ -57,7 +56,7 @@ public class IndexDefinitionUpdater {
private final Map<String, NodeState> indexNodeStates;
public IndexDefinitionUpdater(File file) throws IOException {
- checkArgument(file.exists() && file.canRead(), "File [%s] cannot be
read", file);
+ Validate.isTrue(file.exists() && file.canRead(), "File [%s] cannot be
read", file);
this.indexNodeStates =
getIndexDefnStates(FileUtils.readFileToString(file, StandardCharsets.UTF_8));
}
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporter.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporter.java
index 127a597c8d..f7d26ebcd2 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporter.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexImporter.java
@@ -19,6 +19,7 @@
package org.apache.jackrabbit.oak.plugins.index.importer;
+import org.apache.commons.lang3.Validate;
import org.apache.jackrabbit.guava.common.base.Stopwatch;
import org.apache.jackrabbit.guava.common.collect.ArrayListMultimap;
import org.apache.jackrabbit.guava.common.collect.ListMultimap;
@@ -55,7 +56,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import static
org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
import static java.util.Objects.requireNonNull;
import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.REINDEX_COUNT;
import static
org.apache.jackrabbit.oak.plugins.index.IndexUtils.INDEXING_PHASE_LOGGER;
@@ -106,8 +106,7 @@ public class IndexImporter {
AsyncIndexerLock indexerLock, StatisticsProvider
statisticsProvider, IndexingReporter indexingReporter) throws IOException {
this.statisticsProvider = statisticsProvider;
this.indexingReporter = indexingReporter;
- checkArgument(indexDir.exists() && indexDir.isDirectory(), "Path [%s]
does not point " +
- "to existing directory", indexDir.getAbsolutePath());
+ Validate.isTrue(indexDir.exists() && indexDir.isDirectory(), "Path
[%s] does not point to existing directory", indexDir.getAbsolutePath());
this.nodeStore = nodeStore;
this.indexDir = indexDir;
this.indexEditorProvider = indexEditorProvider;
@@ -386,7 +385,7 @@ public class IndexImporter {
NodeState indexState =
indexDefinitionUpdater.getIndexState(indexPath);
- checkArgument(indexState.exists(), "No index node found at path
[%s]", indexPath);
+ Validate.isTrue(indexState.exists(), "No index node found at path
[%s]", indexPath);
boolean newIndex = !NodeStateUtils.getNode(rootState,
indexPath).exists();
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexerInfo.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexerInfo.java
index c4ffad2460..6e34c65ca9 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexerInfo.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/importer/IndexerInfo.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.plugins.index.importer;
import java.io.File;
@@ -27,8 +26,8 @@ import java.util.Properties;
import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.commons.io.filefilter.DirectoryFileFilter;
+import org.apache.commons.lang3.Validate;
-import static
org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
import static java.util.Objects.requireNonNull;
/**
@@ -93,8 +92,8 @@ public class IndexerInfo {
public static IndexerInfo fromDirectory(File rootDir) throws IOException {
File infoFile = new File(rootDir, INDEXER_META);
- checkArgument(infoFile.exists(), "No [%s] file found in [%s]. Not a
valid exported index " +
- "directory", INDEXER_META, rootDir.getAbsolutePath());
+ Validate.isTrue(infoFile.exists(), "No [%s] file found in [%s]. Not a
valid exported index directory", INDEXER_META,
+ rootDir.getAbsolutePath());
Properties p = PropUtils.loadFromFile(infoFile);
return new IndexerInfo(
rootDir,
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexInfoProvider.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexInfoProvider.java
index f1921a9502..7874fac8aa 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexInfoProvider.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexInfoProvider.java
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.plugins.index.property;
import java.io.IOException;
+import org.apache.commons.lang3.Validate;
import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
import org.apache.jackrabbit.oak.plugins.index.IndexInfo;
import org.apache.jackrabbit.oak.plugins.index.IndexInfoProvider;
@@ -32,8 +32,6 @@ import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
-import static
org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-
@Component
public class PropertyIndexInfoProvider implements IndexInfoProvider {
@@ -58,7 +56,7 @@ public class PropertyIndexInfoProvider implements
IndexInfoProvider {
public IndexInfo getInfo(String indexPath) throws IOException {
NodeState idxState = NodeStateUtils.getNode(nodeStore.getRoot(),
indexPath);
-
checkArgument(PropertyIndexEditorProvider.TYPE.equals(idxState.getString(IndexConstants.TYPE_PROPERTY_NAME)),
+
Validate.isTrue(PropertyIndexEditorProvider.TYPE.equals(idxState.getString(IndexConstants.TYPE_PROPERTY_NAME)),
"Index definition at [%s] is not of type 'property'",
indexPath);
PropertyIndexInfo info = new PropertyIndexInfo(indexPath);
computeCountEstimate(info, idxState);
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/factories/TreeFactory.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/factories/TreeFactory.java
index ba85440bd2..18b04b7439 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/factories/TreeFactory.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/factories/TreeFactory.java
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.tree.factories;
+import org.apache.commons.lang3.Validate;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.plugins.tree.impl.ImmutableTree;
import org.apache.jackrabbit.oak.plugins.tree.impl.NodeBuilderTree;
@@ -23,8 +24,6 @@ import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.jetbrains.annotations.NotNull;
-import static
org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-
/**
* Factory to obtain {@code Tree} objects from {@code NodeState}s
* and {@code NodeBuilder}s.
@@ -44,7 +43,7 @@ public final class TreeFactory {
}
public static Tree createReadOnlyTree(@NotNull Tree readOnlyParent,
@NotNull String childName, @NotNull NodeState childState) {
- checkArgument(readOnlyParent instanceof ImmutableTree);
+ Validate.isTrue(readOnlyParent instanceof ImmutableTree);
return new ImmutableTree((ImmutableTree) readOnlyParent, childName,
childState);
}
}
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractMutableTree.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractMutableTree.java
index 0b204c59ca..6ed2d7fdb9 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractMutableTree.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractMutableTree.java
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.plugins.tree.impl;
-import static
org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
import static java.util.Objects.requireNonNull;
import static
org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import static org.apache.jackrabbit.oak.api.Type.NAMES;
@@ -27,6 +25,7 @@ import static
org.apache.jackrabbit.oak.plugins.tree.TreeConstants.OAK_CHILD_ORD
import java.util.List;
+import org.apache.commons.lang3.Validate;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
@@ -69,7 +68,7 @@ public abstract class AbstractMutableTree extends
AbstractTree {
@NotNull
@Override
public Tree addChild(@NotNull String name) throws IllegalArgumentException
{
- checkArgument(!isHidden(name));
+ Validate.isTrue(!isHidden(name));
if (!hasChild(name)) {
NodeBuilder nodeBuilder = getNodeBuilder();
nodeBuilder.setChildNode(name);
@@ -170,20 +169,20 @@ public abstract class AbstractMutableTree extends
AbstractTree {
@Override
public void setProperty(@NotNull PropertyState property) {
- checkArgument(!isHidden(requireNonNull(property).getName()));
+ Validate.isTrue(!isHidden(requireNonNull(property).getName()));
getNodeBuilder().setProperty(property);
}
@Override
public <T> void setProperty(@NotNull String name, @NotNull T value) throws
IllegalArgumentException {
- checkArgument(!isHidden(requireNonNull(name)));
+ Validate.isTrue(!isHidden(requireNonNull(name)));
getNodeBuilder().setProperty(name, requireNonNull(value));
}
@Override
public <T> void setProperty(@NotNull String name, @NotNull T value,
@NotNull Type<T> type)
throws IllegalArgumentException {
- checkArgument(!isHidden(requireNonNull(name)));
+ Validate.isTrue(!isHidden(requireNonNull(name)));
getNodeBuilder().setProperty(name, requireNonNull(value),
requireNonNull(type));
}
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/TreeProviderService.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/TreeProviderService.java
index 19bcdd41f0..927f6c63e1 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/TreeProviderService.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/TreeProviderService.java
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.tree.impl;
+import org.apache.commons.lang3.Validate;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.plugins.tree.TreeProvider;
import org.apache.jackrabbit.oak.plugins.tree.factories.TreeFactory;
@@ -23,8 +24,6 @@ import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.jetbrains.annotations.NotNull;
import org.osgi.service.component.annotations.Component;
-import static
org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-
@Component(service = {TreeProvider.class})
public class TreeProviderService implements TreeProvider {
@@ -43,7 +42,7 @@ public class TreeProviderService implements TreeProvider {
@NotNull
@Override
public NodeState asNodeState(@NotNull Tree readOnlyTree) {
- checkArgument(readOnlyTree instanceof AbstractTree);
+ Validate.isTrue(readOnlyTree instanceof AbstractTree);
return ((AbstractTree) readOnlyTree).getNodeState();
}
}
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadWriteVersionManager.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadWriteVersionManager.java
index 4e6eedfb6c..8f027c9673 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadWriteVersionManager.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/ReadWriteVersionManager.java
@@ -27,6 +27,7 @@ import java.util.Map;
import java.util.Set;
import javax.jcr.RepositoryException;
+import org.apache.commons.lang3.Validate;
import org.apache.jackrabbit.guava.common.collect.ImmutableList;
import org.apache.jackrabbit.guava.common.collect.Sets;
import org.apache.jackrabbit.oak.api.CommitFailedException;
@@ -52,7 +53,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.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.JcrConstants.JCR_BASEVERSION;
@@ -380,7 +380,7 @@ public class ReadWriteVersionManager extends
ReadOnlyVersionManager {
*/
@NotNull
private NodeBuilder resolve(NodeBuilder node, String relPath) {
- checkArgument(!PathUtils.isAbsolute(relPath), "Not a relative path");
+ Validate.isTrue(!PathUtils.isAbsolute(relPath), "Not a relative path");
for (String name : PathUtils.elements(relPath)) {
node = node.getChildNode(name);
}
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AndImpl.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AndImpl.java
index 601faec2b5..39dc6ea358 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AndImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AndImpl.java
@@ -18,7 +18,6 @@
*/
package org.apache.jackrabbit.oak.query.ast;
-import static
org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
import static org.apache.jackrabbit.guava.common.collect.Sets.newLinkedHashSet;
@@ -36,7 +35,7 @@ import
org.apache.jackrabbit.oak.spi.query.fulltext.FullTextExpression;
import org.apache.jackrabbit.oak.query.QueryEngineSettings;
import org.apache.jackrabbit.oak.query.QueryImpl;
import org.apache.jackrabbit.oak.query.index.FilterImpl;
-
+import org.apache.commons.lang3.Validate;
import org.apache.jackrabbit.guava.common.collect.Sets;
/**
@@ -47,7 +46,7 @@ public class AndImpl extends ConstraintImpl {
private final List<ConstraintImpl> constraints;
public AndImpl(List<ConstraintImpl> constraints) {
- checkArgument(!constraints.isEmpty());
+ Validate.isTrue(!constraints.isEmpty());
this.constraints = constraints;
}
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/OrImpl.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/OrImpl.java
index 03b5787a32..18afccf9d7 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/OrImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/OrImpl.java
@@ -18,7 +18,6 @@
*/
package org.apache.jackrabbit.oak.query.ast;
-import static
org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
import static org.apache.jackrabbit.guava.common.collect.Maps.newLinkedHashMap;
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
@@ -37,7 +36,7 @@ import java.util.Set;
import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextExpression;
import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextOr;
import org.apache.jackrabbit.oak.query.index.FilterImpl;
-
+import org.apache.commons.lang3.Validate;
import org.apache.jackrabbit.guava.common.collect.Sets;
/**
@@ -48,7 +47,7 @@ public class OrImpl extends ConstraintImpl {
private final List<ConstraintImpl> constraints;
public OrImpl(List<ConstraintImpl> constraints) {
- checkArgument(!constraints.isEmpty());
+ Validate.isTrue(!constraints.isEmpty());
this.constraints = constraints;
}
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java
index f78e6b083d..855c79b04a 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java
@@ -18,6 +18,7 @@ package org.apache.jackrabbit.oak.security.user;
import org.apache.jackrabbit.guava.common.base.Strings;
import org.apache.jackrabbit.guava.common.collect.Iterables;
+import org.apache.commons.lang3.Validate;
import org.apache.jackrabbit.api.security.principal.PrincipalManager;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.AuthorizableExistsException;
@@ -64,8 +65,6 @@ import java.security.Principal;
import java.util.Iterator;
import java.util.Set;
-import static
org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-
/**
* UserManagerImpl...
*/
@@ -293,7 +292,7 @@ public class UserManagerImpl implements UserManager {
}
void onCreate(@NotNull User systemUser) throws RepositoryException {
- checkArgument(systemUser.isSystemUser());
+ Validate.isTrue(systemUser.isSystemUser());
for (AuthorizableAction action :
actionProvider.getAuthorizableActions(securityProvider)) {
action.onCreate(systemUser, root, namePathMapper);
}
diff --git
a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistryTest.java
b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistryTest.java
index cd3db2c3db..2d50eb1418 100644
---
a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistryTest.java
+++
b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeRegistryTest.java
@@ -18,7 +18,7 @@ package org.apache.jackrabbit.oak.plugins.nodetype.write;
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.Objects.requireNonNull;
-import static
org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
+
import static org.apache.jackrabbit.guava.common.collect.ImmutableList.of;
import static org.apache.jackrabbit.JcrConstants.JCR_MIXINTYPES;
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
@@ -54,7 +54,7 @@ import javax.jcr.nodetype.NodeTypeTemplate;
import javax.security.auth.login.LoginException;
import org.apache.jackrabbit.guava.common.base.Strings;
-
+import org.apache.commons.lang3.Validate;
import org.apache.jackrabbit.commons.cnd.CompactNodeTypeDefReader;
import org.apache.jackrabbit.commons.cnd.DefinitionBuilderFactory;
import org.apache.jackrabbit.commons.cnd.TemplateBuilderFactory;
@@ -92,7 +92,7 @@ public class NodeTypeRegistryTest {
private ContentSession session = null;
static void registerNodeType(@NotNull Root root, @NotNull String
resourceName) throws IOException {
- checkArgument(!Strings.isNullOrEmpty(resourceName));
+ Validate.isTrue(!Strings.isNullOrEmpty(resourceName));
requireNonNull(root);
InputStream stream = null;
