This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-10322 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/OAK-10322 by this push: new f88b9631b6 OAK-10322: oak-core: remove Guava from public API f88b9631b6 is described below commit f88b9631b6be430ebcf9a5aaaf0c925ffb12a032 Author: Julian Reschke <julian.resc...@gmx.de> AuthorDate: Tue Jul 25 14:11:53 2023 +0100 OAK-10322: oak-core: remove Guava from public API --- oak-core/pom.xml | 6 -- .../jackrabbit/oak/core/GuavaDeprecation.java | 64 ---------------------- .../oak/plugins/nodetype/TypePredicate.java | 32 +---------- .../nodetype/constraint/BooleanConstraint.java | 13 +---- .../plugins/nodetype/constraint/Constraints.java | 11 ---- .../nodetype/constraint/NameConstraint.java | 13 +---- .../nodetype/constraint/NumericConstraint.java | 13 +---- .../nodetype/constraint/PathConstraint.java | 13 +---- .../nodetype/constraint/ReferenceConstraint.java | 14 +---- .../nodetype/constraint/StringConstraint.java | 13 +---- .../observation/filter/PropertyPredicate.java | 13 +---- .../plugins/observation/filter/UuidPredicate.java | 13 +---- 12 files changed, 9 insertions(+), 209 deletions(-) diff --git a/oak-core/pom.xml b/oak-core/pom.xml index 47119e78bc..aa12056fb2 100644 --- a/oak-core/pom.xml +++ b/oak-core/pom.xml @@ -45,7 +45,6 @@ <configuration> <instructions> <Import-Package> - <!-- OAK-7182 -->${guava.osgi.import}, com.codahale.metrics*;version="[3.1, 4)";resolution:=optional, * </Import-Package> @@ -292,11 +291,6 @@ <version>${project.version}</version> </dependency> <!-- General utility libraries --> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <scope>provided</scope> - </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/core/GuavaDeprecation.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/core/GuavaDeprecation.java deleted file mode 100644 index 14e9d490d6..0000000000 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/core/GuavaDeprecation.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.jackrabbit.oak.core; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class GuavaDeprecation { - - private static final Logger LOG = LoggerFactory.getLogger(GuavaDeprecation.class); - - private static String LOGLEVEL = "error"; - - private GuavaDeprecation() { - } - - public static void handleCall(String ticket) throws UnsupportedOperationException { - String message = "use of deprecated Guava-related API - this method is going to be removed in future Oak releases - see %s for details"; - - switch (LOGLEVEL) { - case "error": - if (LOG.isErrorEnabled()) { - LOG.error(String.format(message, ticket), new Exception("call stack")); - } - break; - case "warn": - if (LOG.isWarnEnabled()) { - LOG.warn(String.format(message, ticket), new Exception("call stack")); - } - break; - case "info": - if (LOG.isInfoEnabled()) { - LOG.info(String.format(message, ticket), new Exception("call stack")); - } - break; - case "debug": - if (LOG.isDebugEnabled()) { - LOG.debug(String.format(message, ticket), new Exception("call stack")); - } - break; - } - } - - // for testing - public static String setLogLevel(String level) { - String before = LOGLEVEL; - LOGLEVEL = level; - return before; - } -} diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypePredicate.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypePredicate.java index 1940816e1d..5007f850a2 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypePredicate.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypePredicate.java @@ -23,7 +23,6 @@ import java.util.function.Predicate; import org.apache.jackrabbit.guava.common.collect.Iterables; import org.apache.jackrabbit.oak.api.Tree; -import org.apache.jackrabbit.oak.core.GuavaDeprecation; import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.plugins.tree.TreeUtil; @@ -49,7 +48,7 @@ import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_PRIMA * * @since Oak 0.11 */ -public class TypePredicate implements Predicate<NodeState>, com.google.common.base.Predicate<NodeState> { +public class TypePredicate implements Predicate<NodeState> { @NotNull public static TypePredicate isOrderable(@NotNull NodeState root) { @@ -201,35 +200,6 @@ public class TypePredicate implements Predicate<NodeState>, com.google.common.ba return false; } - // backwards compatibility, see OAK-8874 - - /** - * @deprecated use {@link #test(NodeState)} instead (see <a href="https://issues.apache.org/jira/browse/OAK-8874">OAK-8874</a>) - */ - @Deprecated(since = "1.26.0", forRemoval = true) - public boolean apply(@Nullable NodeState input) { - GuavaDeprecation.handleCall("OAK-8874"); - return test(input); - } - - /** - * @deprecated use {@link #test(Tree)} instead (see <a href="https://issues.apache.org/jira/browse/OAK-8874">OAK-8874</a>) - */ - @Deprecated(since = "1.26.0", forRemoval = true) - public boolean apply(@Nullable Tree input) { - GuavaDeprecation.handleCall("OAK-8874"); - return test(input); - } - - /** - * @deprecated use {@link #test(String, Set)} instead (see <a href="https://issues.apache.org/jira/browse/OAK-8874">OAK-8874</a>) - */ - @Deprecated(since = "1.26.0", forRemoval = true) - public boolean apply(String primary, Set<String> mixins) { - GuavaDeprecation.handleCall("OAK-8874"); - return test(primary, mixins); - } - //------------------------------------------------------------< Object >-- @Override diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/BooleanConstraint.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/BooleanConstraint.java index 77267e9c61..f1120f4c43 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/BooleanConstraint.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/BooleanConstraint.java @@ -21,11 +21,10 @@ import java.util.function.Predicate; import javax.jcr.RepositoryException; import javax.jcr.Value; -import org.apache.jackrabbit.oak.core.GuavaDeprecation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class BooleanConstraint implements Predicate<Value>, com.google.common.base.Predicate<Value> { +public class BooleanConstraint implements Predicate<Value> { private static final Logger log = LoggerFactory.getLogger(BooleanConstraint.class); private final Boolean requiredValue; @@ -54,16 +53,6 @@ public class BooleanConstraint implements Predicate<Value>, com.google.common.ba } } - /** - * @deprecated use {@link #test(Value)} instead (see <a href="https://issues.apache.org/jira/browse/OAK-8874">OAK-8874</a>) - */ - @Override - @Deprecated(since = "1.26.0", forRemoval = true) - public boolean apply(Value value) { - GuavaDeprecation.handleCall("OAK-8874"); - return test(value); - } - @Override public String toString() { return "'" + requiredValue + '\''; diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/Constraints.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/Constraints.java index 90a5809a5a..5db99618a0 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/Constraints.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/Constraints.java @@ -21,7 +21,6 @@ import java.util.function.Predicate; import javax.jcr.PropertyType; import javax.jcr.Value; -import org.apache.jackrabbit.oak.core.GuavaDeprecation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -63,14 +62,4 @@ public final class Constraints { throw new IllegalArgumentException(msg); } } - - /** - * @deprecated use {@link #asPredicate(int, String)} instead (see <a href="https://issues.apache.org/jira/browse/OAK-8874">OAK-8874</a>) - */ - @SuppressWarnings("unchecked") - @Deprecated(since = "1.26.0", forRemoval = true) - public static com.google.common.base.Predicate<Value> valueConstraint(int type, String constraint) { - GuavaDeprecation.handleCall("OAK-8874"); - return (com.google.common.base.Predicate<Value>) asPredicate(type, constraint); - } } diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/NameConstraint.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/NameConstraint.java index dcf7f1749d..309e6b70a8 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/NameConstraint.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/NameConstraint.java @@ -21,12 +21,11 @@ import java.util.function.Predicate; import javax.jcr.RepositoryException; import javax.jcr.Value; -import org.apache.jackrabbit.oak.core.GuavaDeprecation; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class NameConstraint implements Predicate<Value>, com.google.common.base.Predicate<Value> { +public class NameConstraint implements Predicate<Value> { private static final Logger log = LoggerFactory.getLogger(NameConstraint.class); private final String requiredValue; @@ -46,16 +45,6 @@ public class NameConstraint implements Predicate<Value>, com.google.common.base. } } - /** - * @deprecated use {@link #test(Value)} instead (see <a href="https://issues.apache.org/jira/browse/OAK-8874">OAK-8874</a>) - */ - @Deprecated(since = "1.26.0", forRemoval = true) - @Override - public boolean apply(@Nullable Value value) { - GuavaDeprecation.handleCall("OAK-8874"); - return test(value); - } - @Override public String toString() { return '\'' + requiredValue + '\''; diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/NumericConstraint.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/NumericConstraint.java index bfb68d8df5..ad27a7ce3f 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/NumericConstraint.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/NumericConstraint.java @@ -23,12 +23,11 @@ import java.util.regex.Pattern; import javax.jcr.RepositoryException; import javax.jcr.Value; -import org.apache.jackrabbit.oak.core.GuavaDeprecation; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public abstract class NumericConstraint<T> implements Predicate<Value>, com.google.common.base.Predicate<Value> { +public abstract class NumericConstraint<T> implements Predicate<Value> { private static final Logger log = LoggerFactory.getLogger(NumericConstraint.class); private boolean invalid; @@ -107,16 +106,6 @@ public abstract class NumericConstraint<T> implements Predicate<Value>, com.goog } } - /** - * @deprecated use {@link #test(Value)} instead (see <a href="https://issues.apache.org/jira/browse/OAK-8874">OAK-8874</a>) - */ - @Deprecated(since = "1.26.0", forRemoval = true) - @Override - public boolean apply(@Nullable Value value) { - GuavaDeprecation.handleCall("OAK-8874"); - return test(value); - } - protected abstract T getValue(Value value) throws RepositoryException; protected abstract boolean less(T val, T bound); diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/PathConstraint.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/PathConstraint.java index 3132b42f98..6c5ffd8124 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/PathConstraint.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/PathConstraint.java @@ -22,12 +22,11 @@ import javax.jcr.RepositoryException; import javax.jcr.Value; import org.apache.jackrabbit.oak.commons.PathUtils; -import org.apache.jackrabbit.oak.core.GuavaDeprecation; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class PathConstraint implements Predicate<Value>, com.google.common.base.Predicate<Value> { +public class PathConstraint implements Predicate<Value> { private static final Logger log = LoggerFactory.getLogger(PathConstraint.class); private final String requiredValue; @@ -64,16 +63,6 @@ public class PathConstraint implements Predicate<Value>, com.google.common.base. } } - /** - * @deprecated use {@link #test(Value)} instead (see <a href="https://issues.apache.org/jira/browse/OAK-8874">OAK-8874</a>) - */ - @Deprecated(since = "1.26.0", forRemoval = true) - @Override - public boolean apply(@Nullable Value value) { - GuavaDeprecation.handleCall("OAK-8874"); - return test(value); - } - @Override public String toString() { return '\'' + requiredValue + '\''; diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/ReferenceConstraint.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/ReferenceConstraint.java index 6b3014f645..511ea027e7 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/ReferenceConstraint.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/ReferenceConstraint.java @@ -20,9 +20,7 @@ import java.util.function.Predicate; import javax.jcr.Value; -import org.apache.jackrabbit.oak.core.GuavaDeprecation; - -public class ReferenceConstraint implements Predicate<Value>, com.google.common.base.Predicate<Value> { +public class ReferenceConstraint implements Predicate<Value> { private final String requiredTargetType; @@ -36,16 +34,6 @@ public class ReferenceConstraint implements Predicate<Value>, com.google.common. return true; } - /** - * @deprecated use {@link #test(Value)} instead (see <a href="https://issues.apache.org/jira/browse/OAK-8874">OAK-8874</a>) - */ - @Deprecated(since = "1.26.0", forRemoval = true) - @Override - public boolean apply(Value value) { - GuavaDeprecation.handleCall("OAK-8874"); - return test(value); - } - @Override public String toString() { return '\'' + requiredTargetType + '\''; diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/StringConstraint.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/StringConstraint.java index adabbb6adf..e529dc62c7 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/StringConstraint.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/constraint/StringConstraint.java @@ -24,11 +24,10 @@ import java.util.regex.PatternSyntaxException; import javax.jcr.RepositoryException; import javax.jcr.Value; -import org.apache.jackrabbit.oak.core.GuavaDeprecation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class StringConstraint implements Predicate<Value>, com.google.common.base.Predicate<Value> { +public class StringConstraint implements Predicate<Value> { private static final Logger log = LoggerFactory.getLogger(StringConstraint.class); private final Pattern pattern; @@ -62,16 +61,6 @@ public class StringConstraint implements Predicate<Value>, com.google.common.bas } } - /** - * @deprecated use {@link #test(Value)} instead (see <a href="https://issues.apache.org/jira/browse/OAK-8874">OAK-8874</a>) - */ - @Deprecated(since = "1.26.0", forRemoval = true) - @Override - public boolean apply(Value value) { - GuavaDeprecation.handleCall("OAK-8874"); - return test(value); - } - @Override public String toString() { return "'" + pattern + '\''; diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PropertyPredicate.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PropertyPredicate.java index 6dede3cf3b..f4e18f81f1 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PropertyPredicate.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PropertyPredicate.java @@ -24,7 +24,6 @@ import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull import java.util.function.Predicate; import org.apache.jackrabbit.oak.api.PropertyState; -import org.apache.jackrabbit.oak.core.GuavaDeprecation; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.jetbrains.annotations.NotNull; @@ -33,7 +32,7 @@ import org.jetbrains.annotations.NotNull; * the node has a property of the given {@code name} and the given * {@code propertyPredicate} holds on that property. */ -public class PropertyPredicate implements Predicate<NodeState>, com.google.common.base.Predicate<NodeState> { +public class PropertyPredicate implements Predicate<NodeState> { private final String name; private final Predicate<PropertyState> propertyPredicate; @@ -52,14 +51,4 @@ public class PropertyPredicate implements Predicate<NodeState>, com.google.commo PropertyState property = node.getProperty(name); return property != null && propertyPredicate.test(property); } - - /** - * @deprecated use {@link #test(NodeState)} instead (see <a href="https://issues.apache.org/jira/browse/OAK-8874">OAK-8874</a>) - */ - @Deprecated(since = "1.26.0", forRemoval = true) - @Override - public boolean apply(NodeState node) { - GuavaDeprecation.handleCall("OAK-8874"); - return test(node); - } } diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UuidPredicate.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UuidPredicate.java index 1984b00667..9c829e89d0 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UuidPredicate.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/UuidPredicate.java @@ -26,7 +26,6 @@ import java.util.function.Predicate; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; -import org.apache.jackrabbit.oak.core.GuavaDeprecation; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.jetbrains.annotations.NotNull; @@ -36,7 +35,7 @@ import org.jetbrains.annotations.NotNull; * property and the value of that property matches any of the UUIDs that * has been passed to the predicate's constructor. */ -public class UuidPredicate implements Predicate<NodeState>, com.google.common.base.Predicate<NodeState> { +public class UuidPredicate implements Predicate<NodeState> { private final String[] uuids; /** @@ -65,14 +64,4 @@ public class UuidPredicate implements Predicate<NodeState>, com.google.common.ba } return false; } - - /** - * @deprecated use {@link #test(NodeState)} instead (see <a href="https://issues.apache.org/jira/browse/OAK-8874">OAK-8874</a>) - */ - @Deprecated(since = "1.26.0", forRemoval = true) - @Override - public boolean apply(NodeState node) { - GuavaDeprecation.handleCall("OAK-8874"); - return test(node); - } }