Resolve breaking changes

Signed-off-by: Jay Deng <dengjay@amazon.com>
opensearch-project · Nov 7, 2024 · 7234c74 · 7234c74
1 parent b602dfd
commit 7234c74
Showing 1 changed file with 22 additions and 4 deletions.
diff --git a/server/src/main/java/org/opensearch/env/NodeEnvironment.java b/server/src/main/java/org/opensearch/env/NodeEnvironment.java
@@ -200,7 +200,7 @@ public String toString() {
 
     private final NodeMetadata nodeMetadata;
 
-    private final IndexStoreListener indexStoreListener;
+    private final org.opensearch.index.store.IndexStoreListener indexStoreListener;
 
     /**
      * Maximum number of data nodes that should run in an environment.
@@ -299,22 +299,32 @@ public void close() {
     }
 
     public NodeEnvironment(Settings settings, Environment environment) throws IOException {
-        this(settings, environment, IndexStoreListener.EMPTY);
+        this(settings, environment, org.opensearch.index.store.IndexStoreListener.EMPTY);
+    }
+
+    /**
+     * Use {@link NodeEnvironment#NodeEnvironment(Settings, Environment, org.opensearch.index.store.IndexStoreListener)} instead.
+     * This constructor is kept around on 2.x to avoid breaking changes.
+     */
+    @Deprecated(forRemoval = true, since = "2.19.0")
+    public NodeEnvironment(Settings settings, Environment environment, IndexStoreListener indexStoreListener) throws IOException {
+        this(settings, environment);
     }
 
     /**
      * Setup the environment.
      * @param settings settings from opensearch.yml
      */
-    public NodeEnvironment(Settings settings, Environment environment, IndexStoreListener indexStoreListener) throws IOException {
+    public NodeEnvironment(Settings settings, Environment environment, org.opensearch.index.store.IndexStoreListener indexStoreListener)
+        throws IOException {
         if (DiscoveryNode.nodeRequiresLocalStorage(settings) == false) {
             nodePaths = null;
             fileCacheNodePath = null;
             sharedDataPath = null;
             locks = null;
             nodeLockId = -1;
             nodeMetadata = new NodeMetadata(generateNodeId(settings), Version.CURRENT);
-            this.indexStoreListener = IndexStoreListener.EMPTY;
+            this.indexStoreListener = org.opensearch.index.store.IndexStoreListener.EMPTY;
             return;
         }
         boolean success = false;
@@ -1413,4 +1423,12 @@ private static void tryWriteTempFile(Path path) throws IOException {
             }
         }
     }
+
+    /**
+     * Use {@link org.opensearch.index.store.IndexStoreListener} instead. This interface is kept around on 2.x to avoid breaking changes.
+     *
+     * @opensearch.internal
+     */
+    @Deprecated(forRemoval = true, since = "2.19.0")
+    public interface IndexStoreListener extends org.opensearch.index.store.IndexStoreListener {}
 }