Merge branch 'dev/GJF1_testing' into dev/sl_GoogleJavaFormat1

MitchellGale · MitchellGale · commit 7c1b27ac2923 · 2023-08-03T09:43:47.000-07:00
diff --git a/build.gradle b/build.gradle
@@ -97,7 +97,7 @@ spotless {
 //                " */\n\n")
 //        removeUnusedImports()
 //        trimTrailingWhitespace()
-//        endWithNewline()
+        endWithNewline()
         googleJavaFormat('1.17.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
     }
 }
diff --git a/core/src/main/java/org/opensearch/sql/analysis/SelectExpressionAnalyzer.java b/core/src/main/java/org/opensearch/sql/analysis/SelectExpressionAnalyzer.java
@@ -70,18 +70,17 @@ public List<NamedExpression> visitAlias(Alias node, AnalysisContext context) {
   }
 
   /**
-   * The Alias could be<br>
-   *
+   * The Alias could be
    * <ol>
-   *   <li>ELECT name, AVG(age) FROM s BY name -><br>
-   *       Project(Alias("name", expr), Alias("AVG(age)", aggExpr))<br>
-   *       Agg(Alias("AVG(age)", aggExpr))
-   *   <li>SELECT length(name), AVG(age) FROM s BY length(name)<br>
-   *       Project(Alias("name", expr), Alias("AVG(age)", aggExpr))<br>
-   *       Agg(Alias("AVG(age)", aggExpr))
-   *   <li>SELECT length(name) as l, AVG(age) FROM s BY l<br>
-   *       Project(Alias("name", expr, l), Alias("AVG(age)", aggExpr))<br>
-   *       Agg(Alias("AVG(age)", aggExpr), Alias("length(name)", groupExpr))<br>
+   *     <li>1. SELECT name, AVG(age) FROM s BY name ->
+   *     Project(Alias("name", expr), Alias("AVG(age)", aggExpr))
+   *     Agg(Alias("AVG(age)", aggExpr))</li>
+   *     <li>SELECT length(name), AVG(age) FROM s BY length(name)
+   *     Project(Alias("name", expr), Alias("AVG(age)", aggExpr))
+   *     Agg(Alias("AVG(age)", aggExpr))</li>
+   *     <li>SELECT length(name) as l, AVG(age) FROM s BY l
+   *     Project(Alias("name", expr, l), Alias("AVG(age)", aggExpr))
+   *     Agg(Alias("AVG(age)", aggExpr), Alias("length(name)", groupExpr))</li>
    * </ol>
    */
   private Expression referenceIfSymbolDefined(Alias expr, AnalysisContext context) {

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ spotless {`
`97`	`97`	`// " */\n\n")`
`98`	`98`	`// removeUnusedImports()`
`99`	`99`	`// trimTrailingWhitespace()`
`100`		`-// endWithNewline()`
	`100`	`+ endWithNewline()`
`101`	`101`	`googleJavaFormat('1.17.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')`
`102`	`102`	`}`
`103`	`103`	`}`