This is an automated email from the ASF dual-hosted git repository.
leesf pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hudi.git
The following commit(s) were added to refs/heads/master by this push:
new b284091 [HUDI-386] Refactor hudi scala checkstyle rules (#1099)
b284091 is described below
commit b284091783af44341f20af11825ea9b6e3ba23da
Author: lamber-ken <lamber...@163.com>
AuthorDate: Sun Dec 22 07:30:07 2019 +0800
[HUDI-386] Refactor hudi scala checkstyle rules (#1099)
---
pom.xml | 2 +-
style/checkstyle.xml | 2 +-
style/scalastyle-config.xml | 114 -------------------------------------
style/scalastyle.xml | 134 ++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 136 insertions(+), 116 deletions(-)
diff --git a/pom.xml b/pom.xml
index c61e4a6..ab99498 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,7 +163,7 @@
<failOnWarning>false</failOnWarning>
<sourceDirectory>${project.basedir}/src/main/scala</sourceDirectory>
<testSourceDirectory>${project.basedir}/src/test/scala</testSourceDirectory>
-
<configLocation>${main.basedir}/style/scalastyle-config.xml</configLocation>
+ <configLocation>${main.basedir}/style/scalastyle.xml</configLocation>
<outputEncoding>UTF-8</outputEncoding>
</configuration>
<executions>
diff --git a/style/checkstyle.xml b/style/checkstyle.xml
index 10ef5fc..24dfbb6 100644
--- a/style/checkstyle.xml
+++ b/style/checkstyle.xml
@@ -24,7 +24,7 @@
that can be found at https://google.github.io/styleguide/javaguide.html.
Checkstyle is very configurable. Be sure to read the documentation at
- http://checkstyle.sf.net (or in your downloaded distribution).
+ https://checkstyle.sourceforge.io/checks.html.
To completely disable a check, just comment it out or delete it from the
file.
diff --git a/style/scalastyle-config.xml b/style/scalastyle-config.xml
deleted file mode 100644
index c3d551d..0000000
--- a/style/scalastyle-config.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<scalastyle>
- <name>Scalastyle standard configuration</name>
- <check level="warning" class="org.scalastyle.file.FileTabChecker"
enabled="true"/>
- <check level="warning" class="org.scalastyle.file.FileLengthChecker"
enabled="true">
- <parameters>
- <parameter name="maxFileLength"><![CDATA[800]]></parameter>
- </parameters>
- </check>
- <check level="warning"
class="org.scalastyle.scalariform.SpacesAfterPlusChecker" enabled="true"/>
- <check level="warning" class="org.scalastyle.file.WhitespaceEndOfLineChecker"
enabled="true"/>
- <check level="warning"
class="org.scalastyle.scalariform.SpacesBeforePlusChecker" enabled="true"/>
- <check level="warning" class="org.scalastyle.file.FileLineLengthChecker"
enabled="true">
- <parameters>
- <parameter name="maxLineLength"><![CDATA[160]]></parameter>
- <parameter name="tabSize"><![CDATA[4]]></parameter>
- </parameters>
- </check>
- <check level="warning" class="org.scalastyle.scalariform.ClassNamesChecker"
enabled="true">
- <parameters>
- <parameter name="regex"><![CDATA[[A-Z][A-Za-z]*]]></parameter>
- </parameters>
- </check>
- <check level="warning" class="org.scalastyle.scalariform.ObjectNamesChecker"
enabled="true">
- <parameters>
- <parameter name="regex"><![CDATA[[A-Z][A-Za-z]*]]></parameter>
- </parameters>
- </check>
- <check level="warning"
class="org.scalastyle.scalariform.PackageObjectNamesChecker" enabled="true">
- <parameters>
- <parameter name="regex"><![CDATA[^[a-z][A-Za-z]*$]]></parameter>
- </parameters>
- </check>
- <check level="warning"
class="org.scalastyle.scalariform.EqualsHashCodeChecker" enabled="true"/>
- <check level="warning"
class="org.scalastyle.scalariform.IllegalImportsChecker" enabled="true">
- <parameters>
- <parameter name="illegalImports"><![CDATA[sun._,java.awt._]]></parameter>
- </parameters>
- </check>
- <check level="warning"
class="org.scalastyle.scalariform.ParameterNumberChecker" enabled="true">
- <parameters>
- <parameter name="maxParameters"><![CDATA[8]]></parameter>
- </parameters>
- </check>
- <check level="warning" class="org.scalastyle.scalariform.MagicNumberChecker"
enabled="true">
- <parameters>
- <parameter name="ignore"><![CDATA[-1,0,1,2,3]]></parameter>
- </parameters>
- </check>
- <check level="warning"
class="org.scalastyle.scalariform.NoWhitespaceBeforeLeftBracketChecker"
enabled="true"/>
- <check level="warning"
class="org.scalastyle.scalariform.NoWhitespaceAfterLeftBracketChecker"
enabled="true"/>
- <check level="warning" class="org.scalastyle.scalariform.ReturnChecker"
enabled="true"/>
- <check level="warning" class="org.scalastyle.scalariform.NullChecker"
enabled="true"/>
- <check level="warning" class="org.scalastyle.scalariform.NoCloneChecker"
enabled="true"/>
- <check level="warning" class="org.scalastyle.scalariform.NoFinalizeChecker"
enabled="true"/>
- <check level="warning"
class="org.scalastyle.scalariform.CovariantEqualsChecker" enabled="true"/>
- <check level="warning"
class="org.scalastyle.scalariform.StructuralTypeChecker" enabled="true"/>
- <check level="warning" class="org.scalastyle.file.RegexChecker"
enabled="true">
- <parameters>
- <parameter name="regex"><![CDATA[println]]></parameter>
- </parameters>
- </check>
- <check level="warning"
class="org.scalastyle.scalariform.NumberOfTypesChecker" enabled="true">
- <parameters>
- <parameter name="maxTypes"><![CDATA[30]]></parameter>
- </parameters>
- </check>
- <check level="warning"
class="org.scalastyle.scalariform.CyclomaticComplexityChecker" enabled="true">
- <parameters>
- <parameter name="maximum"><![CDATA[10]]></parameter>
- </parameters>
- </check>
- <check level="warning" class="org.scalastyle.scalariform.UppercaseLChecker"
enabled="true"/>
- <check level="warning"
class="org.scalastyle.scalariform.SimplifyBooleanExpressionChecker"
enabled="true"/>
- <check level="warning" class="org.scalastyle.scalariform.IfBraceChecker"
enabled="true">
- <parameters>
- <parameter name="singleLineAllowed"><![CDATA[true]]></parameter>
- <parameter name="doubleLineAllowed"><![CDATA[false]]></parameter>
- </parameters>
- </check>
- <check level="warning" class="org.scalastyle.scalariform.MethodLengthChecker"
enabled="true">
- <parameters>
- <parameter name="maxLength"><![CDATA[50]]></parameter>
- </parameters>
- </check>
- <check level="warning" class="org.scalastyle.scalariform.MethodNamesChecker"
enabled="true">
- <parameters>
- <parameter name="regex"><![CDATA[^[a-z][A-Za-z0-9]*$]]></parameter>
- </parameters>
- </check>
- <check level="warning"
class="org.scalastyle.scalariform.NumberOfMethodsInTypeChecker" enabled="true">
- <parameters>
- <parameter name="maxMethods"><![CDATA[30]]></parameter>
- </parameters>
- </check>
- <check level="warning"
class="org.scalastyle.scalariform.PublicMethodsHaveTypeChecker" enabled="true"/>
- <check level="warning" class="org.scalastyle.file.NewLineAtEofChecker"
enabled="true"/>
- <check level="warning" class="org.scalastyle.file.NoNewLineAtEofChecker"
enabled="false"/>
-</scalastyle>
diff --git a/style/scalastyle.xml b/style/scalastyle.xml
new file mode 100644
index 0000000..7ad1d5e
--- /dev/null
+++ b/style/scalastyle.xml
@@ -0,0 +1,134 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+
+ Checkstyle is very configurable. Be sure to read the documentation at
+ http://www.scalastyle.org/rules-1.0.0.html.
+
+ -->
+
+<scalastyle>
+ <name>Scalastyle standard configuration</name>
+ <check level="error" class="org.scalastyle.file.FileTabChecker"
enabled="true"/>
+ <check level="error" class="org.scalastyle.file.FileLengthChecker"
enabled="true">
+ <parameters>
+ <parameter name="maxFileLength"><![CDATA[800]]></parameter>
+ </parameters>
+ </check>
+ <check level="error"
class="org.scalastyle.scalariform.SpacesAfterPlusChecker" enabled="true"/>
+ <check level="error" class="org.scalastyle.file.WhitespaceEndOfLineChecker"
enabled="true"/>
+ <check level="error"
class="org.scalastyle.scalariform.SpacesBeforePlusChecker" enabled="true"/>
+ <check level="error" class="org.scalastyle.file.FileLineLengthChecker"
enabled="false">
+ <parameters>
+ <parameter name="maxLineLength"><![CDATA[160]]></parameter>
+ <parameter name="tabSize"><![CDATA[4]]></parameter>
+ </parameters>
+ </check>
+ <check level="error" class="org.scalastyle.scalariform.ClassNamesChecker"
enabled="true">
+ <parameters>
+ <parameter name="regex"><![CDATA[[A-Z][A-Za-z]*]]></parameter>
+ </parameters>
+ </check>
+ <check level="error" class="org.scalastyle.scalariform.ObjectNamesChecker"
enabled="true">
+ <parameters>
+ <parameter name="regex"><![CDATA[[A-Z][A-Za-z]*]]></parameter>
+ </parameters>
+ </check>
+ <check level="error"
class="org.scalastyle.scalariform.PackageObjectNamesChecker" enabled="true">
+ <parameters>
+ <parameter name="regex"><![CDATA[^[a-z][A-Za-z]*$]]></parameter>
+ </parameters>
+ </check>
+ <check level="error" class="org.scalastyle.scalariform.EqualsHashCodeChecker"
enabled="true"/>
+ <check level="error" class="org.scalastyle.scalariform.IllegalImportsChecker"
enabled="true">
+ <parameters>
+ <parameter name="illegalImports"><![CDATA[sun._,java.awt._]]></parameter>
+ </parameters>
+ </check>
+ <check level="error"
class="org.scalastyle.scalariform.ParameterNumberChecker" enabled="true">
+ <parameters>
+ <parameter name="maxParameters"><![CDATA[8]]></parameter>
+ </parameters>
+ </check>
+ <check level="error" class="org.scalastyle.scalariform.MagicNumberChecker"
enabled="false">
+ <parameters>
+ <parameter name="ignore"><![CDATA[-1,0,1,2,3]]></parameter>
+ </parameters>
+ </check>
+ <check level="error"
class="org.scalastyle.scalariform.NoWhitespaceBeforeLeftBracketChecker"
enabled="true"/>
+ <check level="error"
class="org.scalastyle.scalariform.NoWhitespaceAfterLeftBracketChecker"
enabled="true"/>
+ <check level="error" class="org.scalastyle.scalariform.ReturnChecker"
enabled="false"/>
+ <check level="error" class="org.scalastyle.scalariform.NullChecker"
enabled="false"/>
+ <check level="error" class="org.scalastyle.scalariform.NoCloneChecker"
enabled="true"/>
+ <check level="error" class="org.scalastyle.scalariform.NoFinalizeChecker"
enabled="true"/>
+ <check level="error"
class="org.scalastyle.scalariform.CovariantEqualsChecker" enabled="true"/>
+ <check level="error" class="org.scalastyle.scalariform.StructuralTypeChecker"
enabled="true"/>
+ <check level="error" class="org.scalastyle.file.RegexChecker" enabled="false">
+ <parameters>
+ <parameter name="regex"><![CDATA[println]]></parameter>
+ </parameters>
+ </check>
+ <check level="error" class="org.scalastyle.scalariform.NumberOfTypesChecker"
enabled="true">
+ <parameters>
+ <parameter name="maxTypes"><![CDATA[30]]></parameter>
+ </parameters>
+ </check>
+ <check level="error"
class="org.scalastyle.scalariform.CyclomaticComplexityChecker" enabled="false">
+ <parameters>
+ <parameter name="maximum"><![CDATA[10]]></parameter>
+ </parameters>
+ </check>
+ <check level="error" class="org.scalastyle.scalariform.UppercaseLChecker"
enabled="true"/>
+ <check level="error"
class="org.scalastyle.scalariform.SimplifyBooleanExpressionChecker"
enabled="true"/>
+ <check level="error" class="org.scalastyle.scalariform.IfBraceChecker"
enabled="false">
+ <parameters>
+ <parameter name="singleLineAllowed"><![CDATA[true]]></parameter>
+ <parameter name="doubleLineAllowed"><![CDATA[false]]></parameter>
+ </parameters>
+ </check>
+ <check level="error" class="org.scalastyle.scalariform.MethodLengthChecker"
enabled="false">
+ <parameters>
+ <parameter name="maxLength"><![CDATA[50]]></parameter>
+ </parameters>
+ </check>
+ <check level="error" class="org.scalastyle.scalariform.MethodNamesChecker"
enabled="true">
+ <parameters>
+ <parameter name="regex"><![CDATA[^[a-z][A-Za-z0-9]*$]]></parameter>
+ </parameters>
+ </check>
+ <check level="error"
class="org.scalastyle.scalariform.NumberOfMethodsInTypeChecker" enabled="true">
+ <parameters>
+ <parameter name="maxMethods"><![CDATA[30]]></parameter>
+ </parameters>
+ </check>
+ <check level="error"
class="org.scalastyle.scalariform.PublicMethodsHaveTypeChecker"
enabled="false"/>
+ <check level="error" class="org.scalastyle.file.NewLineAtEofChecker"
enabled="true"/>
+ <check level="error" class="org.scalastyle.file.NoNewLineAtEofChecker"
enabled="false"/>
+ <check level="error" class="org.scalastyle.scalariform.BlockImportChecker"
enabled="false"/>
+ <check level="error" class="org.scalastyle.scalariform.ImportOrderChecker"
enabled="false">
+ <parameters>
+ <parameter name="groups">hudi,3rdParty,javax,java,scala</parameter>
+ <parameter name="group.hudi">org\.apache\.hudi\..*</parameter>
+ <parameter name="group.3rdParty">(?!org\.apache\.hudi\.).*</parameter>
+ <parameter name="group.javax">java?\..*</parameter>
+ <parameter name="group.java">javax?\..*</parameter>
+ <parameter name="group.scala">scala\..*</parameter>
+ </parameters>
+ </check>
+
+</scalastyle>
