From 0e44f4f63440a27914f052e0406efc94bff2baec Mon Sep 17 00:00:00 2001
From: David Nault <david.nault@couchbase.com>
Date: Wed, 6 Mar 2024 14:37:47 -0800
Subject: [PATCH] JCBC-2131 Promote ScopeSearchIndexManager to committed API

NOTE: There's no change to ReactiveScope because
ReactiveScopeSearchIndexManager doesn't exist yet in Java.

Change-Id: I59b7aa2427e5e3c3c0d0ff12172ff84f1084a17d
Reviewed-on: https://review.couchbase.org/c/couchbase-jvm-clients/+/206828
Reviewed-by: David Nault <david.nault@couchbase.com>
Tested-by: David Nault <david.nault@couchbase.com>
---
 .../src/main/java/com/couchbase/client/java/AsyncScope.java   | 4 ++--
 .../src/main/java/com/couchbase/client/java/Scope.java        | 3 ++-
 .../java/manager/search/AsyncScopeSearchIndexManager.java     | 2 --
 .../client/java/manager/search/ScopeSearchIndexManager.java   | 2 --
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/java-client/src/main/java/com/couchbase/client/java/AsyncScope.java b/java-client/src/main/java/com/couchbase/client/java/AsyncScope.java
index da46751e8..7c4ed7f6d 100644
--- a/java-client/src/main/java/com/couchbase/client/java/AsyncScope.java
+++ b/java-client/src/main/java/com/couchbase/client/java/AsyncScope.java
@@ -18,6 +18,7 @@
 
 import com.couchbase.client.core.Core;
 import com.couchbase.client.core.CoreKeyspace;
+import com.couchbase.client.core.annotation.SinceCouchbase;
 import com.couchbase.client.core.annotation.Stability;
 import com.couchbase.client.core.api.CoreCouchbaseOps;
 import com.couchbase.client.core.api.manager.CoreBucketAndScope;
@@ -35,7 +36,6 @@
 import com.couchbase.client.core.error.context.ReducedSearchErrorContext;
 import com.couchbase.client.core.io.CollectionIdentifier;
 import com.couchbase.client.core.msg.analytics.AnalyticsRequest;
-import com.couchbase.client.core.msg.search.ServerSearchRequest;
 import com.couchbase.client.core.retry.RetryStrategy;
 import com.couchbase.client.core.util.PreventsGarbageCollection;
 import com.couchbase.client.java.analytics.AnalyticsAccessor;
@@ -373,7 +373,7 @@ public CompletableFuture<SearchResult> searchQuery(final String indexName, final
   /**
    * Allows managed scope FTS indexes.
    */
-  @Stability.Volatile
+  @SinceCouchbase("7.6")
   public AsyncScopeSearchIndexManager searchIndexes() {
     return new AsyncScopeSearchIndexManager(couchbaseOps, this, cluster);
   }
diff --git a/java-client/src/main/java/com/couchbase/client/java/Scope.java b/java-client/src/main/java/com/couchbase/client/java/Scope.java
index 835655fce..903254976 100644
--- a/java-client/src/main/java/com/couchbase/client/java/Scope.java
+++ b/java-client/src/main/java/com/couchbase/client/java/Scope.java
@@ -17,6 +17,7 @@
 package com.couchbase.client.java;
 
 import com.couchbase.client.core.Core;
+import com.couchbase.client.core.annotation.SinceCouchbase;
 import com.couchbase.client.core.annotation.Stability;
 import com.couchbase.client.core.error.CouchbaseException;
 import com.couchbase.client.core.error.TimeoutException;
@@ -274,7 +275,7 @@ public SearchResult searchQuery(final String indexName, final SearchQuery query,
   /**
    * Allows management of scope FTS indexes.
    */
-  @Stability.Volatile
+  @SinceCouchbase("7.6")
   public ScopeSearchIndexManager searchIndexes() {
     return new ScopeSearchIndexManager(asyncScope.searchIndexes());
   }
diff --git a/java-client/src/main/java/com/couchbase/client/java/manager/search/AsyncScopeSearchIndexManager.java b/java-client/src/main/java/com/couchbase/client/java/manager/search/AsyncScopeSearchIndexManager.java
index bcbc43a88..b6ad622df 100644
--- a/java-client/src/main/java/com/couchbase/client/java/manager/search/AsyncScopeSearchIndexManager.java
+++ b/java-client/src/main/java/com/couchbase/client/java/manager/search/AsyncScopeSearchIndexManager.java
@@ -16,7 +16,6 @@
 
 package com.couchbase.client.java.manager.search;
 
-import com.couchbase.client.core.annotation.Stability;
 import com.couchbase.client.core.api.CoreCouchbaseOps;
 import com.couchbase.client.core.api.manager.CoreBucketAndScope;
 import com.couchbase.client.core.api.manager.search.CoreSearchIndexManager;
@@ -52,7 +51,6 @@
  * <p> 
  * All management is done with scope FTS indexes.  For global FTS indexes, use @{@link AsyncSearchIndexManager}.
  */
-@Stability.Volatile
 public class AsyncScopeSearchIndexManager {
   private final CoreSearchIndexManager internal;
 
diff --git a/java-client/src/main/java/com/couchbase/client/java/manager/search/ScopeSearchIndexManager.java b/java-client/src/main/java/com/couchbase/client/java/manager/search/ScopeSearchIndexManager.java
index 84fca9492..d5e21a971 100644
--- a/java-client/src/main/java/com/couchbase/client/java/manager/search/ScopeSearchIndexManager.java
+++ b/java-client/src/main/java/com/couchbase/client/java/manager/search/ScopeSearchIndexManager.java
@@ -16,7 +16,6 @@
 
 package com.couchbase.client.java.manager.search;
 
-import com.couchbase.client.core.annotation.Stability;
 import com.couchbase.client.java.json.JsonObject;
 
 import java.util.List;
@@ -41,7 +40,6 @@
  * <p> 
  * All management is done with scope FTS indexes.  For global FTS indexes, use @{@link SearchIndexManager}.
  */
-@Stability.Volatile
 public class ScopeSearchIndexManager {
   private final AsyncScopeSearchIndexManager internal;