Merge branch 'spertus-packages' into 'master'

Made package names match directory names. Cleaned up imports.

See merge request webgroup/sandcrawler!3

4 files changed, 13 insertions, 16 deletions

diff --git a/scalding/src/main/scala/sandcrawler/HBaseRowCountJob.scala b/scalding/src/main/scala/sandcrawler/HBaseRowCountJob.scala
index 9d074ab..0c8e615 100644
--- a/scalding/src/main/scala/sandcrawler/HBaseRowCountJob.scala
+++ b/scalding/src/main/scala/sandcrawler/HBaseRowCountJob.scala
@@ -1,13 +1,12 @@
 package sandcrawler
 
+import cascading.property.AppProps
+import cascading.tuple.Fields
 import com.twitter.scalding._
+import java.util.Properties
 import parallelai.spyglass.base.JobBase
-import parallelai.spyglass.hbase.{HBaseSource, HBasePipeConversions, HBaseConstants}
+import parallelai.spyglass.hbase.{HBaseSource, HBasePipeConversions}
 import parallelai.spyglass.hbase.HBaseConstants.SourceMode
-import cascading.tuple.Fields
-import cascading.property.AppProps
-import java.util.Properties
-
 
 class HBaseRowCountJob(args: Args) extends JobBase(args) with HBasePipeConversions {
 
diff --git a/scalding/src/test/scala/example/WordCountTest.scala b/scalding/src/test/scala/example/WordCountTest.scala
index c42770f..b3f3b64 100644
--- a/scalding/src/test/scala/example/WordCountTest.scala
+++ b/scalding/src/test/scala/example/WordCountTest.scala
@@ -13,8 +13,9 @@ 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.
 */
-package com.twitter.scalding
+package example
 
+import com.twitter.scalding.{ JobTest, TextLine, TypedTsv }
 import org.scalatest.{ Matchers, WordSpec }
 
 class WordCountTest extends WordSpec with Matchers {
diff --git a/scalding/src/test/scala/sandcrawler/HBaseBuilderTest.scala b/scalding/src/test/scala/sandcrawler/HBaseBuilderTest.scala
index b45751d..4697f56 100644
--- a/scalding/src/test/scala/sandcrawler/HBaseBuilderTest.scala
+++ b/scalding/src/test/scala/sandcrawler/HBaseBuilderTest.scala
@@ -1,8 +1,7 @@
-package example
+package sandcrawler
 
 import cascading.tuple.Fields
 import org.scalatest._
-import sandcrawler.HBaseBuilder
 
 class HBaseBuilderTest extends FlatSpec with Matchers {
   "parseColSpec()" should "work on legal nontrivial input" in {
diff --git a/scalding/src/test/scala/sandcrawler/HBaseRowCountTest.scala b/scalding/src/test/scala/sandcrawler/HBaseRowCountTest.scala
index abb017c..6f61eb3 100644
--- a/scalding/src/test/scala/sandcrawler/HBaseRowCountTest.scala
+++ b/scalding/src/test/scala/sandcrawler/HBaseRowCountTest.scala
@@ -1,18 +1,16 @@
-package example
+package sandcrawler
 
+import cascading.tuple.{Tuple, Fields}
+import com.twitter.scalding.{JobTest, Tsv, TupleConversions}
+import org.apache.hadoop.hbase.io.ImmutableBytesWritable
+import org.apache.hadoop.hbase.util.Bytes
 import org.junit.runner.RunWith
-import com.twitter.scalding.{JobTest, TupleConversions}
 import org.scalatest.FunSpec
 import org.scalatest.junit.JUnitRunner
 import org.slf4j.LoggerFactory
-import org.apache.hadoop.hbase.io.ImmutableBytesWritable
-import cascading.tuple.{Tuple, Fields}
-import org.apache.hadoop.hbase.util.Bytes
-import scala._
-import com.twitter.scalding.Tsv
 import parallelai.spyglass.hbase.HBaseSource
 import parallelai.spyglass.hbase.HBaseConstants.SourceMode
-import sandcrawler.HBaseRowCountJob
+import scala._
 
 /**
  * Example of how to define tests for HBaseSource