From e2d5b35a8cb5eefafc12abe0394ec5f60ab87d79 Mon Sep 17 00:00:00 2001
From: Ellen Spertus <ellen.spertus@gmail.com>
Date: Thu, 19 Jul 2018 10:30:20 -0700
Subject: Added rule to warn about block imports. Removed block imports.

---
 scalding/scalastyle-config.xml                             | 3 ++-
 scalding/src/main/scala/sandcrawler/HBaseCountJob.scala    | 3 ++-
 scalding/src/main/scala/sandcrawler/HBaseRowCountJob.scala | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/scalding/scalastyle-config.xml b/scalding/scalastyle-config.xml
index 1575217..e2f58a0 100644
--- a/scalding/scalastyle-config.xml
+++ b/scalding/scalastyle-config.xml
@@ -114,7 +114,8 @@
  <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">
+ <check class="org.scalastyle.scalariform.BlockImportChecker" level="warning" enabled="true"/>
+<check class="org.scalastyle.scalariform.ImportOrderChecker" level="warning" enabled="true">
   <parameters>
    <parameter name="groups">java,scala,others</parameter>
    <parameter name="group.java">javax?\..+</parameter>
diff --git a/scalding/src/main/scala/sandcrawler/HBaseCountJob.scala b/scalding/src/main/scala/sandcrawler/HBaseCountJob.scala
index e1f46ef..22e4e86 100644
--- a/scalding/src/main/scala/sandcrawler/HBaseCountJob.scala
+++ b/scalding/src/main/scala/sandcrawler/HBaseCountJob.scala
@@ -6,7 +6,8 @@ import com.twitter.scalding._
 import java.util.Properties
 import parallelai.spyglass.base.JobBase
 import parallelai.spyglass.hbase.HBaseConstants.SourceMode
-import parallelai.spyglass.hbase.{HBaseSource, HBasePipeConversions}
+import parallelai.spyglass.hbase.HBasePipeConversions
+import parallelai.spyglass.hbase.HBaseSource
 
 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 41de719..6def218 100644
--- a/scalding/src/main/scala/sandcrawler/HBaseRowCountJob.scala
+++ b/scalding/src/main/scala/sandcrawler/HBaseRowCountJob.scala
@@ -6,7 +6,8 @@ import com.twitter.scalding._
 import java.util.Properties
 import parallelai.spyglass.base.JobBase
 import parallelai.spyglass.hbase.HBaseConstants.SourceMode
-import parallelai.spyglass.hbase.{HBaseSource, HBasePipeConversions}
+import parallelai.spyglass.hbase.HBasePipeConversions
+import parallelai.spyglass.hbase.HBaseSource
 
 class HBaseRowCountJob(args: Args) extends JobBase(args) with HBasePipeConversions {
 
-- 
cgit v1.2.3