Fix IT failure and format code

Signed-off-by: zane-neo <zaniu@amazon.com>
zane-neo · Dec 8, 2023 · 35f0e67 · 35f0e67
1 parent f73c9cf
commit 35f0e67
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestPPLQueryAction.java b/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestPPLQueryAction.java
@@ -15,7 +15,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.function.Supplier;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.OpenSearchSecurityException;
@@ -28,7 +27,6 @@
 import org.opensearch.rest.RestChannel;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.sql.common.antlr.SyntaxCheckException;
-import org.opensearch.sql.common.setting.Settings;
 import org.opensearch.sql.datasources.exceptions.DataSourceClientException;
 import org.opensearch.sql.exception.ExpressionEvaluationException;
 import org.opensearch.sql.exception.QueryEngineException;

diff --git a/plugin/src/main/java/org/opensearch/sql/plugin/transport/TransportPPLQueryAction.java b/plugin/src/main/java/org/opensearch/sql/plugin/transport/TransportPPLQueryAction.java
@@ -11,7 +11,6 @@
 import java.util.Locale;
 import java.util.Optional;
 import java.util.function.Supplier;
-
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
@@ -61,7 +60,6 @@ public TransportPPLQueryAction(
       NodeClient client,
       ClusterService clusterService,
       DataSourceServiceImpl dataSourceService,
-      Settings pluginSettings,
       org.opensearch.common.settings.Settings clusterSettings) {
     super(PPLQueryAction.NAME, transportService, actionFilters, TransportPPLQueryRequest::new);
 
@@ -78,7 +76,10 @@ public TransportPPLQueryAction(
     this.pplEnabled =
         () ->
             MULTI_ALLOW_EXPLICIT_INDEX.get(clusterSettings)
-                && (Boolean) pluginSettings.getSettingValue(Settings.Key.PPL_ENABLED);
+                && (Boolean)
+                    injector
+                        .getInstance(org.opensearch.sql.common.setting.Settings.class)
+                        .getSettingValue(Settings.Key.PPL_ENABLED);
   }
 
   /**
@@ -89,9 +90,10 @@ public TransportPPLQueryAction(
   protected void doExecute(
       Task task, ActionRequest request, ActionListener<TransportPPLQueryResponse> listener) {
     if (!pplEnabled.get()) {
-      listener.onFailure(new IllegalAccessException(
-                  "Either plugins.ppl.enabled or rest.action.multi.allow_explicit_index setting is"
-                      + " false"));
+      listener.onFailure(
+          new IllegalAccessException(
+              "Either plugins.ppl.enabled or rest.action.multi.allow_explicit_index setting is"
+                  + " false"));
       return;
     }
     Metrics.getInstance().getNumericalMetric(MetricName.PPL_REQ_TOTAL).increment();