Skip to content

Commit de6831d

Browse files
committed
revert ast changes as was covered in spotless #1 PR for GJF.
Signed-off-by: Mitchell Gale <[email protected]>
1 parent b95580d commit de6831d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+373
-160
lines changed

core/src/main/java/org/opensearch/sql/ast/AbstractNodeVisitor.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
67
package org.opensearch.sql.ast;
78

89
import org.opensearch.sql.ast.expression.AggregateFunction;
@@ -61,7 +62,9 @@
6162
import org.opensearch.sql.ast.tree.TableFunction;
6263
import org.opensearch.sql.ast.tree.Values;
6364

64-
/** AST nodes visitor Defines the traverse path. */
65+
/**
66+
* AST nodes visitor Defines the traverse path.
67+
*/
6568
public abstract class AbstractNodeVisitor<T, C> {
6669

6770
public T visit(Node node, C context) {
@@ -70,7 +73,6 @@ public T visit(Node node, C context) {
7073

7174
/**
7275
* Visit child node.
73-
*
7476
* @param node {@link Node}
7577
* @param context Context
7678
* @return Return Type.

core/src/main/java/org/opensearch/sql/ast/Node.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
67
package org.opensearch.sql.ast;
78

89
import java.util.List;
910
import lombok.EqualsAndHashCode;
1011
import lombok.ToString;
1112

12-
/** AST node. */
13+
/**
14+
* AST node.
15+
*/
1316
@EqualsAndHashCode
1417
@ToString
1518
public abstract class Node {

core/src/main/java/org/opensearch/sql/ast/dsl/AstDSL.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,4 +465,4 @@ public static Parse parse(UnresolvedPlan input, ParseMethod parseMethod,
465465
return new Parse(parseMethod, sourceField, pattern, arguments, input);
466466
}
467467

468-
}
468+
}

core/src/main/java/org/opensearch/sql/ast/expression/AggregateFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import org.opensearch.sql.common.utils.StringUtils;
1818

1919
/**
20-
* Expression node of aggregate functions.<br>
20+
* Expression node of aggregate functions.
2121
* Params include aggregate function name (AVG, SUM, MAX etc.) and the field to aggregate.
2222
*/
2323
@Getter

core/src/main/java/org/opensearch/sql/ast/expression/Alias.java

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
67
package org.opensearch.sql.ast.expression;
78

89
import lombok.AllArgsConstructor;
@@ -13,10 +14,10 @@
1314
import org.opensearch.sql.ast.AbstractNodeVisitor;
1415

1516
/**
16-
* Alias abstraction that associate an unnamed expression with a name and an optional alias. The
17-
* name and alias information preserved is useful for semantic analysis and response formatting
18-
* eventually. This can avoid restoring the info in toString() method which is inaccurate because
19-
* original info is already lost.
17+
* Alias abstraction that associate an unnamed expression with a name and an optional alias.
18+
* The name and alias information preserved is useful for semantic analysis and response
19+
* formatting eventually. This can avoid restoring the info in toString() method which is
20+
* inaccurate because original info is already lost.
2021
*/
2122
@AllArgsConstructor
2223
@EqualsAndHashCode(callSuper = false)
@@ -25,13 +26,19 @@
2526
@ToString
2627
public class Alias extends UnresolvedExpression {
2728

28-
/** Original field name. */
29+
/**
30+
* Original field name.
31+
*/
2932
private final String name;
3033

31-
/** Expression aliased. */
34+
/**
35+
* Expression aliased.
36+
*/
3237
private final UnresolvedExpression delegated;
3338

34-
/** Optional field alias. */
39+
/**
40+
* Optional field alias.
41+
*/
3542
private String alias;
3643

3744
@Override

core/src/main/java/org/opensearch/sql/ast/expression/AllFields.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
67
package org.opensearch.sql.ast.expression;
78

89
import java.util.Collections;
@@ -12,13 +13,16 @@
1213
import org.opensearch.sql.ast.AbstractNodeVisitor;
1314
import org.opensearch.sql.ast.Node;
1415

15-
/** Represent the All fields which is been used in SELECT *. */
16+
/**
17+
* Represent the All fields which is been used in SELECT *.
18+
*/
1619
@ToString
1720
@EqualsAndHashCode(callSuper = false)
1821
public class AllFields extends UnresolvedExpression {
1922
public static final AllFields INSTANCE = new AllFields();
2023

21-
private AllFields() {}
24+
private AllFields() {
25+
}
2226

2327
public static AllFields of() {
2428
return INSTANCE;

core/src/main/java/org/opensearch/sql/ast/expression/And.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
67
package org.opensearch.sql.ast.expression;
78

89
import java.util.Arrays;
@@ -13,7 +14,9 @@
1314
import lombok.ToString;
1415
import org.opensearch.sql.ast.AbstractNodeVisitor;
1516

16-
/** Expression node of logic AND. */
17+
/**
18+
* Expression node of logic AND.
19+
*/
1720
@Getter
1821
@ToString
1922
@EqualsAndHashCode(callSuper = false)

core/src/main/java/org/opensearch/sql/ast/expression/Argument.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
67
package org.opensearch.sql.ast.expression;
78

89
import java.util.Arrays;
@@ -13,7 +14,9 @@
1314
import lombok.ToString;
1415
import org.opensearch.sql.ast.AbstractNodeVisitor;
1516

16-
/** Argument. */
17+
/**
18+
* Argument.
19+
*/
1720
@Getter
1821
@ToString
1922
@RequiredArgsConstructor

core/src/main/java/org/opensearch/sql/ast/expression/AttributeList.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
67
package org.opensearch.sql.ast.expression;
78

89
import com.google.common.collect.ImmutableList;
@@ -13,12 +14,15 @@
1314
import lombok.ToString;
1415
import org.opensearch.sql.ast.AbstractNodeVisitor;
1516

16-
/** Expression node that includes a list of Expression nodes. */
17+
/**
18+
* Expression node that includes a list of Expression nodes.
19+
*/
1720
@ToString
1821
@EqualsAndHashCode(callSuper = false)
1922
@AllArgsConstructor
2023
public class AttributeList extends UnresolvedExpression {
21-
@Getter private List<UnresolvedExpression> attrList;
24+
@Getter
25+
private List<UnresolvedExpression> attrList;
2226

2327
@Override
2428
public List<UnresolvedExpression> getChild() {

core/src/main/java/org/opensearch/sql/ast/expression/Between.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
import org.opensearch.sql.ast.AbstractNodeVisitor;
1313
import org.opensearch.sql.ast.Node;
1414

15-
/** Unresolved expression for BETWEEN. */
15+
/**
16+
* Unresolved expression for BETWEEN.
17+
*/
1618
@Data
1719
@EqualsAndHashCode(callSuper = false)
1820
public class Between extends UnresolvedExpression {

0 commit comments

Comments
 (0)