Refactor feature name, remove plugin feature flags class

Signed-off-by: Martin Gaievski <[email protected]>

src/main/java/org/opensearch/neuralsearch/plugin/NeuralSearch.java

@@ -13,10 +13,12 @@
 import java.util.Optional;
 import java.util.function.Supplier;
 
+import org.apache.commons.lang3.tuple.Pair;
 import org.opensearch.client.Client;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.io.stream.NamedWriteableRegistry;
+import org.opensearch.common.util.FeatureFlags;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.env.Environment;
 import org.opensearch.env.NodeEnvironment;
@@ -28,7 +30,6 @@
 import org.opensearch.neuralsearch.query.HybridQueryBuilder;
 import org.opensearch.neuralsearch.query.NeuralQueryBuilder;
 import org.opensearch.neuralsearch.search.query.HybridQueryPhaseSearcher;
-import org.opensearch.neuralsearch.util.PluginFeatureFlags;
 import org.opensearch.plugins.ActionPlugin;
 import org.opensearch.plugins.ExtensiblePlugin;
 import org.opensearch.plugins.IngestPlugin;
@@ -38,6 +39,7 @@
 import org.opensearch.script.ScriptService;
 import org.opensearch.search.query.QueryPhaseSearcher;
 import org.opensearch.threadpool.ThreadPool;
+import org.opensearch.transport.TransportSettings;
 import org.opensearch.watcher.ResourceWatcherService;
 
 import com.google.common.annotations.VisibleForTesting;
@@ -50,9 +52,14 @@ public class NeuralSearch extends Plugin implements ActionPlugin, SearchPlugin,
      * Gates the functionality of hybrid search
      * Currently query phase searcher added with hybrid search will conflict with concurrent search in core.
      * Once that problem is resolved this feature flag can be removed.
+     * Key is the name string, value is key + transport feature specific prefix, prefix is added by core when we register feature
+     * We need to write and read by the value, key is only for definition
      */
     @VisibleForTesting
-    public static final String NEURAL_SEARCH_HYBRID_SEARCH_ENABLED = "neural_search_hybrid_search_enabled";
+    public static final Pair<String, String> NEURAL_SEARCH_HYBRID_SEARCH_ENABLED = Pair.of(
+        "neural_search_hybrid_search_enabled",
+        String.join(".", TransportSettings.FEATURE_PREFIX, "neural_search_hybrid_search_enabled")
+    );
     private MLCommonsClientAccessor clientAccessor;
 
     @Override
@@ -89,15 +96,14 @@ public Map<String, Processor.Factory> getProcessors(Processor.Parameters paramet
 
     @Override
     public Optional<QueryPhaseSearcher> getQueryPhaseSearcher() {
-        if (PluginFeatureFlags.isEnabled(NEURAL_SEARCH_HYBRID_SEARCH_ENABLED)) {
+        if (FeatureFlags.isEnabled(NEURAL_SEARCH_HYBRID_SEARCH_ENABLED.getValue())) {
             return Optional.of(new HybridQueryPhaseSearcher());
         }
         return Optional.empty();
     }
 
     @Override
     protected Optional<String> getFeature() {
-        return Optional.of(NEURAL_SEARCH_HYBRID_SEARCH_ENABLED);
+        return Optional.of(NEURAL_SEARCH_HYBRID_SEARCH_ENABLED.getKey());
     }
-
 }

src/test/java/org/opensearch/neuralsearch/plugin/NeuralSearchTests.java

@@ -42,15 +42,15 @@ public void testQueryPhaseSearcher() {
         assertNotNull(queryPhaseSearcher);
         assertTrue(queryPhaseSearcher.isEmpty());
 
-        System.setProperty(NEURAL_SEARCH_HYBRID_SEARCH_ENABLED, "true");
+        System.setProperty(NEURAL_SEARCH_HYBRID_SEARCH_ENABLED.getValue(), "true");
 
         Optional<QueryPhaseSearcher> queryPhaseSearcherWithFeatureFlagDisabled = plugin.getQueryPhaseSearcher();
 
         assertNotNull(queryPhaseSearcherWithFeatureFlagDisabled);
         assertFalse(queryPhaseSearcherWithFeatureFlagDisabled.isEmpty());
         assertTrue(queryPhaseSearcherWithFeatureFlagDisabled.get() instanceof HybridQueryPhaseSearcher);
 
-        System.setProperty(NEURAL_SEARCH_HYBRID_SEARCH_ENABLED, "");
+        System.setProperty(NEURAL_SEARCH_HYBRID_SEARCH_ENABLED.getValue(), "");
     }
 
     public void testProcessors() {
@@ -66,6 +66,6 @@ public void testFeature() {
         Optional<String> feature = plugin.getFeature();
         assertNotNull(feature);
         assertFalse(feature.isEmpty());
-        assertEquals(NEURAL_SEARCH_HYBRID_SEARCH_ENABLED, feature.get());
+        assertEquals(NEURAL_SEARCH_HYBRID_SEARCH_ENABLED.getKey(), feature.get());
     }
 }