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 8629b87f60 OAK-10849: query-spi: remove deprecated slf4j.event.Level
based method (#1582)
8629b87f60 is described below
commit 8629b87f608c0c2bbcdc9a4de5a53aa80be7c056
Author: Julian Reschke <[email protected]>
AuthorDate: Wed Aug 14 16:30:35 2024 +0200
OAK-10849: query-spi: remove deprecated slf4j.event.Level based method
(#1582)
---
.../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;
