This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git
The following commit(s) were added to refs/heads/master by this push:
new b75c549 Remove multiple blank lines after import statements
b75c549 is described below
commit b75c549194bcbb1e2c028b28fd1858c4e300bd41
Author: Vladimir Sitnikov <[email protected]>
AuthorDate: Sun Nov 29 14:12:04 2020 +0300
Remove multiple blank lines after import statements
A single blank line between imports and the following javadoc is enough.
---
build.gradle.kts | 1 +
.../java/org/apache/calcite/adapter/enumerable/EnumerableCalcRule.java | 1 -
.../java/org/apache/calcite/adapter/enumerable/EnumerableProject.java | 1 -
.../org/apache/calcite/adapter/enumerable/EnumerableProjectRule.java | 1 -
.../calcite/adapter/enumerable/EnumerableSortedAggregateRule.java | 1 -
.../org/apache/calcite/interpreter/NoneToBindableConverterRule.java | 1 -
core/src/main/java/org/apache/calcite/rex/RexUtil.java | 1 -
core/src/main/java/org/apache/calcite/sql/ddl/SqlDdlNodes.java | 2 --
core/src/main/java/org/apache/calcite/sql/ddl/SqlDropObject.java | 1 -
core/src/test/java/org/apache/calcite/test/MockSqlOperatorTable.java | 1 -
.../java/org/apache/calcite/adapter/elasticsearch/Projection2Test.java | 1 -
mongodb/src/test/java/org/apache/calcite/test/MongoAssertions.java | 1 -
12 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/build.gradle.kts b/build.gradle.kts
index e6e3742..f2734ca 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -474,6 +474,7 @@ allprojects {
"static "
)
removeUnusedImports()
+ replaceRegex("Avoid 2+ blank lines after import",
"^import\\s+([^;]+)\\s*;\\n{3,}", "import \$1;\n\n")
indentWithSpaces(2)
replaceRegex("@Override should not be on its own line",
"(@Override)\\s{2,}", "\$1 ")
replaceRegex("@Test should not be on its own line",
"(@Test)\\s{2,}", "\$1 ")
diff --git
a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCalcRule.java
b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCalcRule.java
index d8c5fe5..1818feb 100644
---
a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCalcRule.java
+++
b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableCalcRule.java
@@ -22,7 +22,6 @@ import org.apache.calcite.rel.RelNode;
import org.apache.calcite.rel.convert.ConverterRule;
import org.apache.calcite.rel.logical.LogicalCalc;
-
/**
* Rule to convert a {@link org.apache.calcite.rel.logical.LogicalCalc} to an
* {@link EnumerableCalc}.
diff --git
a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableProject.java
b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableProject.java
index 4c71883..fe404e1 100644
---
a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableProject.java
+++
b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableProject.java
@@ -32,7 +32,6 @@ import com.google.common.collect.ImmutableList;
import java.util.List;
-
/** Implementation of {@link org.apache.calcite.rel.core.Project} in
* {@link org.apache.calcite.adapter.enumerable.EnumerableConvention
enumerable calling convention}. */
public class EnumerableProject extends Project implements EnumerableRel {
diff --git
a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableProjectRule.java
b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableProjectRule.java
index b5da3cb..3b5420b 100644
---
a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableProjectRule.java
+++
b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableProjectRule.java
@@ -21,7 +21,6 @@ import org.apache.calcite.rel.RelNode;
import org.apache.calcite.rel.convert.ConverterRule;
import org.apache.calcite.rel.logical.LogicalProject;
-
/**
* Rule to convert a {@link org.apache.calcite.rel.logical.LogicalProject} to
an
* {@link EnumerableProject}.
diff --git
a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableSortedAggregateRule.java
b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableSortedAggregateRule.java
index cfc3660..548569f 100644
---
a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableSortedAggregateRule.java
+++
b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableSortedAggregateRule.java
@@ -25,7 +25,6 @@ import org.apache.calcite.rel.core.Aggregate;
import org.apache.calcite.rel.logical.LogicalAggregate;
import org.apache.calcite.util.ImmutableIntList;
-
/**
* Rule to convert a {@link LogicalAggregate}
* to an {@link EnumerableSortedAggregate}.
diff --git
a/core/src/main/java/org/apache/calcite/interpreter/NoneToBindableConverterRule.java
b/core/src/main/java/org/apache/calcite/interpreter/NoneToBindableConverterRule.java
index bdf78ab..51055ec 100644
---
a/core/src/main/java/org/apache/calcite/interpreter/NoneToBindableConverterRule.java
+++
b/core/src/main/java/org/apache/calcite/interpreter/NoneToBindableConverterRule.java
@@ -21,7 +21,6 @@ import org.apache.calcite.plan.RelTraitSet;
import org.apache.calcite.rel.RelNode;
import org.apache.calcite.rel.convert.ConverterRule;
-
/**
* Rule to convert a relational expression from
* {@link org.apache.calcite.plan.Convention#NONE}
diff --git a/core/src/main/java/org/apache/calcite/rex/RexUtil.java
b/core/src/main/java/org/apache/calcite/rex/RexUtil.java
index 53c12ed..bbac26e 100644
--- a/core/src/main/java/org/apache/calcite/rex/RexUtil.java
+++ b/core/src/main/java/org/apache/calcite/rex/RexUtil.java
@@ -69,7 +69,6 @@ import java.util.function.Predicate;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-
/**
* Utility methods concerning row-expressions.
*/
diff --git a/core/src/main/java/org/apache/calcite/sql/ddl/SqlDdlNodes.java
b/core/src/main/java/org/apache/calcite/sql/ddl/SqlDdlNodes.java
index 71dca90..8454809 100644
--- a/core/src/main/java/org/apache/calcite/sql/ddl/SqlDdlNodes.java
+++ b/core/src/main/java/org/apache/calcite/sql/ddl/SqlDdlNodes.java
@@ -26,8 +26,6 @@ import org.apache.calcite.sql.SqlNodeList;
import org.apache.calcite.sql.SqlOperator;
import org.apache.calcite.sql.parser.SqlParserPos;
-
-
/**
* Utilities concerning {@link SqlNode} for DDL.
*/
diff --git a/core/src/main/java/org/apache/calcite/sql/ddl/SqlDropObject.java
b/core/src/main/java/org/apache/calcite/sql/ddl/SqlDropObject.java
index ccc4a2f..278bde6 100644
--- a/core/src/main/java/org/apache/calcite/sql/ddl/SqlDropObject.java
+++ b/core/src/main/java/org/apache/calcite/sql/ddl/SqlDropObject.java
@@ -28,7 +28,6 @@ import com.google.common.collect.ImmutableList;
import java.util.List;
-
/**
* Base class for parse trees of {@code DROP TABLE}, {@code DROP VIEW},
* {@code DROP MATERIALIZED VIEW} and {@code DROP TYPE} statements.
diff --git
a/core/src/test/java/org/apache/calcite/test/MockSqlOperatorTable.java
b/core/src/test/java/org/apache/calcite/test/MockSqlOperatorTable.java
index 407cda9..cb42bff 100644
--- a/core/src/test/java/org/apache/calcite/test/MockSqlOperatorTable.java
+++ b/core/src/test/java/org/apache/calcite/test/MockSqlOperatorTable.java
@@ -40,7 +40,6 @@ import org.apache.calcite.util.Optionality;
import com.google.common.collect.ImmutableList;
-
/**
* Mock operator table for testing purposes. Contains the standard SQL operator
* table, plus a list of operators.
diff --git
a/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/Projection2Test.java
b/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/Projection2Test.java
index 56c1a73..d17faea 100644
---
a/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/Projection2Test.java
+++
b/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/Projection2Test.java
@@ -47,7 +47,6 @@ import java.util.regex.PatternSyntaxException;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
-
/**
* Checks renaming of fields (also upper, lower cases) during projections.
*/
diff --git a/mongodb/src/test/java/org/apache/calcite/test/MongoAssertions.java
b/mongodb/src/test/java/org/apache/calcite/test/MongoAssertions.java
index d1307aa..8f637c3 100644
--- a/mongodb/src/test/java/org/apache/calcite/test/MongoAssertions.java
+++ b/mongodb/src/test/java/org/apache/calcite/test/MongoAssertions.java
@@ -34,7 +34,6 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
-
/**
* Util class which needs to be in the same package as {@link CalciteAssert}
* due to package-private visibility.
