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 2023/08/30 09:25:20 UTC

[jackrabbit-oak] 02/03: OAK-8659 | Revert changes for rev 1873934

This is an automated email from the ASF dual-hosted git repository.

reschke pushed a commit to branch 1.22
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git

commit e50b67d48970ab9503dd8792a66a86ed07d4c11a
Author: Nitin Gupta <ng...@apache.org>
AuthorDate: Thu Feb 13 05:08:46 2020 +0000

    OAK-8659 | Revert changes for rev 1873934
    
    git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1873969 13f79535-47bb-0310-9956-ffa450edef68
---
 .../jackrabbit/oak/plugins/index/lucene/score/ScorerProvider.java   | 4 ----
 .../oak/plugins/index/lucene/score/ScorerProviderFactory.java       | 4 ----
 .../plugins/index/lucene/score/impl/ScorerProviderFactoryImpl.java  | 4 ----
 .../jackrabbit/oak/plugins/index/lucene/score/package-info.java     | 6 +-----
 4 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/score/ScorerProvider.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/score/ScorerProvider.java
index 6ea743f485..9d0e56c354 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/score/ScorerProvider.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/score/ScorerProvider.java
@@ -19,10 +19,6 @@ package org.apache.jackrabbit.oak.plugins.index.lucene.score;
 import org.apache.lucene.queries.CustomScoreQuery;
 import org.apache.lucene.search.Query;
 
-/**
- * @deprecated Unused interface that exposes Lucene API directly - it will be removed in 1.28
- */
-@Deprecated
 public interface ScorerProvider {
     String getName();
     CustomScoreQuery createCustomScoreQuery(Query subQuery);
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/score/ScorerProviderFactory.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/score/ScorerProviderFactory.java
index 033c0fe424..e24af69eeb 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/score/ScorerProviderFactory.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/score/ScorerProviderFactory.java
@@ -16,10 +16,6 @@
  */
 package org.apache.jackrabbit.oak.plugins.index.lucene.score;
 
-/**
- * @deprecated Unused interface that exposes Lucene API directly - it will be removed in 1.28
- */
-@Deprecated
 public interface ScorerProviderFactory {
     ScorerProviderFactory DEFAULT = new ScorerProviderFactory() {
         @Override
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/score/impl/ScorerProviderFactoryImpl.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/score/impl/ScorerProviderFactoryImpl.java
index c886563c83..e81dd560f5 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/score/impl/ScorerProviderFactoryImpl.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/score/impl/ScorerProviderFactoryImpl.java
@@ -28,10 +28,6 @@ import org.apache.jackrabbit.oak.plugins.index.lucene.score.ScorerProviderFactor
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-/**
- * @deprecated Unused interface that exposes Lucene API directly - it will be removed in 1.28
- */
-@Deprecated
 @Component(metatype = false, immediate = true)
 @Service(value = ScorerProviderFactory.class)
 @Reference(name = "ScorerProvider",
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/score/package-info.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/score/package-info.java
index bd4413de71..27fc2e158b 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/score/package-info.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/score/package-info.java
@@ -14,11 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/**
- * @deprecated Unused package that exposes Lucene API directly - it will be removed in 1.28
- */
-@Deprecated
 @Version("1.3.1")
 package org.apache.jackrabbit.oak.plugins.index.lucene.score;
 
-import org.osgi.annotation.versioning.Version;
+import org.osgi.annotation.versioning.Version;
\ No newline at end of file