You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2024/08/20 04:36:23 UTC
(jackrabbit-oak) branch trunk updated: OAK-11033: Remove usage of Guava Objects class (#1650)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 4463769390 OAK-11033: Remove usage of Guava Objects class (#1650)
4463769390 is described below
commit 4463769390db14f662f6c3db010cc4edd5f6e713
Author: Julian Reschke <re...@apache.org>
AuthorDate: Tue Aug 20 06:36:18 2024 +0200
OAK-11033: Remove usage of Guava Objects class (#1650)
---
.../authorization/principalbased/impl/AbstractEntry.java | 4 ++--
.../principalbased/impl/ImmutablePrincipalPolicy.java | 8 ++++----
.../jackrabbit/oak/plugins/index/AsyncIndexUpdate.java | 4 ++--
.../apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java | 4 ++--
.../oak/plugins/observation/filter/FilterBuilder.java | 8 ++++----
.../jackrabbit/oak/plugins/tree/impl/ImmutableTree.java | 5 +++--
.../accesscontrol/AccessControlManagerImpl.java | 7 +++----
.../authorization/accesscontrol/ValidationEntry.java | 6 +++---
.../oak/security/authorization/permission/NumEntries.java | 5 +++--
.../security/authorization/permission/PermissionEntry.java | 7 ++++---
.../security/authorization/restriction/CurrentPattern.java | 5 +++--
.../oak/security/authorization/restriction/GlobPattern.java | 5 +++--
.../security/authorization/restriction/GlobPatternTest.java | 5 ++---
.../oak/jcr/observation/ConsolidatedListenerMBeanImpl.java | 11 +++++------
.../apache/jackrabbit/oak/jcr/observation/EventFactory.java | 9 +++++----
.../oak/spi/security/authorization/accesscontrol/ACE.java | 4 ++--
.../security/authorization/accesscontrol/ImmutableACL.java | 7 ++++---
.../authorization/restriction/RestrictionDefinitionImpl.java | 4 ++--
.../security/authorization/restriction/RestrictionImpl.java | 5 +++--
.../spi/security/privilege/ImmutablePrivilegeDefinition.java | 5 +++--
.../java/org/apache/jackrabbit/oak/segment/MapRecord.java | 4 ++--
.../java/org/apache/jackrabbit/oak/segment/Template.java | 10 +++++-----
.../apache/jackrabbit/oak/segment/file/tar/GCGeneration.java | 6 +++---
.../apache/jackrabbit/oak/plugins/document/UpdateUtils.java | 5 ++---
.../org/apache/jackrabbit/oak/plugins/document/ValueMap.java | 12 ++++++------
.../oak/plugins/document/cache/NodeDocumentCache.java | 8 ++++----
.../jackrabbit/oak/plugins/memory/AbstractPropertyState.java | 9 +++++----
.../jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java | 4 ++--
.../apache/jackrabbit/oak/plugins/value/jcr/BinaryImpl.java | 5 ++---
.../apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java | 4 ++--
.../org/apache/jackrabbit/oak/spi/commit/CommitInfo.java | 5 ++---
31 files changed, 97 insertions(+), 93 deletions(-)
diff --git a/oak-authorization-principalbased/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/AbstractEntry.java b/oak-authorization-principalbased/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/AbstractEntry.java
index 0fe016014f..bb4f357bf7 100644
--- a/oak-authorization-principalbased/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/AbstractEntry.java
+++ b/oak-authorization-principalbased/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/AbstractEntry.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization.principalbased.impl;
-import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.api.security.authorization.PrincipalAccessControlList;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.ACE;
@@ -27,6 +26,7 @@ import org.jetbrains.annotations.Nullable;
import javax.jcr.security.AccessControlException;
import java.security.Principal;
+import java.util.Objects;
import java.util.Set;
abstract class AbstractEntry extends ACE implements PrincipalAccessControlList.Entry {
@@ -57,7 +57,7 @@ abstract class AbstractEntry extends ACE implements PrincipalAccessControlList.E
@Override
public int hashCode() {
if (hashCode == 0) {
- hashCode = Objects.hashCode(oakPath, getPrincipal().getName(), getPrivilegeBits(), Boolean.TRUE, getRestrictions());
+ hashCode = Objects.hash(oakPath, getPrincipal().getName(), getPrivilegeBits(), Boolean.TRUE, getRestrictions());
}
return hashCode;
}
diff --git a/oak-authorization-principalbased/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/ImmutablePrincipalPolicy.java b/oak-authorization-principalbased/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/ImmutablePrincipalPolicy.java
index c4c4ef0c16..87709a1e66 100644
--- a/oak-authorization-principalbased/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/ImmutablePrincipalPolicy.java
+++ b/oak-authorization-principalbased/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/ImmutablePrincipalPolicy.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization.principalbased.impl;
-import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.api.security.authorization.PrincipalAccessControlList;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.ImmutableACL;
@@ -31,9 +30,10 @@ import javax.jcr.security.Privilege;
import java.security.Principal;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
class ImmutablePrincipalPolicy extends ImmutableACL implements PrincipalAccessControlList {
-
+
private final Principal principal;
private int hashCode;
@@ -68,7 +68,7 @@ class ImmutablePrincipalPolicy extends ImmutableACL implements PrincipalAccessCo
@Override
public int hashCode() {
if (hashCode == 0) {
- hashCode = Objects.hashCode(principal, getOakPath(), getEntries());
+ hashCode = Objects.hash(principal, getOakPath(), getEntries());
}
return hashCode;
}
@@ -80,7 +80,7 @@ class ImmutablePrincipalPolicy extends ImmutableACL implements PrincipalAccessCo
}
if (obj instanceof ImmutablePrincipalPolicy) {
ImmutablePrincipalPolicy other = (ImmutablePrincipalPolicy) obj;
- return Objects.equal(getOakPath(), other.getOakPath())
+ return Objects.equals(getOakPath(), other.getOakPath())
&& principal.equals(other.principal)
&& getEntries().equals(other.getEntries());
}
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 a54c6463c5..14116cf766 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
@@ -34,6 +34,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
@@ -97,7 +98,6 @@ import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.guava.common.base.Splitter;
import org.apache.jackrabbit.guava.common.base.Stopwatch;
import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
@@ -930,7 +930,7 @@ public class AsyncIndexUpdate implements Runnable, Closeable {
throws CommitFailedException {
// check for concurrent updates by this async task
NodeState async = before.getChildNode(ASYNC);
- if ((checkpoint == null || Objects.equal(checkpoint, async.getString(name)))
+ if ((checkpoint == null || Objects.equals(checkpoint, async.getString(name)))
&&
(lease == null || lease == async.getLong(leasify(name)))) {
return after;
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java
index 45d84cd461..9e00410b80 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java
@@ -38,13 +38,13 @@ import static org.apache.jackrabbit.oak.plugins.nodetype.constraint.Constraints.
import java.util.Collections;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
import java.util.function.Predicate;
import javax.jcr.PropertyType;
import javax.jcr.Value;
-import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.oak.api.CommitFailedException;
@@ -437,7 +437,7 @@ public class TypeEditor extends DefaultEditor {
private static boolean primaryChanged(NodeState before, String after) {
String pre = before.getName(JCR_PRIMARYTYPE);
- return !Objects.equal(pre, after);
+ return !Objects.equals(pre, after);
}
private static boolean mixinsChanged(NodeState before, Iterable<String> after) {
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/FilterBuilder.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/FilterBuilder.java
index d9efdaa968..64060a4c6a 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/FilterBuilder.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/FilterBuilder.java
@@ -33,11 +33,11 @@ import static org.apache.jackrabbit.oak.commons.PathUtils.isAncestor;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.function.Predicate;
import java.util.regex.Pattern;
-import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.guava.common.collect.ImmutableList;
import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -439,18 +439,18 @@ public final class FilterBuilder {
}
private boolean isLocal(String sessionId, CommitInfo info) {
- return info != null && Objects.equal(info.getSessionId(), sessionId);
+ return info != null && Objects.equals(info.getSessionId(), sessionId);
}
private boolean isExternal(CommitInfo info) {
return info.isExternal();
}
-
+
@Override
public EventAggregator getEventAggregator() {
return aggregator;
}
-
+
@Override
public boolean excludes(ChangeSet changeSet) {
return changeSetFilter.excludes(changeSet);
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/ImmutableTree.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/ImmutableTree.java
index b851381ab5..8cd6270959 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/ImmutableTree.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/ImmutableTree.java
@@ -16,7 +16,8 @@
*/
package org.apache.jackrabbit.oak.plugins.tree.impl;
-import org.apache.jackrabbit.guava.common.base.Objects;
+import java.util.Objects;
+
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
@@ -224,7 +225,7 @@ public final class ImmutableTree extends AbstractTree implements TreeTypeAware,
@Override
public int hashCode() {
- return Objects.hashCode(getName(), nodeBuilder.getNodeState());
+ return Objects.hash(getName(), nodeBuilder.getNodeState());
}
@Override
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java
index efd6ad55d5..aa9f60f167 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java
@@ -26,6 +26,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.function.Predicate;
import javax.jcr.AccessDeniedException;
@@ -39,11 +40,9 @@ import javax.jcr.security.AccessControlPolicy;
import javax.jcr.security.AccessControlPolicyIterator;
import javax.jcr.security.Privilege;
-import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.guava.common.base.Strings;
import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.guava.common.collect.Iterables;
-import org.apache.jackrabbit.guava.common.collect.Iterators;
import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.guava.common.collect.Sets;
import org.apache.jackrabbit.JcrConstants;
@@ -705,7 +704,7 @@ public class AccessControlManagerImpl extends AbstractAccessControlManager imple
}
if (obj instanceof NodeACL) {
NodeACL other = (NodeACL) obj;
- return Objects.equal(getOakPath(), other.getOakPath())
+ return Objects.equals(getOakPath(), other.getOakPath())
&& getEntries().equals(other.getEntries());
}
return false;
@@ -781,7 +780,7 @@ public class AccessControlManagerImpl extends AbstractAccessControlManager imple
if (obj instanceof PrincipalACL) {
PrincipalACL other = (PrincipalACL) obj;
return principal.equals(other.principal)
- && Objects.equal(getOakPath(), other.getOakPath())
+ && Objects.equals(getOakPath(), other.getOakPath())
&& getEntries().equals(other.getEntries());
}
return false;
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ValidationEntry.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ValidationEntry.java
index 0c836e590f..65ede23e16 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ValidationEntry.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ValidationEntry.java
@@ -16,11 +16,11 @@
*/
package org.apache.jackrabbit.oak.security.authorization.accesscontrol;
-import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.oak.spi.security.authorization.restriction.Restriction;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBits;
import org.jetbrains.annotations.NotNull;
+import java.util.Objects;
import java.util.Set;
public class ValidationEntry {
@@ -50,7 +50,7 @@ public class ValidationEntry {
@Override
public int hashCode() {
- return Objects.hashCode(principalName, privilegeBits, restrictions, isAllow);
+ return Objects.hash(principalName, privilegeBits, restrictions, isAllow);
}
@Override
@@ -61,7 +61,7 @@ public class ValidationEntry {
if (o instanceof ValidationEntry) {
ValidationEntry other = (ValidationEntry) o;
return isAllow == other.isAllow
- && Objects.equal(principalName, other.principalName)
+ && Objects.equals(principalName, other.principalName)
&& privilegeBits.equals(other.privilegeBits)
&& restrictions.equals(other.restrictions);
}
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/NumEntries.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/NumEntries.java
index 38d6a8f73b..3300328b0c 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/NumEntries.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/NumEntries.java
@@ -16,7 +16,8 @@
*/
package org.apache.jackrabbit.oak.security.authorization.permission;
-import org.apache.jackrabbit.guava.common.base.Objects;
+import java.util.Objects;
+
import org.jetbrains.annotations.NotNull;
final class NumEntries {
@@ -33,7 +34,7 @@ final class NumEntries {
@Override
public int hashCode() {
- return Objects.hashCode(size, isExact);
+ return Objects.hash(size, isExact);
}
@Override
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntry.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntry.java
index 43ad80adaa..283f0b3e9e 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntry.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntry.java
@@ -16,7 +16,8 @@
*/
package org.apache.jackrabbit.oak.security.authorization.permission;
-import org.apache.jackrabbit.guava.common.base.Objects;
+import java.util.Objects;
+
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.commons.PathUtils;
@@ -86,7 +87,7 @@ final class PermissionEntry implements Comparable<PermissionEntry>, PermissionCo
@Override
public int compareTo(@NotNull PermissionEntry pe) {
- if (Objects.equal(path, pe.path)) {
+ if (Objects.equals(path, pe.path)) {
// reverse order
return Integer.compare(pe.index, index);
} else {
@@ -117,6 +118,6 @@ final class PermissionEntry implements Comparable<PermissionEntry>, PermissionCo
@Override
public int hashCode() {
- return Objects.hashCode(privilegeBits, index, path, isAllow, restriction);
+ return Objects.hash(privilegeBits, index, path, isAllow, restriction);
}
}
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/CurrentPattern.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/CurrentPattern.java
index 8750a4ba05..3997dbb6ee 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/CurrentPattern.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/CurrentPattern.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.security.authorization.restriction;
-import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -34,6 +33,8 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.jcr.NamespaceRegistry;
+
+import java.util.Objects;
import java.util.Set;
/**
@@ -183,7 +184,7 @@ class CurrentPattern implements RestrictionPattern {
//-------------------------------------------------------------< Object >---
@Override
public int hashCode() {
- return Objects.hashCode(treePath, propertyNames);
+ return Objects.hash(treePath, propertyNames);
}
@Override
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java
index 88ae6e719f..1ddcc0a781 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPattern.java
@@ -16,9 +16,10 @@
*/
package org.apache.jackrabbit.oak.security.authorization.restriction;
+import java.util.Objects;
+
import javax.jcr.security.AccessControlException;
-import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.commons.PathUtils;
@@ -151,7 +152,7 @@ final class GlobPattern implements RestrictionPattern {
//-------------------------------------------------------------< Object >---
@Override
public int hashCode() {
- return Objects.hashCode(path, restriction);
+ return Objects.hash(path, restriction);
}
@Override
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPatternTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPatternTest.java
index faa558114e..eb3f3ca660 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPatternTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobPatternTest.java
@@ -14,13 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.jackrabbit.oak.security.authorization.restriction;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
-import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.jetbrains.annotations.NotNull;
import org.junit.Test;
@@ -434,7 +433,7 @@ public class GlobPatternTest {
@Test
public void testHashCode() {
GlobPattern pattern = GlobPattern.create("/a/b/c/d", "/*");
- assertEquals(Objects.hashCode("/a/b/c/d", "/*"), pattern.hashCode());
+ assertEquals(Objects.hash("/a/b/c/d", "/*"), pattern.hashCode());
}
@Test
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ConsolidatedListenerMBeanImpl.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ConsolidatedListenerMBeanImpl.java
index c3ede017f9..47bf5a4206 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ConsolidatedListenerMBeanImpl.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ConsolidatedListenerMBeanImpl.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.jcr.observation;
import java.util.Arrays;
@@ -25,6 +24,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;
import javax.management.MalformedObjectNameException;
@@ -39,7 +39,6 @@ import javax.management.openmbean.TabularData;
import javax.management.openmbean.TabularDataSupport;
import javax.management.openmbean.TabularType;
-import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.guava.common.collect.Maps;
import org.apache.jackrabbit.guava.common.primitives.Longs;
@@ -157,7 +156,7 @@ public class ConsolidatedListenerMBeanImpl implements ConsolidatedListenerMBean
EventListenerMBean mbean = e.getValue();
FilterConfigMBean filterConfigMBean = null;
for (Map.Entry<ObjectName, FilterConfigMBean> ef : filterConfigs.entrySet()){
- if (Objects.equal(getListenerId(ef.getKey()), listenerId)){
+ if (Objects.equals(getListenerId(ef.getKey()), listenerId)){
filterConfigMBean = ef.getValue();
break;
}
@@ -210,17 +209,17 @@ public class ConsolidatedListenerMBeanImpl implements ConsolidatedListenerMBean
ListenerMBeans m = new ListenerMBeans();
m.eventListenerMBean = e.getValue();
for (Map.Entry<ObjectName, FilterConfigMBean> ef : filterConfigs.entrySet()){
- if (Objects.equal(getListenerId(ef.getKey()), listenerId)){
+ if (Objects.equals(getListenerId(ef.getKey()), listenerId)){
m.filterConfigMBean = ef.getValue();
}
}
for (Map.Entry<ObjectName, BackgroundObserverMBean> ef : bgObservers.entrySet()){
- if (Objects.equal(getListenerId(ef.getKey()), listenerId)){
+ if (Objects.equals(getListenerId(ef.getKey()), listenerId)){
m.observerMBean = ef.getValue();
}
}
for (Map.Entry<ObjectName, ChangeProcessorMBean> ef : changeProcessors.entrySet()){
- if (Objects.equal(getListenerId(ef.getKey()), listenerId)){
+ if (Objects.equals(getListenerId(ef.getKey()), listenerId)){
m.changeProcessorMBean = ef.getValue();
}
}
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/EventFactory.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/EventFactory.java
index 58ea592476..e75a1cda26 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/EventFactory.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/EventFactory.java
@@ -26,12 +26,13 @@ import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import javax.jcr.Value;
import javax.jcr.observation.Event;
import org.apache.jackrabbit.guava.common.base.MoreObjects;
-import org.apache.jackrabbit.guava.common.base.Objects;
+
import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.api.observation.JackrabbitEvent;
@@ -308,8 +309,8 @@ public class EventFactory {
&& getPath().equals(that.getPath())
&& getIdentifier().equals(that.getIdentifier())
&& getInfo().equals(that.getInfo())
- && Objects.equal(getUserID(), that.getUserID())
- && Objects.equal(getUserData(), that.getUserData())
+ && Objects.equals(getUserID(), that.getUserID())
+ && Objects.equals(getUserData(), that.getUserData())
&& getDate() == that.getDate()
&& isExternal() == that.isExternal();
} else {
@@ -319,7 +320,7 @@ public class EventFactory {
@Override
public int hashCode() {
- return Objects.hashCode(
+ return Objects.hash(
getType(), getPath(), getIdentifier(), getInfo(),
getUserID(), getUserData(), getDate(), isExternal());
}
diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACE.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACE.java
index a8ad76b28f..73369c888b 100644
--- a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACE.java
+++ b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACE.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol;
-import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.guava.common.collect.Collections2;
import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.api.security.JackrabbitAccessControlEntry;
@@ -38,6 +37,7 @@ import javax.jcr.security.Privilege;
import java.security.Principal;
import java.util.Collections;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
/**
@@ -174,7 +174,7 @@ public abstract class ACE implements JackrabbitAccessControlEntry {
@Override
public int hashCode() {
if (hashCode == 0) {
- hashCode = Objects.hashCode(principal.getName(), privilegeBits, isAllow, restrictions);
+ hashCode = Objects.hash(principal.getName(), privilegeBits, isAllow, restrictions);
}
return hashCode;
}
diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACL.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACL.java
index a312dfb197..3c264d2a19 100644
--- a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACL.java
+++ b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACL.java
@@ -19,12 +19,13 @@ package org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol;
import java.security.Principal;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
+
import javax.jcr.Value;
import javax.jcr.security.AccessControlEntry;
import javax.jcr.security.AccessControlException;
import javax.jcr.security.Privilege;
-import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.guava.common.collect.ImmutableList;
import org.apache.jackrabbit.api.security.JackrabbitAccessControlEntry;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
@@ -111,7 +112,7 @@ public class ImmutableACL extends AbstractAccessControlList {
@Override
public int hashCode() {
if (hashCode == 0) {
- hashCode = Objects.hashCode(getOakPath(), entries);
+ hashCode = Objects.hash(getOakPath(), entries);
}
return hashCode;
}
@@ -123,7 +124,7 @@ public class ImmutableACL extends AbstractAccessControlList {
}
if (obj instanceof ImmutableACL) {
ImmutableACL other = (ImmutableACL) obj;
- return Objects.equal(getOakPath(), other.getOakPath())
+ return Objects.equals(getOakPath(), other.getOakPath())
&& entries.equals(other.entries);
}
return false;
diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImpl.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImpl.java
index 35fe2d62bc..9ed49e0b27 100644
--- a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImpl.java
+++ b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImpl.java
@@ -16,9 +16,9 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization.restriction;
+import java.util.Objects;
import javax.jcr.PropertyType;
-import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.oak.api.Type;
import org.jetbrains.annotations.NotNull;
@@ -73,7 +73,7 @@ public class RestrictionDefinitionImpl implements RestrictionDefinition {
@Override
public int hashCode() {
- return Objects.hashCode(name, type, isMandatory);
+ return Objects.hash(name, type, isMandatory);
}
@Override
diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImpl.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImpl.java
index 5f38f6e0d4..b1f23c75b7 100644
--- a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImpl.java
+++ b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImpl.java
@@ -16,7 +16,8 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization.restriction;
-import org.apache.jackrabbit.guava.common.base.Objects;
+import java.util.Objects;
+
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.plugins.memory.PropertyValues;
import org.jetbrains.annotations.NotNull;
@@ -58,7 +59,7 @@ public class RestrictionImpl implements Restriction {
@Override
public int hashCode() {
if (hashCode == 0) {
- hashCode = Objects.hashCode(definition, property, PropertyValues.create(property));
+ hashCode = Objects.hash(definition, property, PropertyValues.create(property));
}
return hashCode;
}
diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/ImmutablePrivilegeDefinition.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/ImmutablePrivilegeDefinition.java
index c0d4ba6804..6cf1199e13 100644
--- a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/ImmutablePrivilegeDefinition.java
+++ b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/ImmutablePrivilegeDefinition.java
@@ -16,8 +16,9 @@
*/
package org.apache.jackrabbit.oak.spi.security.privilege;
+import java.util.Objects;
import java.util.Set;
-import org.apache.jackrabbit.guava.common.base.Objects;
+
import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.jetbrains.annotations.NotNull;
@@ -41,7 +42,7 @@ public final class ImmutablePrivilegeDefinition implements PrivilegeDefinition {
builder.addAll(declaredAggregateNames);
}
this.declaredAggregateNames = builder.build();
- hashcode = Objects.hashCode(this.name, this.isAbstract, this.declaredAggregateNames);
+ hashcode = Objects.hash(this.name, this.isAbstract, this.declaredAggregateNames);
}
//------------------------------------------------< PrivilegeDefinition >---
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapRecord.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapRecord.java
index ac6c406d5d..777927aab0 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapRecord.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapRecord.java
@@ -30,8 +30,8 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import java.util.Objects;
-import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.guava.common.collect.ComparisonChain;
import org.apache.jackrabbit.oak.spi.state.DefaultNodeStateDiff;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -568,7 +568,7 @@ public class MapRecord extends Record {
MapRecord[] beforeBuckets = before.getBuckets();
MapRecord[] afterBuckets = after.getBuckets();
for (int i = 0; i < BUCKETS_PER_LEVEL; i++) {
- if (Objects.equal(beforeBuckets[i], afterBuckets[i])) {
+ if (Objects.equals(beforeBuckets[i], afterBuckets[i])) {
// these buckets are equal (or both empty), so no changes
} else if (beforeBuckets[i] == null) {
// before bucket is empty, so all after entries were added
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Template.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Template.java
index fa5ed75e80..6c0c89c73e 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Template.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Template.java
@@ -29,8 +29,8 @@ import static org.apache.jackrabbit.oak.segment.CacheWeights.OBJECT_HEADER_SIZE;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import java.util.Objects;
-import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
@@ -296,10 +296,10 @@ public class Template {
return true;
} else if (object instanceof Template) {
Template that = (Template) object;
- return Objects.equal(primaryType, that.primaryType)
- && Objects.equal(mixinTypes, that.mixinTypes)
+ return Objects.equals(primaryType, that.primaryType)
+ && Objects.equals(mixinTypes, that.mixinTypes)
&& Arrays.equals(properties, that.properties)
- && Objects.equal(childName, that.childName);
+ && Objects.equals(childName, that.childName);
} else {
return false;
}
@@ -307,7 +307,7 @@ public class Template {
@Override
public int hashCode() {
- return Objects.hashCode(primaryType, mixinTypes,
+ return Objects.hash(primaryType, mixinTypes,
Arrays.asList(properties), getTemplateType(), childName);
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/GCGeneration.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/GCGeneration.java
index 9d8659718a..0624ff5c88 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/GCGeneration.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/GCGeneration.java
@@ -15,12 +15,12 @@
* limitations under the License.
*
*/
-
package org.apache.jackrabbit.oak.segment.file.tar;
import static java.util.Objects.requireNonNull;
-import org.apache.jackrabbit.guava.common.base.Objects;
+import java.util.Objects;
+
import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveEntry;
import org.jetbrains.annotations.NotNull;
@@ -157,7 +157,7 @@ public final class GCGeneration {
@Override
public int hashCode() {
- return Objects.hashCode(generation, fullGeneration, isCompacted);
+ return Objects.hash(generation, fullGeneration, isCompacted);
}
@Override
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtils.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtils.java
index 9295a6c2e5..104d1ed2ab 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtils.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtils.java
@@ -21,8 +21,7 @@ import static java.util.Objects.requireNonNull;
import java.util.Map;
import java.util.TreeMap;
import java.util.Map.Entry;
-
-import org.apache.jackrabbit.guava.common.base.Objects;
+import java.util.Objects;
import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Condition;
import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Key;
@@ -144,7 +143,7 @@ public class UpdateUtils {
value = null;
}
}
- boolean equal = Objects.equal(value, c.value);
+ boolean equal = Objects.equals(value, c.value);
if (c.type == Condition.Type.EQUALS && !equal) {
return false;
} else if (c.type == Condition.Type.NOTEQUALS && equal) {
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ValueMap.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ValueMap.java
index 4794ecb0e8..e27826f468 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ValueMap.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ValueMap.java
@@ -24,6 +24,7 @@ import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
@@ -31,7 +32,6 @@ import java.util.TreeMap;
import org.apache.jackrabbit.oak.plugins.document.util.MergeSortedIterators;
import org.jetbrains.annotations.NotNull;
-import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.guava.common.collect.Iterators;
/**
@@ -66,7 +66,7 @@ class ValueMap {
List<Iterator<NodeDocument>> iterators =
new ArrayList<Iterator<NodeDocument>>(2);
iterators.add(Iterators.singletonIterator(doc));
- iterators.add(doc.getPreviousDocs(property, null).iterator());
+ iterators.add(doc.getPreviousDocs(property, null).iterator());
docs = Iterators.mergeSorted(iterators, new Comparator<NodeDocument>() {
@Override
public int compare(NodeDocument o1,
@@ -75,10 +75,10 @@ class ValueMap {
Revision r2 = getFirstRevision(o2);
return c.compare(r1, r2);
}
-
+
private Revision getFirstRevision(NodeDocument d) {
Map<Revision, String> values;
- if (Objects.equal(d.getId(), doc.getId())) {
+ if (Objects.equals(d.getId(), doc.getId())) {
// return local map for main document
values = d.getLocalMap(property);
} else {
@@ -86,7 +86,7 @@ class ValueMap {
}
return values.keySet().iterator().next();
}
-
+
});
}
@@ -106,7 +106,7 @@ class ValueMap {
return null;
}
Map<Revision, String> values;
- if (Objects.equal(d.getId(), doc.getId())) {
+ if (Objects.equals(d.getId(), doc.getId())) {
// return local map for main document
values = d.getLocalMap(property);
} else {
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java
index 665062cdfd..e71c49dad5 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java
@@ -24,6 +24,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Objects;
import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -41,7 +42,6 @@ import org.apache.jackrabbit.oak.plugins.document.util.StringValue;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.guava.common.collect.Lists;
@@ -130,8 +130,8 @@ public class NodeDocumentCache implements Closeable {
if (doc == null) {
continue;
}
- if (!Objects.equal(stamp.modCount, doc.getModCount())
- || !Objects.equal(stamp.modified, doc.getModified())) {
+ if (!Objects.equals(stamp.modCount, doc.getModCount())
+ || !Objects.equals(stamp.modified, doc.getModified())) {
invalidate(id);
invalidatedCount++;
}
@@ -304,7 +304,7 @@ public class NodeDocumentCache implements Closeable {
try {
NodeDocument cached = getIfPresent(key);
if (cached != null) {
- if (Objects.equal(cached.getModCount(), oldDoc.getModCount())) {
+ if (Objects.equals(cached.getModCount(), oldDoc.getModCount())) {
putInternal(newDoc);
} else {
// the cache entry was modified by some other thread in
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractPropertyState.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractPropertyState.java
index c4d2f12919..6490ba120b 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractPropertyState.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/AbstractPropertyState.java
@@ -18,10 +18,11 @@
*/
package org.apache.jackrabbit.oak.plugins.memory;
+import java.util.Objects;
+
import javax.jcr.RepositoryException;
import javax.jcr.Value;
-import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -47,8 +48,8 @@ public abstract class AbstractPropertyState implements PropertyState {
* @return {@code true} if the properties are equal, {@code false} otherwise
*/
public static boolean equal(PropertyState a, PropertyState b) {
- if (Objects.equal(a.getName(), b.getName())
- && Objects.equal(a.getType(), b.getType())) {
+ if (Objects.equals(a.getName(), b.getName())
+ && Objects.equals(a.getType(), b.getType())) {
Type<?> type = a.getType();
if (a.isArray()) {
return a.count() == b.count()
@@ -56,7 +57,7 @@ public abstract class AbstractPropertyState implements PropertyState {
(Iterable<?>) a.getValue(type),
(Iterable<?>) b.getValue(type));
} else {
- return Objects.equal(a.getValue(type), b.getValue(type));
+ return Objects.equals(a.getValue(type), b.getValue(type));
}
} else {
return false;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java
index 91a9702865..18b0265d93 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java
@@ -34,8 +34,8 @@ import static org.apache.jackrabbit.oak.spi.state.AbstractNodeState.checkValidNa
import java.io.IOException;
import java.io.InputStream;
+import java.util.Objects;
-import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.guava.common.io.ByteStreams;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -441,7 +441,7 @@ public class MemoryNodeBuilder implements NodeBuilder {
private static String getSourcePathAnnotation(MemoryNodeBuilder builder) {
PropertyState base = builder.getBaseState().getProperty(MoveDetector.SOURCE_PATH);
PropertyState head = builder.getNodeState().getProperty(MoveDetector.SOURCE_PATH);
- if (Objects.equal(base, head)) {
+ if (Objects.equals(base, head)) {
// Both null: no source path annotation
// Both non-null but equals: source path annotation is from a previous commit
return null;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/BinaryImpl.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/BinaryImpl.java
index ac36f7f6a6..ef7125394e 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/BinaryImpl.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/BinaryImpl.java
@@ -21,11 +21,11 @@ import static org.apache.jackrabbit.guava.common.base.MoreObjects.toStringHelper
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
+import java.util.Objects;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
-import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.api.ReferenceBinary;
import org.apache.jackrabbit.api.binary.BinaryDownload;
import org.apache.jackrabbit.api.binary.BinaryDownloadOptions;
@@ -35,7 +35,6 @@ import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
* TODO document
*/
@@ -126,7 +125,7 @@ class BinaryImpl implements ReferenceBinary, BinaryDownload {
@Override
public boolean equals(Object other) {
if (other instanceof ReferenceBinary) {
- return Objects.equal(getReference(), ((ReferenceBinary) other).getReference());
+ return Objects.equals(getReference(), ((ReferenceBinary) other).getReference());
} else {
return false;
}
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java
index e5ec6516bc..c6e27f894c 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/value/jcr/ValueImpl.java
@@ -24,6 +24,7 @@ import java.io.InputStream;
import java.math.BigDecimal;
import java.net.URI;
import java.util.Calendar;
+import java.util.Objects;
import javax.jcr.Binary;
import javax.jcr.PropertyType;
@@ -31,7 +32,6 @@ import javax.jcr.RepositoryException;
import javax.jcr.Value;
import javax.jcr.ValueFormatException;
-import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.api.JackrabbitValue;
import org.apache.jackrabbit.api.binary.BinaryDownloadOptions;
import org.apache.jackrabbit.oak.api.Blob;
@@ -352,7 +352,7 @@ class ValueImpl implements JackrabbitValue, OakValue {
}
try {
return thisType == thatType
- && Objects.equal(
+ && Objects.equals(
getValue(thatType, index),
that.getValue(thatType, that.index));
} catch (RepositoryException e) {
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitInfo.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitInfo.java
index 4e7621c7fa..3d22713c54 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitInfo.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitInfo.java
@@ -23,8 +23,7 @@ import static java.util.Objects.requireNonNull;
import java.util.Collections;
import java.util.Map;
-
-import org.apache.jackrabbit.guava.common.base.Objects;
+import java.util.Objects;
import org.apache.jackrabbit.oak.api.Root;
import org.jetbrains.annotations.NotNull;
@@ -176,7 +175,7 @@ public final class CommitInfo {
@Override
public int hashCode() {
- return Objects.hashCode(sessionId, userId, date, info, external);
+ return Objects.hash(sessionId, userId, date, info, external);
}
@Override