Fix style + Ryan's comments

Signed-off-by: Simeon Widdis <[email protected]>

Author: Swiddis

ppl/src/test/java/org/opensearch/sql/ppl/AstPlanningTest.java

@@ -11,15 +11,13 @@
 import org.opensearch.sql.ppl.antlr.PPLSyntaxParser;
 import org.opensearch.sql.ppl.parser.AstBuilder;
 
-/**
- * Base class for tests for the AST query planner.
- */
+/** Base class for tests for the AST query planner. */
 public class AstPlanningTest {
-    public final Settings settings = Mockito.mock(Settings.class);
-    public final PPLSyntaxParser parser = new PPLSyntaxParser();
+  protected final Settings settings = Mockito.mock(Settings.class);
+  protected final PPLSyntaxParser parser = new PPLSyntaxParser();
 
-    public Node plan(String query) {
-        AstBuilder astBuilder = new AstBuilder(query, settings);
-        return astBuilder.visit(parser.parse(query));
-    }
+  protected Node plan(String query) {
+    AstBuilder astBuilder = new AstBuilder(query, settings);
+    return astBuilder.visit(parser.parse(query));
+  }
 }

ppl/src/test/java/org/opensearch/sql/ppl/parser/AstBuilderTest.java

@@ -60,7 +60,6 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.mockito.Mockito;
 import org.opensearch.sql.ast.Node;
 import org.opensearch.sql.ast.dsl.AstDSL;
 import org.opensearch.sql.ast.expression.DataType;
@@ -74,10 +73,8 @@
 import org.opensearch.sql.ast.tree.ML;
 import org.opensearch.sql.ast.tree.RareTopN.CommandType;
 import org.opensearch.sql.common.antlr.SyntaxCheckException;
-import org.opensearch.sql.common.setting.Settings;
 import org.opensearch.sql.common.setting.Settings.Key;
 import org.opensearch.sql.ppl.AstPlanningTest;
-import org.opensearch.sql.ppl.antlr.PPLSyntaxParser;
 import org.opensearch.sql.utils.SystemIndexUtils;
 
 public class AstBuilderTest extends AstPlanningTest {

ppl/src/test/java/org/opensearch/sql/ppl/parser/AstEquivalenceTest.java

@@ -5,24 +5,25 @@
 
 package org.opensearch.sql.ppl.parser;
 
+import static org.junit.Assert.assertEquals;
+
 import org.junit.Test;
 import org.opensearch.sql.ppl.AstPlanningTest;
 
-import static org.junit.Assert.assertEquals;
-
 public class AstEquivalenceTest extends AstPlanningTest {
-    @Test
-    public void testSpathArgumentDeshuffle() {
-        assertEquals(plan("source = t | spath path=a input=a"), plan("source = t | spath input=a a"));
-    }
+  @Test
+  public void testSpathArgumentDeshuffle() {
+    assertEquals(plan("source = t | spath path=a input=a"), plan("source = t | spath input=a a"));
+  }
 
-    @Test
-    public void testHeadLimitEquivalent() {
-        assertEquals(plan("source = t | head limit=50"), plan("source = t | head 50"));
-    }
+  @Test
+  public void testHeadLimitEquivalent() {
+    assertEquals(plan("source = t | head limit=50"), plan("source = t | head 50"));
+  }
 
-    @Test
-    public void testTopLimitEquivalent() {
-        assertEquals(plan("source = t | top limit=50 field_name"), plan("source = t | top 50 field_name"));
-    }
+  @Test
+  public void testTopLimitEquivalent() {
+    assertEquals(
+        plan("source = t | top limit=50 field_name"), plan("source = t | top 50 field_name"));
+  }
 }

ppl/src/test/java/org/opensearch/sql/ppl/utils/SPathRewriteTest.java

@@ -15,14 +15,9 @@
 import static org.opensearch.sql.ast.dsl.AstDSL.stringLiteral;
 
 import org.junit.Test;
-import org.mockito.Mockito;
-import org.opensearch.sql.ast.Node;
 import org.opensearch.sql.ast.tree.Eval;
 import org.opensearch.sql.ast.tree.SPath;
-import org.opensearch.sql.common.setting.Settings;
 import org.opensearch.sql.ppl.AstPlanningTest;
-import org.opensearch.sql.ppl.antlr.PPLSyntaxParser;
-import org.opensearch.sql.ppl.parser.AstBuilder;
 
 public class SPathRewriteTest extends AstPlanningTest {
   // Control test to make sure something fundamental hasn't changed about the json_extract parsing