change method name

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

Author: kaushalmahi12

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

@@ -23,5 +23,5 @@ public interface RuleQueryMapper<T> {
      * @param request
      * @return
      */
-    T getQuery(GetRuleRequest request);
+    T from(GetRuleRequest request);
 }

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

@@ -81,8 +81,7 @@ public IndexStoredRulePersistenceService(
      * @param listener the listener for GetRuleResponse.
      */
     public void getRule(GetRuleRequest getRuleRequest, ActionListener<GetRuleResponse> listener) {
-        final QueryBuilder getQueryBuilder = queryBuilder.getQuery(getRuleRequest)
-            .filter(QueryBuilders.existsQuery(featureType.getName()));
+        final QueryBuilder getQueryBuilder = queryBuilder.from(getRuleRequest).filter(QueryBuilders.existsQuery(featureType.getName()));
         getRuleFromIndex(getRuleRequest.getId(), getQueryBuilder, getRuleRequest.getSearchAfter(), listener);
     }
 

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

@@ -33,7 +33,7 @@ public class IndexBasedRuleQueryMapper implements RuleQueryMapper<QueryBuilder>
     public IndexBasedRuleQueryMapper() {}
 
     @Override
-    public QueryBuilder getQuery(GetRuleRequest request) {
+    public QueryBuilder from(GetRuleRequest request) {
         final BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
         final Map<Attribute, Set<String>> attributeFilters = request.getAttributeFilters();
         final String id = request.getId();

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

@@ -30,7 +30,7 @@ public void setUp() throws Exception {
     }
 
     public void testBuildGetRuleQuery_WithId() {
-        QueryBuilder query = sut.getQuery(new GetRuleRequest(_ID_ONE, new HashMap<>(), null, RuleTestUtils.MockRuleFeatureType.INSTANCE));
+        QueryBuilder query = sut.from(new GetRuleRequest(_ID_ONE, new HashMap<>(), null, RuleTestUtils.MockRuleFeatureType.INSTANCE));
         assertNotNull(query);
         BoolQueryBuilder queryBuilder = (BoolQueryBuilder) query;
         assertEquals(1, queryBuilder.must().size());
@@ -39,9 +39,7 @@ public void testBuildGetRuleQuery_WithId() {
     }
 
     public void testBuildGetRuleQuery_WithAttributes() {
-        QueryBuilder queryBuilder = sut.getQuery(
-            new GetRuleRequest(null, ATTRIBUTE_MAP, null, RuleTestUtils.MockRuleFeatureType.INSTANCE)
-        );
+        QueryBuilder queryBuilder = sut.from(new GetRuleRequest(null, ATTRIBUTE_MAP, null, RuleTestUtils.MockRuleFeatureType.INSTANCE));
         assertNotNull(queryBuilder);
         BoolQueryBuilder query = (BoolQueryBuilder) queryBuilder;
         assertTrue(query.must().size() == 1);

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

@@ -36,7 +36,6 @@
 import org.mockito.ArgumentCaptor;
 
 import static org.opensearch.rule.XContentRuleParserTests.VALID_JSON;
-import static org.opensearch.rule.utils.RuleTestUtils.IndexStoredRulePersistenceBuilder;
 import static org.opensearch.rule.utils.RuleTestUtils.MockRuleFeatureType;
 import static org.opensearch.rule.utils.RuleTestUtils.TEST_INDEX_NAME;
 import static org.opensearch.rule.utils.RuleTestUtils._ID_ONE;
@@ -63,19 +62,20 @@ public void testGetRuleByIdSuccess() {
         Rule mockRule = mock(Rule.class);
 
         when(mockRuleEntityParser.parse(anyString())).thenReturn(mockRule);
-        when(mockRuleQueryMapper.getQuery(getRuleRequest)).thenReturn(queryBuilder);
+        when(mockRuleQueryMapper.from(getRuleRequest)).thenReturn(queryBuilder);
         when(queryBuilder.filter(any())).thenReturn(queryBuilder);
 
         SearchRequestBuilder searchRequestBuilder = mock(SearchRequestBuilder.class);
         Client client = setUpMockClient(searchRequestBuilder);
 
-        IndexStoredRulePersistenceService rulePersistenceService = new IndexStoredRulePersistenceBuilder().indexName(TEST_INDEX_NAME)
-            .client(client)
-            .featureType(MockRuleFeatureType.INSTANCE)
-            .maxValuesPerPage(MAX_VALUES_PER_PAGE)
-            .parser(mockRuleEntityParser)
-            .queryBuilder(mockRuleQueryMapper)
-            .build();
+        RulePersistenceService rulePersistenceService = new IndexStoredRulePersistenceService(
+            TEST_INDEX_NAME,
+            client,
+            MockRuleFeatureType.INSTANCE,
+            MAX_VALUES_PER_PAGE,
+            mockRuleEntityParser,
+            mockRuleQueryMapper
+        );
 
         SearchResponse searchResponse = mock(SearchResponse.class);
         SearchHits searchHits = new SearchHits(new SearchHit[] { new SearchHit(1) }, new TotalHits(1, TotalHits.Relation.EQUAL_TO), 1.0f);
@@ -108,19 +108,20 @@ public void testGetRuleByIdNotFound() {
         Rule mockRule = mock(Rule.class);
 
         when(mockRuleEntityParser.parse(anyString())).thenReturn(mockRule);
-        when(mockRuleQueryMapper.getQuery(getRuleRequest)).thenReturn(queryBuilder);
+        when(mockRuleQueryMapper.from(getRuleRequest)).thenReturn(queryBuilder);
         when(queryBuilder.filter(any())).thenReturn(queryBuilder);
 
         SearchRequestBuilder searchRequestBuilder = mock(SearchRequestBuilder.class);
         Client client = setUpMockClient(searchRequestBuilder);
 
-        IndexStoredRulePersistenceService rulePersistenceService = new IndexStoredRulePersistenceBuilder().indexName(TEST_INDEX_NAME)
-            .client(client)
-            .featureType(MockRuleFeatureType.INSTANCE)
-            .maxValuesPerPage(MAX_VALUES_PER_PAGE)
-            .parser(mockRuleEntityParser)
-            .queryBuilder(mockRuleQueryMapper)
-            .build();
+        RulePersistenceService rulePersistenceService = new IndexStoredRulePersistenceService(
+            TEST_INDEX_NAME,
+            client,
+            MockRuleFeatureType.INSTANCE,
+            MAX_VALUES_PER_PAGE,
+            mockRuleEntityParser,
+            mockRuleQueryMapper
+        );
 
         SearchResponse searchResponse = mock(SearchResponse.class);
         when(searchResponse.getHits()).thenReturn(new SearchHits(new SearchHit[] {}, new TotalHits(0, TotalHits.Relation.EQUAL_TO), 1.0f));

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

@@ -12,11 +12,6 @@
 import org.opensearch.autotagging.AutoTaggingRegistry;
 import org.opensearch.autotagging.FeatureType;
 import org.opensearch.autotagging.Rule;
-import org.opensearch.index.query.QueryBuilder;
-import org.opensearch.rule.RuleEntityParser;
-import org.opensearch.rule.RuleQueryMapper;
-import org.opensearch.rule.service.IndexStoredRulePersistenceService;
-import org.opensearch.transport.client.Client;
 
 import java.util.Map;
 import java.util.Set;
@@ -85,55 +80,6 @@ public static void assertEqualRule(Rule one, Rule two, boolean ruleUpdated) {
         }
     }
 
-    /**
-     * Used mainly for testing to avoid multiple methods to setup the mock
-     * this builder provides flexibility to inject use case specific mocks
-     */
-    public static class IndexStoredRulePersistenceBuilder {
-        private String indexName;
-        private Client client;
-        private FeatureType featureType;
-        private int maxValuesPerPage;
-        private RuleQueryMapper<QueryBuilder> queryBuilder;
-        private RuleEntityParser parser;
-
-        public IndexStoredRulePersistenceBuilder() {}
-
-        public IndexStoredRulePersistenceBuilder indexName(String indexName) {
-            this.indexName = indexName;
-            return this;
-        }
-
-        public IndexStoredRulePersistenceBuilder client(Client client) {
-            this.client = client;
-            return this;
-        }
-
-        public IndexStoredRulePersistenceBuilder featureType(FeatureType featureType) {
-            this.featureType = featureType;
-            return this;
-        }
-
-        public IndexStoredRulePersistenceBuilder maxValuesPerPage(int maxValuesPerPage) {
-            this.maxValuesPerPage = maxValuesPerPage;
-            return this;
-        }
-
-        public IndexStoredRulePersistenceBuilder queryBuilder(RuleQueryMapper<QueryBuilder> queryBuilder) {
-            this.queryBuilder = queryBuilder;
-            return this;
-        }
-
-        public IndexStoredRulePersistenceBuilder parser(RuleEntityParser parser) {
-            this.parser = parser;
-            return this;
-        }
-
-        public IndexStoredRulePersistenceService build() {
-            return new IndexStoredRulePersistenceService(indexName, client, featureType, maxValuesPerPage, parser, queryBuilder);
-        }
-    }
-
     public static class MockRuleFeatureType implements FeatureType {
 
         public static final MockRuleFeatureType INSTANCE = new MockRuleFeatureType();