refactor as per lib changes

Signed-off-by: Kaushal Kumar <[email protected]>

Author: kaushalmahi12

plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/AutoTaggingActionFilter.java

@@ -16,8 +16,8 @@
 import org.opensearch.action.support.ActionFilterChain;
 import org.opensearch.core.action.ActionListener;
 import org.opensearch.core.action.ActionResponse;
-import org.opensearch.plugin.wlm.rule.InMemoryRuleProcessingService;
 import org.opensearch.plugin.wlm.rule.attribute_extractor.IndicesExtractor;
+import org.opensearch.rule.InMemoryRuleProcessingService;
 import org.opensearch.tasks.Task;
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.wlm.QueryGroupTask;
@@ -29,13 +29,14 @@
  * This class is responsible to evaluate and assign the QUERY_GROUP_ID header in ThreadContext
  */
 public class AutoTaggingActionFilter implements ActionFilter {
-    private InMemoryRuleProcessingService ruleProcessingService;
+    public static final int LARGE_NUMBER_TO_ENSURE_IT_IS_NOT_FIRST = Integer.MAX_VALUE;
+    private final InMemoryRuleProcessingService ruleProcessingService;
     ThreadPool threadPool;
 
     /**
      * Main constructor
-     * @param ruleProcessingService
-     * @param threadPool
+     * @param ruleProcessingService provides access to in memory view of rules
+     * @param threadPool to access assign the label
      */
     public AutoTaggingActionFilter(InMemoryRuleProcessingService ruleProcessingService, ThreadPool threadPool) {
         this.ruleProcessingService = ruleProcessingService;
@@ -44,7 +45,7 @@ public AutoTaggingActionFilter(InMemoryRuleProcessingService ruleProcessingServi
 
     @Override
     public int order() {
-        return 101;
+        return LARGE_NUMBER_TO_ENSURE_IT_IS_NOT_FIRST;
     }
 
     @Override

plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/WorkloadManagementPlugin.java

@@ -36,13 +36,13 @@
 import org.opensearch.plugin.wlm.rest.RestDeleteQueryGroupAction;
 import org.opensearch.plugin.wlm.rest.RestGetQueryGroupAction;
 import org.opensearch.plugin.wlm.rest.RestUpdateQueryGroupAction;
-import org.opensearch.plugin.wlm.rule.InMemoryRuleProcessingService;
 import org.opensearch.plugin.wlm.service.QueryGroupPersistenceService;
 import org.opensearch.plugins.ActionPlugin;
 import org.opensearch.plugins.Plugin;
 import org.opensearch.repositories.RepositoriesService;
 import org.opensearch.rest.RestController;
 import org.opensearch.rest.RestHandler;
+import org.opensearch.rule.InMemoryRuleProcessingService;
 import org.opensearch.script.ScriptService;
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.transport.client.Client;
@@ -66,7 +66,7 @@ public WorkloadManagementPlugin() {}
 
     @Override
     public Collection<Object> createComponents(Client client, ClusterService clusterService, ThreadPool threadPool, ResourceWatcherService resourceWatcherService, ScriptService scriptService, NamedXContentRegistry xContentRegistry, Environment environment, NodeEnvironment nodeEnvironment, NamedWriteableRegistry namedWriteableRegistry, IndexNameExpressionResolver indexNameExpressionResolver, Supplier<RepositoriesService> repositoriesServiceSupplier) {
-        InMemoryRuleProcessingService ruleProcessingService = new InMemoryRuleProcessingService();
+        InMemoryRuleProcessingService ruleProcessingService = new InMemoryRuleProcessingService(null, null);// TODO: this will change post Ruirui's PR
         autoTaggingActionFilter = new AutoTaggingActionFilter(ruleProcessingService, threadPool);
         return Collections.emptyList();
     }

plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/rule/InMemoryRuleProcessingService.java

@@ -10,14 +10,20 @@
 
 import org.opensearch.action.admin.cluster.node.tasks.cancel.CancelTasksRequest;
 import org.opensearch.action.search.SearchRequest;
+import org.opensearch.autotagging.Attribute;
+import org.opensearch.autotagging.FeatureType;
 import org.opensearch.common.util.concurrent.ThreadContext;
-import org.opensearch.plugin.wlm.rule.InMemoryRuleProcessingService;
+import org.opensearch.core.common.io.stream.StreamOutput;
+import org.opensearch.rule.InMemoryRuleProcessingService;
+import org.opensearch.rule.storage.DefaultAttributeValueStore;
 import org.opensearch.tasks.Task;
 import org.opensearch.test.OpenSearchTestCase;
 import org.opensearch.threadpool.TestThreadPool;
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.wlm.QueryGroupTask;
 
+import java.io.IOException;
+import java.util.Map;
 import java.util.Optional;
 
 import static org.mockito.Mockito.anyList;
@@ -37,7 +43,7 @@ public class AutoTaggingActionFilterTests extends OpenSearchTestCase {
     public void setUp() throws Exception {
         super.setUp();
         threadPool = new TestThreadPool("AutoTaggingActionFilterTests");
-        ruleProcessingService = spy(new InMemoryRuleProcessingService());
+        ruleProcessingService = spy(new InMemoryRuleProcessingService(WLMFeatureType.WLM, DefaultAttributeValueStore::new));
         autoTaggingActionFilter = new AutoTaggingActionFilter(ruleProcessingService, threadPool);
     }
 
@@ -79,4 +85,43 @@ public void testApplyForInValidRequest() {
 
         verify(ruleProcessingService, times(0)).evaluateLabel(anyList());
     }
+
+    public enum WLMFeatureType implements FeatureType {
+        WLM;
+
+        @Override
+        public String getName() {
+            return "";
+        }
+
+        @Override
+        public Map<String, Attribute> getAllowedAttributesRegistry() {
+            return Map.of("test_attribute", TestAttribute.TEST_ATTRIBUTE);
+        }
+
+        @Override
+        public void registerFeatureType() {}
+    }
+
+    public enum TestAttribute implements Attribute {
+        TEST_ATTRIBUTE("test_attribute"),
+        INVALID_ATTRIBUTE("invalid_attribute");
+
+        private final String name;
+
+        TestAttribute(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public String getName() {
+            return name;
+        }
+
+        @Override
+        public void validateAttribute() {}
+
+        @Override
+        public void writeTo(StreamOutput out) throws IOException {}
+    }
 }