diff --git a/accumulo/src/main/scala/geotrellis/spark/io/accumulo/AccumuloLayerUpdater.scala b/accumulo/src/main/scala/geotrellis/spark/io/accumulo/AccumuloLayerUpdater.scala index c788808c6a..22650fac48 100644 --- a/accumulo/src/main/scala/geotrellis/spark/io/accumulo/AccumuloLayerUpdater.scala +++ b/accumulo/src/main/scala/geotrellis/spark/io/accumulo/AccumuloLayerUpdater.scala @@ -23,7 +23,6 @@ import geotrellis.spark.io.avro.codecs._ import geotrellis.spark.merge._ import geotrellis.util._ -import com.typesafe.scalalogging.LazyLogging import org.apache.spark.SparkContext import org.apache.spark.rdd.RDD import spray.json._ diff --git a/cassandra/src/main/scala/geotrellis/spark/io/cassandra/CassandraLayerUpdater.scala b/cassandra/src/main/scala/geotrellis/spark/io/cassandra/CassandraLayerUpdater.scala index 7b9b690b37..8ab7dcaecd 100644 --- a/cassandra/src/main/scala/geotrellis/spark/io/cassandra/CassandraLayerUpdater.scala +++ b/cassandra/src/main/scala/geotrellis/spark/io/cassandra/CassandraLayerUpdater.scala @@ -23,7 +23,6 @@ import geotrellis.spark.io.avro.codecs._ import geotrellis.spark.merge._ import geotrellis.util._ -import com.typesafe.scalalogging.LazyLogging import org.apache.spark.SparkContext import org.apache.spark.rdd.RDD import spray.json._ diff --git a/geomesa/src/main/scala/geotrellis/spark/io/geomesa/GeoMesaFeatureReader.scala b/geomesa/src/main/scala/geotrellis/spark/io/geomesa/GeoMesaFeatureReader.scala index ab74c92e2d..f80f5c075e 100644 --- a/geomesa/src/main/scala/geotrellis/spark/io/geomesa/GeoMesaFeatureReader.scala +++ b/geomesa/src/main/scala/geotrellis/spark/io/geomesa/GeoMesaFeatureReader.scala @@ -20,8 +20,8 @@ import geotrellis.geotools._ import geotrellis.spark._ import geotrellis.util.annotations.experimental import geotrellis.vector._ +import geotrellis.util._ -import com.typesafe.scalalogging.LazyLogging import org.apache.accumulo.core.client.mapreduce.InputFormatBase import org.apache.hadoop.io.Text import org.apache.hadoop.mapreduce.Job diff --git a/geomesa/src/main/scala/geotrellis/spark/io/geomesa/GeoMesaFeatureWriter.scala b/geomesa/src/main/scala/geotrellis/spark/io/geomesa/GeoMesaFeatureWriter.scala index 9375584490..0143a6d464 100644 --- a/geomesa/src/main/scala/geotrellis/spark/io/geomesa/GeoMesaFeatureWriter.scala +++ b/geomesa/src/main/scala/geotrellis/spark/io/geomesa/GeoMesaFeatureWriter.scala @@ -20,8 +20,8 @@ import geotrellis.geomesa.geotools._ import geotrellis.spark._ import geotrellis.util.annotations.experimental import geotrellis.vector._ +import geotrellis.util._ -import com.typesafe.scalalogging.LazyLogging import org.apache.spark.rdd.RDD import org.apache.spark.SparkContext import org.geotools.data.Transaction diff --git a/geomesa/src/main/scala/geotrellis/spark/io/geomesa/GeoMesaInstance.scala b/geomesa/src/main/scala/geotrellis/spark/io/geomesa/GeoMesaInstance.scala index d16eccd757..15283b9389 100644 --- a/geomesa/src/main/scala/geotrellis/spark/io/geomesa/GeoMesaInstance.scala +++ b/geomesa/src/main/scala/geotrellis/spark/io/geomesa/GeoMesaInstance.scala @@ -17,9 +17,9 @@ package geotrellis.spark.io.geomesa import geotrellis.spark.LayerId +import geotrellis.util.LazyLogging import geotrellis.util.annotations.experimental -import com.typesafe.scalalogging.LazyLogging import org.geotools.data.DataStoreFinder import org.locationtech.geomesa.accumulo.data.AccumuloDataStore diff --git a/geowave/src/main/scala/geotrellis/spark/io/geowave/GeowaveAttributeStore.scala b/geowave/src/main/scala/geotrellis/spark/io/geowave/GeowaveAttributeStore.scala index d78dd16005..cdfc08129c 100644 --- a/geowave/src/main/scala/geotrellis/spark/io/geowave/GeowaveAttributeStore.scala +++ b/geowave/src/main/scala/geotrellis/spark/io/geowave/GeowaveAttributeStore.scala @@ -22,10 +22,10 @@ import geotrellis.raster._ import geotrellis.spark._ import geotrellis.spark.io._ import geotrellis.spark.io.accumulo.AccumuloAttributeStore +import geotrellis.util._ import geotrellis.util.annotations.experimental import geotrellis.vector.Extent -import com.typesafe.scalalogging.LazyLogging import com.vividsolutions.jts.geom._ import mil.nga.giat.geowave.adapter.raster.adapter.RasterDataAdapter import mil.nga.giat.geowave.core.geotime.ingest._ diff --git a/geowave/src/main/scala/geotrellis/spark/io/geowave/GeowaveLayerReader.scala b/geowave/src/main/scala/geotrellis/spark/io/geowave/GeowaveLayerReader.scala index c06fc9c27c..2ec6b42cdf 100644 --- a/geowave/src/main/scala/geotrellis/spark/io/geowave/GeowaveLayerReader.scala +++ b/geowave/src/main/scala/geotrellis/spark/io/geowave/GeowaveLayerReader.scala @@ -28,7 +28,6 @@ import geotrellis.util._ import geotrellis.util.annotations.experimental import geotrellis.vector.Extent -import com.typesafe.scalalogging.LazyLogging import com.vividsolutions.jts.geom._ import mil.nga.giat.geowave.adapter.raster.adapter.RasterDataAdapter import mil.nga.giat.geowave.core.geotime.ingest._ diff --git a/geowave/src/main/scala/geotrellis/spark/io/geowave/GeowaveLayerWriter.scala b/geowave/src/main/scala/geotrellis/spark/io/geowave/GeowaveLayerWriter.scala index b342ae6366..f8e0a7d2f1 100644 --- a/geowave/src/main/scala/geotrellis/spark/io/geowave/GeowaveLayerWriter.scala +++ b/geowave/src/main/scala/geotrellis/spark/io/geowave/GeowaveLayerWriter.scala @@ -28,7 +28,6 @@ import geotrellis.util._ import geotrellis.util.annotations.experimental import geotrellis.vector.Extent -import com.typesafe.scalalogging.LazyLogging import mil.nga.giat.geowave.adapter.raster.adapter.merge.RasterTileRowTransform import mil.nga.giat.geowave.adapter.raster.adapter.RasterDataAdapter import mil.nga.giat.geowave.core.geotime.index.dimension._ diff --git a/hbase/src/main/scala/geotrellis/spark/io/hbase/HBaseLayerUpdater.scala b/hbase/src/main/scala/geotrellis/spark/io/hbase/HBaseLayerUpdater.scala index 78c351902e..846082f02f 100644 --- a/hbase/src/main/scala/geotrellis/spark/io/hbase/HBaseLayerUpdater.scala +++ b/hbase/src/main/scala/geotrellis/spark/io/hbase/HBaseLayerUpdater.scala @@ -24,7 +24,6 @@ import geotrellis.spark.merge._ import geotrellis.util._ import org.apache.spark.SparkContext -import com.typesafe.scalalogging.LazyLogging import org.apache.spark.rdd.RDD import spray.json._ diff --git a/raster/build.sbt b/raster/build.sbt index a3afb4dd7d..ffa3fe75d3 100644 --- a/raster/build.sbt +++ b/raster/build.sbt @@ -7,7 +7,6 @@ libraryDependencies ++= Seq( typesafeConfig, jts, spire, - logging, monocleCore, monocleMacro, openCSV) diff --git a/raster/src/main/scala/geotrellis/raster/Tile.scala b/raster/src/main/scala/geotrellis/raster/Tile.scala index e06fdd7aa3..6a1cd3678e 100644 --- a/raster/src/main/scala/geotrellis/raster/Tile.scala +++ b/raster/src/main/scala/geotrellis/raster/Tile.scala @@ -17,13 +17,12 @@ package geotrellis.raster import spire.syntax.cfor._ -import com.typesafe.scalalogging._ +import geotrellis.util._ import java.util.Locale import scala.collection.mutable.ArrayBuffer import scala.math.BigDecimal - /** * Base trait for a Tile. */ diff --git a/s3-testkit/build.sbt b/s3-testkit/build.sbt index 322dda6192..1881b84991 100644 --- a/s3-testkit/build.sbt +++ b/s3-testkit/build.sbt @@ -5,6 +5,5 @@ libraryDependencies ++= Seq( sparkCore % "provided", awsSdkS3, spire, - logging, scalatest ) diff --git a/s3-testkit/src/main/scala/geotrellis/spark/io/s3/testkit/MockS3Client.scala b/s3-testkit/src/main/scala/geotrellis/spark/io/s3/testkit/MockS3Client.scala index f63d2d572e..91fa982e5e 100644 --- a/s3-testkit/src/main/scala/geotrellis/spark/io/s3/testkit/MockS3Client.scala +++ b/s3-testkit/src/main/scala/geotrellis/spark/io/s3/testkit/MockS3Client.scala @@ -17,13 +17,16 @@ package geotrellis.spark.io.s3.testkit import geotrellis.spark.io.s3._ -import java.io.ByteArrayInputStream +import geotrellis.util.LazyLogging + import com.amazonaws.services.s3.model._ -import java.util.concurrent.ConcurrentHashMap import com.amazonaws.services.s3.internal.AmazonS3ExceptionBuilder -import scala.collection.immutable.TreeMap -import com.typesafe.scalalogging.LazyLogging import org.apache.commons.io.IOUtils + +import java.io.ByteArrayInputStream +import java.util.concurrent.ConcurrentHashMap + +import scala.collection.immutable.TreeMap import scala.collection.JavaConverters._ class MockS3Client() extends S3Client with LazyLogging { diff --git a/s3/src/main/scala/geotrellis/spark/io/s3/AmazonS3Client.scala b/s3/src/main/scala/geotrellis/spark/io/s3/AmazonS3Client.scala index 2b6b487946..67b2c92cd1 100644 --- a/s3/src/main/scala/geotrellis/spark/io/s3/AmazonS3Client.scala +++ b/s3/src/main/scala/geotrellis/spark/io/s3/AmazonS3Client.scala @@ -18,15 +18,10 @@ package geotrellis.spark.io.s3 import com.amazonaws.ClientConfiguration import com.amazonaws.auth._ -import com.amazonaws.services.s3.model.DeleteObjectsRequest.KeyVersion import com.amazonaws.services.s3.{AmazonS3Client => AWSAmazonS3Client} -import com.amazonaws.retry.PredefinedRetryPolicies import com.amazonaws.services.s3.model._ import org.apache.commons.io.IOUtils -import com.typesafe.scalalogging.LazyLogging -import java.io.{InputStream, ByteArrayInputStream} -import scala.annotation.tailrec import scala.collection.JavaConverters._ import scala.collection.mutable diff --git a/s3/src/main/scala/geotrellis/spark/io/s3/S3Client.scala b/s3/src/main/scala/geotrellis/spark/io/s3/S3Client.scala index afb29357cc..494a03fe51 100644 --- a/s3/src/main/scala/geotrellis/spark/io/s3/S3Client.scala +++ b/s3/src/main/scala/geotrellis/spark/io/s3/S3Client.scala @@ -16,19 +16,16 @@ package geotrellis.spark.io.s3 -import com.amazonaws.ClientConfiguration +import geotrellis.util.LazyLogging + import com.amazonaws.auth._ import com.amazonaws.services.s3.model.DeleteObjectsRequest.KeyVersion -import com.amazonaws.services.s3.{AmazonS3Client => AWSAmazonS3Client} import com.amazonaws.retry.PredefinedRetryPolicies import com.amazonaws.services.s3.model._ -import org.apache.commons.io.IOUtils -import com.typesafe.scalalogging.LazyLogging import java.io.{InputStream, ByteArrayInputStream} import scala.annotation.tailrec import scala.collection.JavaConverters._ -import scala.collection.mutable trait S3Client extends LazyLogging { diff --git a/s3/src/main/scala/geotrellis/spark/io/s3/S3InputFormat.scala b/s3/src/main/scala/geotrellis/spark/io/s3/S3InputFormat.scala index 23e2b1abc1..44927b90e2 100644 --- a/s3/src/main/scala/geotrellis/spark/io/s3/S3InputFormat.scala +++ b/s3/src/main/scala/geotrellis/spark/io/s3/S3InputFormat.scala @@ -18,13 +18,13 @@ package geotrellis.spark.io.s3 import geotrellis.proj4.CRS import geotrellis.spark.io.hadoop._ +import geotrellis.util.LazyLogging import com.amazonaws.services.s3.model.{ListObjectsRequest, ObjectListing} import com.amazonaws.auth._ import com.amazonaws.regions._ import org.apache.hadoop.conf.Configuration import org.apache.hadoop.mapreduce.{InputFormat, Job, JobContext} -import com.typesafe.scalalogging.LazyLogging import scala.util.matching.Regex diff --git a/s3/src/main/scala/geotrellis/spark/io/s3/S3InputSplit.scala b/s3/src/main/scala/geotrellis/spark/io/s3/S3InputSplit.scala index eb5a8fb700..d634fd0e04 100644 --- a/s3/src/main/scala/geotrellis/spark/io/s3/S3InputSplit.scala +++ b/s3/src/main/scala/geotrellis/spark/io/s3/S3InputSplit.scala @@ -16,12 +16,14 @@ package geotrellis.spark.io.s3 -import java.io.{DataOutput, DataInput} +import geotrellis.util.LazyLogging + import com.amazonaws.services.s3.model.{S3ObjectSummary, ObjectListing} import org.apache.hadoop.io.Writable import org.apache.hadoop.mapreduce.InputSplit import com.amazonaws.auth.{AWSCredentials, BasicAWSCredentials, AnonymousAWSCredentials, BasicSessionCredentials} -import com.typesafe.scalalogging.LazyLogging + +import java.io.{DataOutput, DataInput} /** * Represents are batch of keys to be read from an S3 bucket. diff --git a/s3/src/main/scala/geotrellis/spark/io/s3/S3LayerReader.scala b/s3/src/main/scala/geotrellis/spark/io/s3/S3LayerReader.scala index dfbcdd9e7a..56ff262c5b 100644 --- a/s3/src/main/scala/geotrellis/spark/io/s3/S3LayerReader.scala +++ b/s3/src/main/scala/geotrellis/spark/io/s3/S3LayerReader.scala @@ -24,7 +24,6 @@ import geotrellis.util._ import org.apache.spark.SparkContext import spray.json.JsonFormat -import com.typesafe.scalalogging.LazyLogging import scala.reflect.ClassTag diff --git a/s3/src/main/scala/geotrellis/spark/io/s3/S3LayerUpdater.scala b/s3/src/main/scala/geotrellis/spark/io/s3/S3LayerUpdater.scala index 831290c6d6..03dea2a9e5 100644 --- a/s3/src/main/scala/geotrellis/spark/io/s3/S3LayerUpdater.scala +++ b/s3/src/main/scala/geotrellis/spark/io/s3/S3LayerUpdater.scala @@ -24,7 +24,6 @@ import geotrellis.spark.io.index._ import geotrellis.spark.merge._ import geotrellis.util._ -import com.typesafe.scalalogging.LazyLogging import org.apache.avro.Schema import org.apache.spark.SparkContext import org.apache.spark.rdd.RDD diff --git a/s3/src/main/scala/geotrellis/spark/io/s3/S3LayerWriter.scala b/s3/src/main/scala/geotrellis/spark/io/s3/S3LayerWriter.scala index c03d8bc650..54a01c0b1b 100644 --- a/s3/src/main/scala/geotrellis/spark/io/s3/S3LayerWriter.scala +++ b/s3/src/main/scala/geotrellis/spark/io/s3/S3LayerWriter.scala @@ -25,7 +25,6 @@ import geotrellis.spark.io.index._ import geotrellis.util._ import com.amazonaws.services.s3.model.PutObjectRequest -import com.typesafe.scalalogging.LazyLogging import org.apache.spark.rdd.RDD import spray.json._ diff --git a/s3/src/main/scala/geotrellis/spark/io/s3/S3RecordReader.scala b/s3/src/main/scala/geotrellis/spark/io/s3/S3RecordReader.scala index 364aa6885b..c6407de99e 100644 --- a/s3/src/main/scala/geotrellis/spark/io/s3/S3RecordReader.scala +++ b/s3/src/main/scala/geotrellis/spark/io/s3/S3RecordReader.scala @@ -21,7 +21,6 @@ import geotrellis.util._ import com.amazonaws.auth.AWSCredentials import com.amazonaws.services.s3.model.GetObjectRequest -import com.typesafe.scalalogging.LazyLogging import org.apache.hadoop.mapreduce.{InputSplit, TaskAttemptContext, RecordReader} import org.apache.commons.io.IOUtils diff --git a/spark-etl/build.sbt b/spark-etl/build.sbt index e5e5126f74..22b76ce326 100644 --- a/spark-etl/build.sbt +++ b/spark-etl/build.sbt @@ -4,7 +4,6 @@ name := "geotrellis-spark-etl" libraryDependencies ++= Seq( "com.github.fge" % "json-schema-validator" % "2.2.6", sparkCore % "provided", - logging, scalatest % "test") test in assembly := {} diff --git a/spark-etl/src/main/scala/geotrellis/spark/etl/Etl.scala b/spark-etl/src/main/scala/geotrellis/spark/etl/Etl.scala index cbf5da9a47..5139193e0c 100644 --- a/spark-etl/src/main/scala/geotrellis/spark/etl/Etl.scala +++ b/spark-etl/src/main/scala/geotrellis/spark/etl/Etl.scala @@ -34,7 +34,6 @@ import geotrellis.spark.etl.config._ import org.apache.spark._ import org.apache.spark.rdd.RDD -import com.typesafe.scalalogging.LazyLogging import scala.reflect._ import scala.reflect.runtime.universe._ diff --git a/spark-etl/src/main/scala/geotrellis/spark/etl/accumulo/AccumuloOutput.scala b/spark-etl/src/main/scala/geotrellis/spark/etl/accumulo/AccumuloOutput.scala index 76113ba8f7..f7072a3763 100644 --- a/spark-etl/src/main/scala/geotrellis/spark/etl/accumulo/AccumuloOutput.scala +++ b/spark-etl/src/main/scala/geotrellis/spark/etl/accumulo/AccumuloOutput.scala @@ -19,7 +19,7 @@ package geotrellis.spark.etl.accumulo import geotrellis.spark.etl.OutputPlugin import geotrellis.spark.etl.config.{AccumuloProfile, BackendProfile, EtlConf} import geotrellis.spark.io.accumulo.{AccumuloAttributeStore, AccumuloWriteStrategy, HdfsWriteStrategy, SocketWriteStrategy} -import com.typesafe.scalalogging.LazyLogging +import geotrellis.util.LazyLogging trait AccumuloOutput[K, V, M] extends OutputPlugin[K, V, M] with LazyLogging { val name = "accumulo" diff --git a/spark/build.sbt b/spark/build.sbt index 28d9798b77..d816a9cc65 100644 --- a/spark/build.sbt +++ b/spark/build.sbt @@ -5,7 +5,6 @@ libraryDependencies ++= Seq( sparkCore % "provided", hadoopClient % "provided", "com.google.uzaygezen" % "uzaygezen-core" % "0.2", - logging, avro, spire, monocleCore, monocleMacro, diff --git a/spark/src/main/scala/geotrellis/spark/io/file/FileCollectionLayerReader.scala b/spark/src/main/scala/geotrellis/spark/io/file/FileCollectionLayerReader.scala index 3fb6087d79..6256ad0173 100644 --- a/spark/src/main/scala/geotrellis/spark/io/file/FileCollectionLayerReader.scala +++ b/spark/src/main/scala/geotrellis/spark/io/file/FileCollectionLayerReader.scala @@ -23,7 +23,6 @@ import geotrellis.spark.io.index._ import geotrellis.util._ import spray.json.JsonFormat -import com.typesafe.scalalogging.LazyLogging import scala.reflect.ClassTag diff --git a/spark/src/main/scala/geotrellis/spark/io/file/FileLayerReader.scala b/spark/src/main/scala/geotrellis/spark/io/file/FileLayerReader.scala index 2dca1f82f7..472cfc1f6b 100644 --- a/spark/src/main/scala/geotrellis/spark/io/file/FileLayerReader.scala +++ b/spark/src/main/scala/geotrellis/spark/io/file/FileLayerReader.scala @@ -24,7 +24,6 @@ import geotrellis.util._ import org.apache.spark.SparkContext import spray.json.JsonFormat -import com.typesafe.scalalogging.LazyLogging import scala.reflect.ClassTag diff --git a/spark/src/main/scala/geotrellis/spark/io/file/FileLayerUpdater.scala b/spark/src/main/scala/geotrellis/spark/io/file/FileLayerUpdater.scala index 8522263cc4..d67837bc1c 100644 --- a/spark/src/main/scala/geotrellis/spark/io/file/FileLayerUpdater.scala +++ b/spark/src/main/scala/geotrellis/spark/io/file/FileLayerUpdater.scala @@ -25,7 +25,6 @@ import geotrellis.spark.io.json._ import geotrellis.spark.merge._ import geotrellis.util._ -import com.typesafe.scalalogging.LazyLogging import org.apache.avro.Schema import org.apache.spark.SparkContext import org.apache.spark.rdd.RDD diff --git a/spark/src/main/scala/geotrellis/spark/io/file/FileLayerWriter.scala b/spark/src/main/scala/geotrellis/spark/io/file/FileLayerWriter.scala index 82dbb3444e..87f1deddcc 100644 --- a/spark/src/main/scala/geotrellis/spark/io/file/FileLayerWriter.scala +++ b/spark/src/main/scala/geotrellis/spark/io/file/FileLayerWriter.scala @@ -25,7 +25,6 @@ import geotrellis.raster._ import geotrellis.util._ import org.apache.spark.rdd.RDD -import com.typesafe.scalalogging.LazyLogging import spray.json._ import scala.reflect._ diff --git a/spark/src/main/scala/geotrellis/spark/io/hadoop/HadoopCollectionLayerReader.scala b/spark/src/main/scala/geotrellis/spark/io/hadoop/HadoopCollectionLayerReader.scala index 724695232b..3c626899ab 100644 --- a/spark/src/main/scala/geotrellis/spark/io/hadoop/HadoopCollectionLayerReader.scala +++ b/spark/src/main/scala/geotrellis/spark/io/hadoop/HadoopCollectionLayerReader.scala @@ -21,7 +21,6 @@ import geotrellis.spark.io._ import geotrellis.spark.io.avro._ import geotrellis.util._ -import com.typesafe.scalalogging.LazyLogging import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.Path import org.apache.spark.SparkContext diff --git a/spark/src/main/scala/geotrellis/spark/io/hadoop/HadoopLayerReader.scala b/spark/src/main/scala/geotrellis/spark/io/hadoop/HadoopLayerReader.scala index 0412dde85b..711a37c9d2 100644 --- a/spark/src/main/scala/geotrellis/spark/io/hadoop/HadoopLayerReader.scala +++ b/spark/src/main/scala/geotrellis/spark/io/hadoop/HadoopLayerReader.scala @@ -25,7 +25,6 @@ import geotrellis.spark.io.index.KeyIndex import geotrellis.spark.io.json._ import geotrellis.util._ -import com.typesafe.scalalogging.LazyLogging import org.apache.avro.Schema import org.apache.hadoop.fs.Path import org.apache.spark.SparkContext diff --git a/spark/src/main/scala/geotrellis/spark/io/hadoop/HadoopLayerUpdater.scala b/spark/src/main/scala/geotrellis/spark/io/hadoop/HadoopLayerUpdater.scala index 4cb010e8ad..9df1331c52 100644 --- a/spark/src/main/scala/geotrellis/spark/io/hadoop/HadoopLayerUpdater.scala +++ b/spark/src/main/scala/geotrellis/spark/io/hadoop/HadoopLayerUpdater.scala @@ -24,7 +24,6 @@ import geotrellis.spark.merge._ import geotrellis.spark.util._ import geotrellis.util._ -import com.typesafe.scalalogging.LazyLogging import org.apache.hadoop.fs.Path import org.apache.spark.SparkContext import org.apache.spark.rdd.RDD diff --git a/spark/src/main/scala/geotrellis/spark/io/hadoop/HadoopRDDReader.scala b/spark/src/main/scala/geotrellis/spark/io/hadoop/HadoopRDDReader.scala index 9addf85619..319ba85bbd 100644 --- a/spark/src/main/scala/geotrellis/spark/io/hadoop/HadoopRDDReader.scala +++ b/spark/src/main/scala/geotrellis/spark/io/hadoop/HadoopRDDReader.scala @@ -21,8 +21,8 @@ import geotrellis.spark.io.avro._ import geotrellis.spark.io.avro.codecs._ import geotrellis.spark.io.hadoop.formats._ import geotrellis.spark.util.KryoWrapper +import geotrellis.util.LazyLogging -import com.typesafe.scalalogging.LazyLogging import org.apache.avro.Schema import org.apache.hadoop.io._ import org.apache.hadoop.fs.Path diff --git a/spark/src/main/scala/geotrellis/spark/io/hadoop/HadoopRDDWriter.scala b/spark/src/main/scala/geotrellis/spark/io/hadoop/HadoopRDDWriter.scala index 492426b4e9..7e6f1b9494 100644 --- a/spark/src/main/scala/geotrellis/spark/io/hadoop/HadoopRDDWriter.scala +++ b/spark/src/main/scala/geotrellis/spark/io/hadoop/HadoopRDDWriter.scala @@ -19,15 +19,13 @@ package geotrellis.spark.io.hadoop import geotrellis.spark._ import geotrellis.spark.util._ import geotrellis.spark.partition._ -import geotrellis.spark.io.hadoop.formats._ import geotrellis.spark.io.index._ import geotrellis.spark.io.avro._ import geotrellis.spark.io.avro.codecs._ +import geotrellis.util.LazyLogging -import com.typesafe.scalalogging.LazyLogging import org.apache.hadoop.fs.Path import org.apache.hadoop.io._ -import org.apache.hadoop.mapreduce.lib.output._ import org.apache.hadoop.conf.Configuration import org.apache.spark.rdd._ diff --git a/spark/src/main/scala/geotrellis/spark/io/hadoop/HdfsUtils.scala b/spark/src/main/scala/geotrellis/spark/io/hadoop/HdfsUtils.scala index 639c8db166..f46f30e998 100644 --- a/spark/src/main/scala/geotrellis/spark/io/hadoop/HdfsUtils.scala +++ b/spark/src/main/scala/geotrellis/spark/io/hadoop/HdfsUtils.scala @@ -16,20 +16,19 @@ package geotrellis.spark.io.hadoop -import geotrellis.spark.io.hadoop.formats._ +import geotrellis.util.LazyLogging import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs._ import org.apache.hadoop.mapreduce.Job import org.apache.hadoop.mapreduce.lib.input.FileInputFormat import org.apache.hadoop.io._ + +import java.io._ import java.util.Scanner -import com.typesafe.scalalogging.LazyLogging import scala.collection.mutable.ListBuffer import scala.util.Random -import scala.reflect._ -import java.io._ abstract class LineScanner extends Iterator[String] with java.io.Closeable diff --git a/spark/src/main/scala/geotrellis/spark/pyramid/Pyramid.scala b/spark/src/main/scala/geotrellis/spark/pyramid/Pyramid.scala index d1e0da5a66..4134ad267b 100644 --- a/spark/src/main/scala/geotrellis/spark/pyramid/Pyramid.scala +++ b/spark/src/main/scala/geotrellis/spark/pyramid/Pyramid.scala @@ -26,7 +26,6 @@ import geotrellis.util._ import org.apache.spark.Partitioner import org.apache.spark.rdd._ -import com.typesafe.scalalogging.LazyLogging import scala.reflect.ClassTag diff --git a/spark/src/main/scala/geotrellis/spark/util/SparkUtils.scala b/spark/src/main/scala/geotrellis/spark/util/SparkUtils.scala index b25cb7cd54..35694f7909 100644 --- a/spark/src/main/scala/geotrellis/spark/util/SparkUtils.scala +++ b/spark/src/main/scala/geotrellis/spark/util/SparkUtils.scala @@ -16,10 +16,12 @@ package geotrellis.spark.util -import com.typesafe.scalalogging.LazyLogging +import geotrellis.util.LazyLogging + import org.apache.hadoop.conf.Configuration import org.apache.spark.SparkConf import org.apache.spark.SparkContext + import java.io.File object SparkUtils extends LazyLogging { diff --git a/util/build.sbt b/util/build.sbt index 6c10bc6d86..790ef84edc 100644 --- a/util/build.sbt +++ b/util/build.sbt @@ -2,5 +2,6 @@ import Dependencies._ name := "geotrellis-util" libraryDependencies ++= Seq( + logging, scalatest % "test" ) diff --git a/util/src/main/scala/geotrellis/util/LazyLogging.scala b/util/src/main/scala/geotrellis/util/LazyLogging.scala new file mode 100644 index 0000000000..1e47fb1b78 --- /dev/null +++ b/util/src/main/scala/geotrellis/util/LazyLogging.scala @@ -0,0 +1,15 @@ +package geotrellis.util + +import com.typesafe.scalalogging.Logger +import org.slf4j.LoggerFactory + +/** + * Similar to [[com.typesafe.scalalogging.LazyLogging]] + * but with @transient logger, to avoid potential serialization issues + * even with loggers that survive serialization. + */ + +trait LazyLogging { + @transient protected lazy val logger: Logger = + Logger(LoggerFactory.getLogger(getClass.getName)) +} diff --git a/vector/build.sbt b/vector/build.sbt index 77d03f8c13..b3e143cdbb 100644 --- a/vector/build.sbt +++ b/vector/build.sbt @@ -4,6 +4,5 @@ name := "geotrellis-vector" libraryDependencies ++= Seq( jts, sprayJson, - logging, apacheMath, spire) diff --git a/vector/src/main/scala/geotrellis/vector/io/WKB/WKB.scala b/vector/src/main/scala/geotrellis/vector/io/WKB/WKB.scala index e878bcbb91..50deb06c90 100644 --- a/vector/src/main/scala/geotrellis/vector/io/WKB/WKB.scala +++ b/vector/src/main/scala/geotrellis/vector/io/WKB/WKB.scala @@ -16,10 +16,11 @@ package geotrellis.vector.io.wkb -import com.vividsolutions.jts.io.WKBReader -import com.vividsolutions.jts.{geom => jts} +import geotrellis.util.LazyLogging import geotrellis.vector._ -import com.typesafe.scalalogging.LazyLogging + +import com.vividsolutions.jts.io.WKBReader + /** A thread-safe wrapper for the [https://en.wikipedia.org/wiki/Well-known_text#Well-known_binary WKB] * Writer and Reader diff --git a/vector/src/main/scala/geotrellis/vector/io/WKT/WKT.scala b/vector/src/main/scala/geotrellis/vector/io/WKT/WKT.scala index cf32332a23..bdfe4ac2ac 100644 --- a/vector/src/main/scala/geotrellis/vector/io/WKT/WKT.scala +++ b/vector/src/main/scala/geotrellis/vector/io/WKT/WKT.scala @@ -16,9 +16,9 @@ package geotrellis.vector.io.wkt -import com.vividsolutions.jts.io.{WKTReader, WKTWriter} -import com.vividsolutions.jts.{geom => jts} import geotrellis.vector._ + +import com.vividsolutions.jts.io.{WKTReader, WKTWriter} import com.typesafe.scalalogging.LazyLogging /** A thread-safe wrapper for the WKT Writer and Reader */