From 929ef7df2aff37cdaa2e19e0c51214371c35fab4 Mon Sep 17 00:00:00 2001
From: Siddhant Deshmukh <deshsid@amazon.com>
Date: Mon, 16 Oct 2023 14:32:46 -0700
Subject: [PATCH] Refactoring and renaming

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>
---
 ...Categorizor.java => SearchQueryCategorizer.java} | 10 +++++-----
 .../action/search/TransportSearchAction.java        |  8 ++++----
 .../org/opensearch/common/util/FeatureFlags.java    | 13 +------------
 3 files changed, 10 insertions(+), 21 deletions(-)
 rename server/src/main/java/org/opensearch/action/search/{SearchQueryCategorizor.java => SearchQueryCategorizer.java} (90%)

diff --git a/server/src/main/java/org/opensearch/action/search/SearchQueryCategorizor.java b/server/src/main/java/org/opensearch/action/search/SearchQueryCategorizer.java
similarity index 90%
rename from server/src/main/java/org/opensearch/action/search/SearchQueryCategorizor.java
rename to server/src/main/java/org/opensearch/action/search/SearchQueryCategorizer.java
index 9f6e4de95a704..bfe96be3e05d1 100644
--- a/server/src/main/java/org/opensearch/action/search/SearchQueryCategorizor.java
+++ b/server/src/main/java/org/opensearch/action/search/SearchQueryCategorizer.java
@@ -24,13 +24,13 @@
  * Class to categorize the search queries based on the type and increment the relevant counters.
  * Class also logs the query shape.
  */
-public class SearchQueryCategorizor {
+public class SearchQueryCategorizer {
 
-    private static final Logger log = LogManager.getLogger(SearchQueryCategorizor.class);
+    private static final Logger log = LogManager.getLogger(SearchQueryCategorizer.class);
 
     public SearchQueryCounters searchQueryCounters;
 
-    public SearchQueryCategorizor(MetricsRegistry metricsRegistry) {
+    public SearchQueryCategorizer(MetricsRegistry metricsRegistry) {
         searchQueryCounters = new SearchQueryCounters(metricsRegistry);
     }
 
@@ -71,8 +71,8 @@ private void logQueryShape(QueryBuilder topLevelQueryBuilder) {
         }
         QueryShapeVisitor shapeVisitor = new QueryShapeVisitor();
         topLevelQueryBuilder.visit(shapeVisitor);
-        String queryShapeJson = shapeVisitor.prettyPrintTree("  ");
-        log.debug("Query shape : " + queryShapeJson);
+        String indentedQueryShape = shapeVisitor.prettyPrintTree("  ");
+        log.debug("Query shape : " + indentedQueryShape);
     }
 
 }
diff --git a/server/src/main/java/org/opensearch/action/search/TransportSearchAction.java b/server/src/main/java/org/opensearch/action/search/TransportSearchAction.java
index 632abad2b06d1..cf04d9b2618df 100644
--- a/server/src/main/java/org/opensearch/action/search/TransportSearchAction.java
+++ b/server/src/main/java/org/opensearch/action/search/TransportSearchAction.java
@@ -191,7 +191,7 @@ public class TransportSearchAction extends HandledTransportAction<SearchRequest,
 
     private final MetricsRegistry metricsRegistry;
 
-    private SearchQueryCategorizor searchQueryCategorizor;
+    private SearchQueryCategorizer searchQueryCategorizer;
 
     @Inject
     public TransportSearchAction(
@@ -234,8 +234,8 @@ public TransportSearchAction(
 
     private void setIsSearchQueryCategorizationEnabled(boolean isSearchQueryCategorizationEnabled) {
         this.isSearchQueryCategorizationEnabled = isSearchQueryCategorizationEnabled;
-        if (this.isSearchQueryCategorizationEnabled && this.searchQueryCategorizor == null) {
-            this.searchQueryCategorizor = new SearchQueryCategorizor(metricsRegistry);
+        if (this.isSearchQueryCategorizationEnabled && this.searchQueryCategorizer == null) {
+            this.searchQueryCategorizer = new SearchQueryCategorizer(metricsRegistry);
         }
     }
 
@@ -517,7 +517,7 @@ private void executeRequest(
 
         if (isSearchQueryCategorizationEnabled) {
             try {
-                searchQueryCategorizor.categorize(searchRequest.source());
+                searchQueryCategorizer.categorize(searchRequest.source());
             } catch (Exception e) {
                 logger.error("Error while trying to categorize the query.");
             }
diff --git a/server/src/main/java/org/opensearch/common/util/FeatureFlags.java b/server/src/main/java/org/opensearch/common/util/FeatureFlags.java
index 8f5bc00f0f7eb..0fb5cbb18df19 100644
--- a/server/src/main/java/org/opensearch/common/util/FeatureFlags.java
+++ b/server/src/main/java/org/opensearch/common/util/FeatureFlags.java
@@ -59,12 +59,7 @@ public class FeatureFlags {
      * Gates the optimization of datetime formatters caching along with change in default datetime formatter.
      */
     public static final String DATETIME_FORMATTER_CACHING = "opensearch.experimental.optimization.datetime_formatter_caching.enabled";
-
-    /**
-     * Gates the query categorization by type feature.
-     */
-    public static final String QUERY_CATEOGORIZATION = "opensearch.experimental.feature.query_categorization.enabled";
-
+    
     /**
      * Should store the settings from opensearch.yml.
      */
@@ -127,10 +122,4 @@ public static boolean isEnabled(Setting<Boolean> featureFlag) {
         true,
         Property.NodeScope
     );
-
-    public static final Setting<Boolean> QUERY_CATEGORIZATION_SETTING = Setting.boolSetting(
-        QUERY_CATEOGORIZATION,
-        false,
-        Property.NodeScope
-    );
 }