use constructors over static methods

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

Author: kaushalmahi12

CHANGELOG.md

@@ -9,10 +9,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - [Rule Based Auto-tagging] Add rule schema for auto tagging ([#17238](https://github.com/opensearch-project/OpenSearch/pull/17238))
 - Renaming the node role search to warm ([#17573](https://github.com/opensearch-project/OpenSearch/pull/17573))
 - Introduce a new search node role to hold search only shards ([#17620](https://github.com/opensearch-project/OpenSearch/pull/17620))
-- Fix systemd integTest on deb regarding path ownership check ([#17641](https://github.com/opensearch-project/OpenSearch/pull/17641)) 
+- Fix systemd integTest on deb regarding path ownership check ([#17641](https://github.com/opensearch-project/OpenSearch/pull/17641))
 - Add dfs transformation function in XContentMapValues ([#17612](https://github.com/opensearch-project/OpenSearch/pull/17612))
-- Added Kinesis support as a plugin for the pull-based ingestion ([#17615](https://github.com/opensearch-project/OpenSearch/pull/17615)
-- [Rule Based Auto-tagging] Add in-memory rule processing service [#17365](https://github.com/opensearch-project/OpenSearch/pull/17365)
+- Added Kinesis support as a plugin for the pull-based ingestion ([#17615](https://github.com/opensearch-project/OpenSearch/pull/17615))
+- [Rule Based Auto-tagging] Add in-memory rule processing service ([#17365](https://github.com/opensearch-project/OpenSearch/pull/17365))
 - [Security Manager Replacement] Create initial Java Agent to intercept Socket::connect calls ([#17724](https://github.com/opensearch-project/OpenSearch/pull/17724))
 
 ### Changed

libs/autotagging-commons/src/main/java/org/opensearch/rule/InMemoryRuleProcessingService.java

@@ -31,22 +31,15 @@ public class InMemoryRuleProcessingService {
     private AttributeValueStoreFactory attributeValueStoreFactory;
 
     /**
-     *  Make the instance accessible using static factory method only
-     */
-    private InMemoryRuleProcessingService() {}
-
-    /**
-     * This factory methods creates an instance of InMemoryRuleProcessingService to use auto-tagging framework
+     *  Constrcutor
      * @param featureType
      * @param attributeValueStoreSupplier
      */
-    public static InMemoryRuleProcessingService createForFeature(
+    public InMemoryRuleProcessingService(
         FeatureType featureType,
         Supplier<AttributeValueStore<String, String>> attributeValueStoreSupplier
     ) {
-        InMemoryRuleProcessingService service = new InMemoryRuleProcessingService();
-        service.attributeValueStoreFactory = AttributeValueStoreFactory.create(featureType, attributeValueStoreSupplier);
-        return service;
+        attributeValueStoreFactory = new AttributeValueStoreFactory(featureType, attributeValueStoreSupplier);
     }
 
     /**

libs/autotagging-commons/src/main/java/org/opensearch/rule/storage/AttributeValueStoreFactory.java

@@ -22,24 +22,14 @@ public class AttributeValueStoreFactory {
     private final Map<String, AttributeValueStore<String, String>> attributeValueStores = new HashMap<>();
 
     /**
-     * Making the class to be uninitializable
-     */
-    private AttributeValueStoreFactory() {}
-
-    /**
-     * This should be the first method to be invoked else the factory method will throw an exception
+     * Constructor
      * @param featureType  is the feature which are using rule based auto tagging
      * @param attributeValueStoreSupplier supplies the feature level AttributeValueStore instance
      */
-    public static AttributeValueStoreFactory create(
-        FeatureType featureType,
-        Supplier<AttributeValueStore<String, String>> attributeValueStoreSupplier
-    ) {
-        final AttributeValueStoreFactory instance = new AttributeValueStoreFactory();
+    public AttributeValueStoreFactory(FeatureType featureType, Supplier<AttributeValueStore<String, String>> attributeValueStoreSupplier) {
         for (Attribute attribute : featureType.getAllowedAttributesRegistry().values()) {
-            instance.attributeValueStores.put(attribute.getName(), attributeValueStoreSupplier.get());
+            attributeValueStores.put(attribute.getName(), attributeValueStoreSupplier.get());
         }
-        return instance;
     }
 
     /**

libs/autotagging-commons/src/test/java/org/opensearch/rule/InMemoryRuleProcessingServiceTests.java

@@ -27,7 +27,7 @@ public class InMemoryRuleProcessingServiceTests extends OpenSearchTestCase {
 
     public void setUp() throws Exception {
         super.setUp();
-        sut = InMemoryRuleProcessingService.createForFeature(WLMFeatureType.WLM, DefaultAttributeValueStore::new);
+        sut = new InMemoryRuleProcessingService(WLMFeatureType.WLM, DefaultAttributeValueStore::new);
     }
 
     public void testAdd() {

libs/autotagging-commons/src/test/java/org/opensearch/rule/storage/AttributeValueStoreFactoryTests.java

@@ -19,7 +19,7 @@ public class AttributeValueStoreFactoryTests extends OpenSearchTestCase {
     @Override
     public void setUp() throws Exception {
         super.setUp();
-        sut = AttributeValueStoreFactory.create(WLMFeatureType.WLM, () -> new DefaultAttributeValueStore<>());
+        sut = new AttributeValueStoreFactory(WLMFeatureType.WLM, DefaultAttributeValueStore::new);
     }
 
     public void testFeatureLevelStoreInitialisation() {