diff options
| author | Marcelo Vanzin <vanzin@cloudera.com> | 2016-01-10 20:04:50 -0800 |
|---|---|---|
| committer | Reynold Xin <rxin@databricks.com> | 2016-01-10 20:04:50 -0800 |
| commit | 6439a82503e900ae2e5c3cda5d10ac20dfd6e53f (patch) | |
| tree | 0ce40d9d0c07aeb66ca0aad50eb9b849389c2085 /scalastyle-config.xml | |
| parent | 3ab0138b0fe0f9208b4b476855294a7c729583b7 (diff) | |
| download | spark-6439a82503e900ae2e5c3cda5d10ac20dfd6e53f.tar.gz spark-6439a82503e900ae2e5c3cda5d10ac20dfd6e53f.tar.bz2 spark-6439a82503e900ae2e5c3cda5d10ac20dfd6e53f.zip | |
[SPARK-3873][BUILD] Enable import ordering error checking.
Turn import ordering violations into build errors, plus a few adjustments
to account for how the checker behaves. I'm a little on the fence about
whether the existing code is right, but it's easier to appease the checker
than to discuss what's the more correct order here.
Plus a few fixes to imports that cropped in since my recent cleanups.
Author: Marcelo Vanzin <vanzin@cloudera.com>
Closes #10612 from vanzin/SPARK-3873-enable.
Diffstat (limited to 'scalastyle-config.xml')
| -rw-r--r-- | scalastyle-config.xml | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/scalastyle-config.xml b/scalastyle-config.xml index 9714c46fe9..2439a1f715 100644 --- a/scalastyle-config.xml +++ b/scalastyle-config.xml @@ -187,6 +187,16 @@ This file is divided into 3 sections: scala.collection.JavaConverters._ and use .asScala / .asJava methods</customMessage> </check> + <check level="error" class="org.scalastyle.scalariform.ImportOrderChecker" enabled="true"> + <parameters> + <parameter name="groups">java,scala,3rdParty,spark</parameter> + <parameter name="group.java">javax?\..*</parameter> + <parameter name="group.scala">scala\..*</parameter> + <parameter name="group.3rdParty">(?!org\.apache\.spark\.).*</parameter> + <parameter name="group.spark">org\.apache\.spark\..*</parameter> + </parameters> + </check> + <!-- ================================================================================ --> <!-- rules we'd like to enforce, but haven't cleaned up the codebase yet --> <!-- ================================================================================ --> @@ -207,17 +217,6 @@ This file is divided into 3 sections: <!-- Should turn this on, but we have a few places that need to be fixed first --> <check level="error" class="org.scalastyle.scalariform.EqualsHashCodeChecker" enabled="false"></check> - <!-- Import ordering. Currently warning only since there are lots of violations. --> - <check level="warning" class="org.scalastyle.scalariform.ImportOrderChecker" enabled="true"> - <parameters> - <parameter name="groups">java,scala,3rdParty,spark</parameter> - <parameter name="group.java">javax?\..*</parameter> - <parameter name="group.scala">scala\..*</parameter> - <parameter name="group.3rdParty">(?!org\.apache\.spark\.).*</parameter> - <parameter name="group.spark">org\.apache\.spark\..*</parameter> - </parameters> - </check> - <!-- Should turn this on, but we have a few places that need to be fixed first --> <check level="warning" class="org.scalastyle.scalariform.DisallowSpaceBeforeTokenChecker" enabled="true"> <parameters> |