You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by vl...@apache.org on 2020/11/29 12:33:27 UTC
[calcite] branch master updated: Remove multiple blank lines after
package statements
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 1f14e97 Remove multiple blank lines after package statements
1f14e97 is described below
commit 1f14e97060df55f873dd2f124caea90f39511512
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Sun Nov 29 15:32:56 2020 +0300
Remove multiple blank lines after package statements
A single blank line after package is enough.
---
build.gradle.kts | 1 +
core/src/main/java/org/apache/calcite/plan/CommonRelSubExprRule.java | 1 -
core/src/main/java/org/apache/calcite/rel/type/DynamicRecordType.java | 1 -
core/src/main/java/org/apache/calcite/schema/SemiMutableSchema.java | 1 -
core/src/main/java/org/apache/calcite/sql/SqlOperandCountRange.java | 1 -
core/src/main/java/org/apache/calcite/sql/util/IdPair.java | 1 -
core/src/main/java/org/apache/calcite/sql/validate/ScopeChild.java | 1 -
core/src/main/java/org/apache/calcite/sql/validate/SqlConformance.java | 1 -
.../main/java/org/apache/calcite/linq4j/tree/ConstructorDeclaration.java | 1 -
.../src/main/java/org/apache/calcite/linq4j/tree/MethodDeclaration.java | 1 -
10 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/build.gradle.kts b/build.gradle.kts
index f2734ca..31703fa 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -474,6 +474,7 @@ allprojects {
"static "
)
removeUnusedImports()
+ replaceRegex("Avoid 2+ blank lines after package", "^package\\s+([^;]+)\\s*;\\n{3,}", "package \$1;\n\n")
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 ")
diff --git a/core/src/main/java/org/apache/calcite/plan/CommonRelSubExprRule.java b/core/src/main/java/org/apache/calcite/plan/CommonRelSubExprRule.java
index 4e3ce99..e39f7e0 100644
--- a/core/src/main/java/org/apache/calcite/plan/CommonRelSubExprRule.java
+++ b/core/src/main/java/org/apache/calcite/plan/CommonRelSubExprRule.java
@@ -16,7 +16,6 @@
*/
package org.apache.calcite.plan;
-
/**
* A <code>CommonRelSubExprRule</code> is an abstract base class for rules
* that are fired only on relational expressions that appear more than once
diff --git a/core/src/main/java/org/apache/calcite/rel/type/DynamicRecordType.java b/core/src/main/java/org/apache/calcite/rel/type/DynamicRecordType.java
index a76e147..99461ce 100644
--- a/core/src/main/java/org/apache/calcite/rel/type/DynamicRecordType.java
+++ b/core/src/main/java/org/apache/calcite/rel/type/DynamicRecordType.java
@@ -16,7 +16,6 @@
*/
package org.apache.calcite.rel.type;
-
/**
* Specific type of RelRecordType that corresponds to a dynamic table,
* where columns are created as they are requested.
diff --git a/core/src/main/java/org/apache/calcite/schema/SemiMutableSchema.java b/core/src/main/java/org/apache/calcite/schema/SemiMutableSchema.java
index e2835a4..002bbc9 100644
--- a/core/src/main/java/org/apache/calcite/schema/SemiMutableSchema.java
+++ b/core/src/main/java/org/apache/calcite/schema/SemiMutableSchema.java
@@ -16,7 +16,6 @@
*/
package org.apache.calcite.schema;
-
/**
* Schema to which materializations can be added.
*/
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlOperandCountRange.java b/core/src/main/java/org/apache/calcite/sql/SqlOperandCountRange.java
index 88382f7..4365afe 100644
--- a/core/src/main/java/org/apache/calcite/sql/SqlOperandCountRange.java
+++ b/core/src/main/java/org/apache/calcite/sql/SqlOperandCountRange.java
@@ -16,7 +16,6 @@
*/
package org.apache.calcite.sql;
-
/**
* A class that describes how many operands an operator can take.
*/
diff --git a/core/src/main/java/org/apache/calcite/sql/util/IdPair.java b/core/src/main/java/org/apache/calcite/sql/util/IdPair.java
index 9cd211d..7b320b8 100644
--- a/core/src/main/java/org/apache/calcite/sql/util/IdPair.java
+++ b/core/src/main/java/org/apache/calcite/sql/util/IdPair.java
@@ -16,7 +16,6 @@
*/
package org.apache.calcite.sql.util;
-
import java.util.List;
import java.util.Map;
import java.util.Objects;
diff --git a/core/src/main/java/org/apache/calcite/sql/validate/ScopeChild.java b/core/src/main/java/org/apache/calcite/sql/validate/ScopeChild.java
index 9a6c8d7..9186daf 100644
--- a/core/src/main/java/org/apache/calcite/sql/validate/ScopeChild.java
+++ b/core/src/main/java/org/apache/calcite/sql/validate/ScopeChild.java
@@ -16,7 +16,6 @@
*/
package org.apache.calcite.sql.validate;
-
/** One of the inputs of a {@link SqlValidatorScope}.
*
* <p>Most commonly, it is an item in a FROM clause, and consists of a namespace
diff --git a/core/src/main/java/org/apache/calcite/sql/validate/SqlConformance.java b/core/src/main/java/org/apache/calcite/sql/validate/SqlConformance.java
index 70bd4ce..e971319 100644
--- a/core/src/main/java/org/apache/calcite/sql/validate/SqlConformance.java
+++ b/core/src/main/java/org/apache/calcite/sql/validate/SqlConformance.java
@@ -16,7 +16,6 @@
*/
package org.apache.calcite.sql.validate;
-
/**
* Enumeration of valid SQL compatibility modes.
*
diff --git a/linq4j/src/main/java/org/apache/calcite/linq4j/tree/ConstructorDeclaration.java b/linq4j/src/main/java/org/apache/calcite/linq4j/tree/ConstructorDeclaration.java
index aff9d78..bc88265 100644
--- a/linq4j/src/main/java/org/apache/calcite/linq4j/tree/ConstructorDeclaration.java
+++ b/linq4j/src/main/java/org/apache/calcite/linq4j/tree/ConstructorDeclaration.java
@@ -16,7 +16,6 @@
*/
package org.apache.calcite.linq4j.tree;
-
import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
import java.util.Iterator;
diff --git a/linq4j/src/main/java/org/apache/calcite/linq4j/tree/MethodDeclaration.java b/linq4j/src/main/java/org/apache/calcite/linq4j/tree/MethodDeclaration.java
index a864f61..477cb2b 100644
--- a/linq4j/src/main/java/org/apache/calcite/linq4j/tree/MethodDeclaration.java
+++ b/linq4j/src/main/java/org/apache/calcite/linq4j/tree/MethodDeclaration.java
@@ -16,7 +16,6 @@
*/
package org.apache.calcite.linq4j.tree;
-
import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
import java.util.Iterator;