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/07/16 14:16:31 UTC
(jackrabbit-oak) branch OAK-10849 created (now c3f45039fe)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a change to branch OAK-10849
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
at c3f45039fe OAK-10849: query-spi: remove deprecated slf4j.event.Level based method
This branch includes the following new commits:
new c3f45039fe OAK-10849: query-spi: remove deprecated slf4j.event.Level based method
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-10849: query-spi: remove deprecated slf4j.event.Level based method
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-10849
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit c3f45039fe1965e1bdbf1133292c889ea53da15d
Author: Julian Reschke <re...@apache.org>
AuthorDate: Tue Jul 16 15:16:14 2024 +0100
OAK-10849: query-spi: remove deprecated slf4j.event.Level based method
---
.../jackrabbit/oak/spi/query/QueryIndex.java | 31 ----------------------
.../jackrabbit/oak/spi/query/package-info.java | 2 +-
2 files changed, 1 insertion(+), 32 deletions(-)
diff --git a/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryIndex.java b/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryIndex.java
index 0d2bf00ac6..3a2561a1ac 100644
--- a/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryIndex.java
+++ b/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryIndex.java
@@ -34,7 +34,6 @@ import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.slf4j.event.Level;
import static java.util.stream.Collectors.toMap;
import static org.apache.jackrabbit.oak.spi.query.Filter.PropertyRestriction;
@@ -362,20 +361,6 @@ public interface QueryIndex {
return false;
}
- /**
- * This method can be used for communicating any messages which should be logged if this plan is selected for execution.
- * The messages are returned as a map whose key indicates log level and value is a list of messages against that
- * log level.
-
- * @deprecated use {@link #getAdditionalLogMessages()} instead
- * @return map containing log messages.
- */
- @Deprecated(forRemoval = true)
- default Map<Level, List<String>> getAdditionalMessages() {
- LOG.error("use of deprecated API - this method is going to be removed in future Oak releases - see OAK-10768 for details");
- return getAdditionalLogMessages().entrySet().stream().collect(toMap(entry -> Level.valueOf(entry.getKey()), Map.Entry::getValue));
- }
-
/**
* This method can be used for communicating any messages which should be logged if this plan is selected for execution.
* The messages are returned as a map whose key indicates log level and value is a list of messages against that
@@ -435,22 +420,6 @@ public interface QueryIndex {
return this;
}
- /**
- * @deprecated use {@link #addAdditionalMessage(String level, String s)} instead
- * */
- @Deprecated(forRemoval = true)
- public Builder addAdditionalMessage(Level level, String s) {
- LOG.warn("use of deprecated API - this method is going to be removed in future Oak releases - see OAK-10768 for details");
- this.additionalMessages.compute(level.name(), (k,v) -> {
- if (v == null) {
- v = new ArrayList<>();
- }
- v.add(s);
- return v;
- });
- return this;
- }
-
public Builder addAdditionalMessage(String level, String s) {
switch (level) {
case "TRACE":
diff --git a/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/package-info.java b/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/package-info.java
index 074a74a43e..24d875f1de 100644
--- a/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/package-info.java
+++ b/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/package-info.java
@@ -18,7 +18,7 @@
/**
* This package contains oak query index related classes.
*/
-@Version("2.0.0")
+@Version("3.0.0")
package org.apache.jackrabbit.oak.spi.query;
import org.osgi.annotation.versioning.Version;