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 th...@apache.org on 2026/10/19 08:40:37 UTC
(jackrabbit-oak) branch OAK-12465 created (now ad11e62014)
This is an automated email from the ASF dual-hosted git repository.
thomasmueller pushed a change to branch OAK-12465
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
at ad11e62014 OAK-12465 New Guava dependencies in oak/query
This branch includes the following new commits:
new ad11e62014 OAK-12465 New Guava dependencies in oak/query
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(jackrabbit-oak) 01/01: OAK-12465 New Guava dependencies in oak/query
Posted by th...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
thomasmueller pushed a commit to branch OAK-12465
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit ad11e620143898d5a509e784f6bc7d69054374df
Author: Thomas Mueller <mu...@adobe.com>
AuthorDate: Mon Oct 19 10:39:51 2026 +0200
OAK-12465 New Guava dependencies in oak/query
---
AGENTS.md | 3 +++
.../src/main/java/org/apache/jackrabbit/oak/query/ast/IfImpl.java | 4 ++--
.../org/apache/jackrabbit/oak/query/ast/LiteralOperandImpl.java | 6 +++---
.../src/main/java/org/apache/jackrabbit/oak/query/ast/OpImpl.java | 4 ++--
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/AGENTS.md b/AGENTS.md
index 513b8a0d08..7f7569f985 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -188,6 +188,9 @@ Toggles are disabled by default and can be enabled without redeployment.
### Style
- No wildcard imports (import each class individually)
+- Avoid new Guava imports, including static imports from `org.apache.jackrabbit.guava`.
+ The long-term goal is to remove all Guava dependencies; prefer JDK APIs or existing
+ Oak utilities instead.
- Follow existing code style in the module you are modifying
- OSGi bundle compliance is required - modules produce OSGi bundles
- Never use regular expression parsing and find / replace for JSON or XML data
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/IfImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/IfImpl.java
index 5b7da5d88d..31ced6ba79 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/IfImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/IfImpl.java
@@ -19,11 +19,11 @@
package org.apache.jackrabbit.oak.query.ast;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
import javax.jcr.PropertyType;
-import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.oak.api.PropertyValue;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.commons.collections.SetUtils;
@@ -149,7 +149,7 @@ public class IfImpl extends DynamicOperandImpl {
@Override
public int hashCode() {
- return Objects.hashCode(condition, trueValue, falseValue);
+ return Objects.hash(condition, trueValue, falseValue);
}
@Override
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/LiteralOperandImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/LiteralOperandImpl.java
index 0ea9e15074..111466c9cf 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/LiteralOperandImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/LiteralOperandImpl.java
@@ -20,11 +20,11 @@ package org.apache.jackrabbit.oak.query.ast;
import java.util.Collections;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
import javax.jcr.PropertyType;
-import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.oak.api.PropertyValue;
import org.apache.jackrabbit.oak.query.index.FilterImpl;
import org.apache.jackrabbit.oak.spi.query.QueryIndex.OrderEntry;
@@ -118,7 +118,7 @@ public class LiteralOperandImpl extends DynamicOperandImpl {
return true;
} else if (that instanceof LiteralOperandImpl) {
LiteralOperandImpl t = (LiteralOperandImpl) that;
- return Objects.equal(value, t.value) && Objects.equal(functionToken, t.functionToken);
+ return Objects.equals(value, t.value) && Objects.equals(functionToken, t.functionToken);
} else {
return false;
}
@@ -126,7 +126,7 @@ public class LiteralOperandImpl extends DynamicOperandImpl {
@Override
public int hashCode() {
- return Objects.hashCode(value, functionToken);
+ return Objects.hash(value, functionToken);
}
}
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/OpImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/OpImpl.java
index d6185be36e..8fd1d68107 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/OpImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/OpImpl.java
@@ -19,11 +19,11 @@
package org.apache.jackrabbit.oak.query.ast;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
import javax.jcr.PropertyType;
-import org.apache.jackrabbit.guava.common.base.Objects;
import org.apache.jackrabbit.oak.api.PropertyValue;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.commons.collections.SetUtils;
@@ -159,7 +159,7 @@ public class OpImpl extends DynamicOperandImpl {
@Override
public int hashCode() {
- return Objects.hashCode(operand1, operator, operand2);
+ return Objects.hash(operand1, operator, operand2);
}
@Override