From 258abaf0f74c07b0de59c95d77f614a6d28447eb Mon Sep 17 00:00:00 2001
From: Ellen Spertus <ellen.spertus@gmail.com>
Date: Tue, 17 Jul 2018 14:37:00 -0700
Subject: Added import order checking. Fixed misordered imports in our code.

---
 scalding/scalastyle-config.xml                                | 10 ++++++++++
 scalding/src/main/scala/sandcrawler/HBaseCountJob.scala       |  2 +-
 scalding/src/main/scala/sandcrawler/HBaseRowCountJob.scala    |  2 +-
 scalding/src/main/scala/sandcrawler/HBaseStatusCountJob.scala |  2 --
 4 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'scalding')

diff --git a/scalding/scalastyle-config.xml b/scalding/scalastyle-config.xml
index 2f20677..1575217 100644
--- a/scalding/scalastyle-config.xml
+++ b/scalding/scalastyle-config.xml
@@ -114,4 +114,14 @@
  <check level="warning" class="org.scalastyle.scalariform.PublicMethodsHaveTypeChecker" enabled="true"></check>
  <check level="warning" class="org.scalastyle.file.NewLineAtEofChecker" enabled="true"></check>
  <check level="warning" class="org.scalastyle.file.NoNewLineAtEofChecker" enabled="false"></check>
+ <check class="org.scalastyle.scalariform.ImportOrderChecker"  level="warning" enabled="true">
+  <parameters>
+   <parameter name="groups">java,scala,others</parameter>
+   <parameter name="group.java">javax?\..+</parameter>
+   <parameter name="group.scala">scala\..+</parameter>
+   <parameter name="group.others">.+</parameter>
+   <parameter name="maxBlankLines">1</parameter>
+   <parameter name="lexicographic">true</parameter>
+  </parameters>
+ </check>
 </scalastyle>
diff --git a/scalding/src/main/scala/sandcrawler/HBaseCountJob.scala b/scalding/src/main/scala/sandcrawler/HBaseCountJob.scala
index 1ebc261..e1f46ef 100644
--- a/scalding/src/main/scala/sandcrawler/HBaseCountJob.scala
+++ b/scalding/src/main/scala/sandcrawler/HBaseCountJob.scala
@@ -5,8 +5,8 @@ import cascading.tuple.Fields
 import com.twitter.scalding._
 import java.util.Properties
 import parallelai.spyglass.base.JobBase
-import parallelai.spyglass.hbase.{HBaseSource, HBasePipeConversions}
 import parallelai.spyglass.hbase.HBaseConstants.SourceMode
+import parallelai.spyglass.hbase.{HBaseSource, HBasePipeConversions}
 
 class HBaseCountJob(args: Args, colSpec: String) extends JobBase(args) with HBasePipeConversions {
   val output = args("output")
diff --git a/scalding/src/main/scala/sandcrawler/HBaseRowCountJob.scala b/scalding/src/main/scala/sandcrawler/HBaseRowCountJob.scala
index ba3b9cd..41de719 100644
--- a/scalding/src/main/scala/sandcrawler/HBaseRowCountJob.scala
+++ b/scalding/src/main/scala/sandcrawler/HBaseRowCountJob.scala
@@ -5,8 +5,8 @@ import cascading.tuple.Fields
 import com.twitter.scalding._
 import java.util.Properties
 import parallelai.spyglass.base.JobBase
-import parallelai.spyglass.hbase.{HBaseSource, HBasePipeConversions}
 import parallelai.spyglass.hbase.HBaseConstants.SourceMode
+import parallelai.spyglass.hbase.{HBaseSource, HBasePipeConversions}
 
 class HBaseRowCountJob(args: Args) extends JobBase(args) with HBasePipeConversions {
 
diff --git a/scalding/src/main/scala/sandcrawler/HBaseStatusCountJob.scala b/scalding/src/main/scala/sandcrawler/HBaseStatusCountJob.scala
index dbd444d..b1dab0e 100644
--- a/scalding/src/main/scala/sandcrawler/HBaseStatusCountJob.scala
+++ b/scalding/src/main/scala/sandcrawler/HBaseStatusCountJob.scala
@@ -1,6 +1,5 @@
 package sandcrawler
 
-
 import com.twitter.scalding.Args
 import com.twitter.scalding._
 import com.twitter.scalding.typed.TDsl._
@@ -9,7 +8,6 @@ import org.apache.hadoop.hbase.util.Bytes
 import parallelai.spyglass.base.JobBase
 import parallelai.spyglass.hbase.HBasePipeConversions
 
-
 class HBaseStatusCountJob(args: Args) extends JobBase(args) with HBasePipeConversions {
 
   val source = HBaseCountJob.getHBaseSource(args("hbase-table"),
-- 
cgit v1.2.3