fix imports

simerplaha · Nov 17, 2021 · d2cee30 · d2cee30
1 parent 2c8d6e3
commit d2cee30
Show file tree

Hide file tree

Showing 373 changed files with 1,120 additions and 1,278 deletions.
diff --git a/configs/src/main/scala/swaydb/configs/level/DefaultEventuallyPersistentConfig.scala b/configs/src/main/scala/swaydb/configs/level/DefaultEventuallyPersistentConfig.scala
@@ -20,7 +20,6 @@ import com.typesafe.scalalogging.LazyLogging
 import swaydb.config.accelerate.{Accelerator, LevelZeroMeter}
 import swaydb.config.compaction.{LevelMeter, LevelThrottle, LevelZeroThrottle}
 import swaydb.config._
-import swaydb.config.{Atomic, OptimiseWrites}
 import swaydb.effect.Dir
 
 import java.nio.file.Path

diff --git a/configs/src/main/scala/swaydb/configs/level/DefaultMemoryConfig.scala b/configs/src/main/scala/swaydb/configs/level/DefaultMemoryConfig.scala
@@ -20,7 +20,6 @@ import com.typesafe.scalalogging.LazyLogging
 import swaydb.config.accelerate.{Accelerator, LevelZeroMeter}
 import swaydb.config.compaction.{LevelMeter, LevelThrottle, LevelZeroThrottle}
 import swaydb.config._
-import swaydb.config.{Atomic, OptimiseWrites}
 
 import scala.concurrent.duration._
 

diff --git a/configs/src/main/scala/swaydb/configs/level/DefaultPersistentConfig.scala b/configs/src/main/scala/swaydb/configs/level/DefaultPersistentConfig.scala
@@ -20,7 +20,6 @@ import com.typesafe.scalalogging.LazyLogging
 import swaydb.config.accelerate.{Accelerator, LevelZeroMeter}
 import swaydb.config.compaction.{LevelMeter, LevelThrottle, LevelZeroThrottle}
 import swaydb.config._
-import swaydb.config.{Atomic, OptimiseWrites}
 import swaydb.effect.Dir
 
 import java.nio.file.Path

diff --git a/core-cache/src/test/scala/swaydb/core/cache/CacheSpec.scala b/core-cache/src/test/scala/swaydb/core/cache/CacheSpec.scala
@@ -26,7 +26,6 @@ import swaydb.testkit.RunThis._
 import swaydb.{Error, IO}
 
 import scala.annotation.tailrec
-import scala.collection.parallel.CollectionConverters._
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future
 import scala.concurrent.duration._

diff --git a/core-cache/src/test/scala/swaydb/core/cache/LazySpec.scala b/core-cache/src/test/scala/swaydb/core/cache/LazySpec.scala
@@ -23,7 +23,6 @@ import swaydb.IO
 import swaydb.effect.Base._
 import swaydb.testkit.RunThis._
 
-import scala.collection.parallel.CollectionConverters._
 import scala.concurrent.duration._
 import scala.util.Random
 

diff --git a/core-compression/src/test/scala/swaydb/core/compression/CompressionSpec.scala b/core-compression/src/test/scala/swaydb/core/compression/CompressionSpec.scala
@@ -19,9 +19,9 @@ package swaydb.compression
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 import swaydb.compression.CompressionTestGen._
-import swaydb.slice.Slice
 import swaydb.serializers.Default._
 import swaydb.serializers._
+import swaydb.slice.Slice
 import swaydb.utils.ByteSizeOf
 
 import scala.util.Random

diff --git a/core-interop/src/main/scala/swaydb/config/ConfigWizard.scala b/core-interop/src/main/scala/swaydb/config/ConfigWizard.scala
@@ -17,10 +17,9 @@
 package swaydb.config
 
 import swaydb.config.accelerate.{Accelerator, LevelZeroMeter}
-import swaydb.config.compaction.{LevelMeter, LevelThrottle, LevelZeroThrottle}
 import swaydb.config.builder.{MemoryLevelConfigBuilder, MemoryLevelZeroConfigBuilder, PersistentLevelConfigBuilder, PersistentLevelZeroConfigBuilder}
+import swaydb.config.compaction.{LevelMeter, LevelThrottle, LevelZeroThrottle}
 import swaydb.config.storage.Level0Storage
-import swaydb.config.{Atomic, OptimiseWrites}
 import swaydb.effect.Dir
 import swaydb.utils.Java.JavaFunction
 

diff --git a/core-interop/src/main/scala/swaydb/config/builder/MemoryLevelConfigBuilder.scala b/core-interop/src/main/scala/swaydb/config/builder/MemoryLevelConfigBuilder.scala
@@ -16,8 +16,8 @@
 
 package swaydb.config.builder
 
-import swaydb.config.compaction.{LevelMeter, LevelThrottle}
 import swaydb.config.MemoryLevelConfig
+import swaydb.config.compaction.{LevelMeter, LevelThrottle}
 import swaydb.utils.Java.JavaFunction
 
 import java.time.Duration

diff --git a/core-interop/src/main/scala/swaydb/config/builder/MemoryLevelZeroConfigBuilder.scala b/core-interop/src/main/scala/swaydb/config/builder/MemoryLevelZeroConfigBuilder.scala
@@ -18,8 +18,7 @@ package swaydb.config.builder
 
 import swaydb.config.accelerate.{Accelerator, LevelZeroMeter}
 import swaydb.config.compaction.LevelZeroThrottle
-import swaydb.config.ConfigWizard
-import swaydb.config.{Atomic, OptimiseWrites}
+import swaydb.config.{Atomic, ConfigWizard, OptimiseWrites}
 import swaydb.utils.Java.JavaFunction
 
 /**

diff --git a/core-interop/src/main/scala/swaydb/config/builder/PersistentLevelConfigBuilder.scala b/core-interop/src/main/scala/swaydb/config/builder/PersistentLevelConfigBuilder.scala
@@ -16,8 +16,8 @@
 
 package swaydb.config.builder
 
-import swaydb.config.compaction.{LevelMeter, LevelThrottle}
 import swaydb.config._
+import swaydb.config.compaction.{LevelMeter, LevelThrottle}
 import swaydb.effect.Dir
 import swaydb.utils.Java.JavaFunction
 

diff --git a/core-interop/src/main/scala/swaydb/config/builder/PersistentLevelZeroConfigBuilder.scala b/core-interop/src/main/scala/swaydb/config/builder/PersistentLevelZeroConfigBuilder.scala
@@ -18,8 +18,7 @@ package swaydb.config.builder
 
 import swaydb.config.accelerate.{Accelerator, LevelZeroMeter}
 import swaydb.config.compaction.LevelZeroThrottle
-import swaydb.config.{ConfigWizard, MMAP, RecoveryMode}
-import swaydb.config.{Atomic, OptimiseWrites}
+import swaydb.config._
 import swaydb.utils.Java.JavaFunction
 
 import java.nio.file.Path

diff --git a/core-interop/src/main/scala/swaydb/config/repairAppendix/SegmentInfo.scala b/core-interop/src/main/scala/swaydb/config/repairAppendix/SegmentInfo.scala
@@ -16,8 +16,7 @@
 
 package swaydb.config.repairAppendix
 
-import swaydb.slice.MaxKey
-import swaydb.slice.Slice
+import swaydb.slice.{MaxKey, Slice}
 
 import java.nio.file.Path
 

diff --git a/core-interop/src/test/scala/swaydb/MaxKeySpec.scala b/core-interop/src/test/scala/swaydb/MaxKeySpec.scala
@@ -2,9 +2,8 @@ package swaydb
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
-import swaydb.slice.MaxKey
+import swaydb.slice.{MaxKey, Slice}
 import swaydb.slice.order.KeyOrder
-import swaydb.slice.Slice
 
 class MaxKeySpec extends AnyWordSpec with Matchers {
 

diff --git a/core-performance/src/test/scala/swaydb/core/actor/ActorPerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/actor/ActorPerformanceSpec.scala
@@ -20,11 +20,9 @@ import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 import swaydb.ActorConfig.QueueOrder
 import swaydb.core.TestExecutionContext
-import swaydb.Benchmark
-import swaydb.{Actor, ActorRef}
+import swaydb.{Actor, ActorRef, Benchmark}
 
 import java.util.concurrent.ConcurrentLinkedQueue
-import scala.collection.parallel.CollectionConverters._
 import scala.concurrent.duration._
 
 class ActorPerformanceSpec extends AnyWordSpec with Matchers {

diff --git a/core-performance/src/test/scala/swaydb/core/cache/CachePerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/cache/CachePerformanceSpec.scala
@@ -19,15 +19,11 @@ package swaydb.core.cache
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 import swaydb.Error.Segment.ExceptionHandler
-import swaydb.IO
-import swaydb.core.cache.Cache
+import swaydb.{Benchmark, IO}
 import swaydb.core.CommonAssertions._
-import swaydb.Benchmark
 import swaydb.effect.Reserve
 import swaydb.testkit.RunThis._
 
-import scala.collection.parallel.CollectionConverters._
-
 class CachePerformanceSpec extends AnyWordSpec with Matchers {
 
   val range = 1 to 1000000

diff --git a/core-performance/src/test/scala/swaydb/core/file/BlockCachePerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/file/BlockCachePerformanceSpec.scala
@@ -16,10 +16,10 @@
 
 package swaydb.core.file
 
+import swaydb.Benchmark
 import swaydb.core.TestData._
 import swaydb.core.segment.block.BlockCache
 import swaydb.core.segment.cache.sweeper.MemorySweeper
-import swaydb.Benchmark
 import swaydb.core.{TestBase, TestCaseSweeper}
 import swaydb.utils.StorageUnits._
 

diff --git a/core-performance/src/test/scala/swaydb/core/file/DBFileWriteReadPerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/file/DBFileWriteReadPerformanceSpec.scala
@@ -16,13 +16,13 @@
 
 package swaydb.core.file
 
+import swaydb.Benchmark
 import swaydb.core.TestData._
-import swaydb.core.segment.block.{BlockCache, BlockCacheState}
-import swaydb.core.segment.block.reader.BlockRefReader
 import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.file.sweeper.FileSweeper
+import swaydb.core.segment.block.reader.BlockRefReader
+import swaydb.core.segment.block.{BlockCache, BlockCacheState}
 import swaydb.core.segment.cache.sweeper.MemorySweeper
-import swaydb.Benchmark
 import swaydb.core.{TestBase, TestCaseSweeper, TestSweeper}
 import swaydb.effect.{Effect, IOStrategy}
 import swaydb.utils.StorageUnits._

diff --git a/core-performance/src/test/scala/swaydb/core/file/ForceSavePerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/file/ForceSavePerformanceSpec.scala
@@ -16,11 +16,11 @@
 
 package swaydb.core.file
 
+import swaydb.Benchmark
+import swaydb.config.ForceSave
 import swaydb.core.TestData.randomBytesSlice
 import swaydb.core.file.sweeper.ByteBufferCleaner
-import swaydb.Benchmark
 import swaydb.core.{TestBase, TestCaseSweeper}
-import swaydb.config.ForceSave
 import swaydb.effect.Effect
 import swaydb.testkit.RunThis._
 import swaydb.utils.OperatingSystem

diff --git a/core-performance/src/test/scala/swaydb/core/level/PathsDistributorPerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/level/PathsDistributorPerformanceSpec.scala
@@ -19,11 +19,10 @@ package swaydb.core.level
 import swaydb.IOValues._
 import swaydb.core.TestCaseSweeper._
 import swaydb.core.segment.Segment
-import swaydb.Benchmark
 import swaydb.core.{TestBase, TestCaseSweeper}
-import swaydb.slice.order.KeyOrder
-import swaydb.effect
+import swaydb.{Benchmark, effect}
 import swaydb.effect.{Dir, Effect}
+import swaydb.slice.order.KeyOrder
 
 import scala.util.Random
 

diff --git a/core-performance/src/test/scala/swaydb/core/merge/SegmentMerge_Performance_Spec.scala b/core-performance/src/test/scala/swaydb/core/merge/SegmentMerge_Performance_Spec.scala
@@ -16,11 +16,11 @@
 
 package swaydb.core.segment.data.merge
 
-import swaydb.core.segment.data.{Memory, Time}
 import swaydb.Benchmark
+import swaydb.core.segment.data.{Memory, Time}
 import swaydb.core.{TestBase, TestTimer}
-import swaydb.slice.order.{KeyOrder, TimeOrder}
 import swaydb.slice.Slice
+import swaydb.slice.order.{KeyOrder, TimeOrder}
 import swaydb.testkit.RunThis._
 
 class SegmentMerge_Performance_Spec extends TestBase {

diff --git a/core-performance/src/test/scala/swaydb/core/segment/SegmentReadPerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/segment/SegmentReadPerformanceSpec.scala
@@ -16,29 +16,29 @@
 
 package swaydb.core.segment
 
+import swaydb.Benchmark
+import swaydb.config.SegmentRefCacheLife
+import swaydb.config.compaction.CompactionConfig.CompactionParallelism
 import swaydb.core.TestCaseSweeper._
 import swaydb.core.TestData._
-import swaydb.core.segment.data.Memory
 import swaydb.core.file.ForceSaveApplier
 import swaydb.core.level.PathsDistributor
-import swaydb.core.segment.data.merge.stats.MergeStats
 import swaydb.core.segment.block.binarysearch.{BinarySearchEntryFormat, BinarySearchIndexBlockConfig}
 import swaydb.core.segment.block.bloomfilter.BloomFilterBlockConfig
 import swaydb.core.segment.block.hashindex.HashIndexBlockConfig
 import swaydb.core.segment.block.segment.SegmentBlockConfig
 import swaydb.core.segment.block.sortedindex.SortedIndexBlockConfig
 import swaydb.core.segment.block.values.ValuesBlockConfig
+import swaydb.core.segment.cache.sweeper.MemorySweeper
+import swaydb.core.segment.data.Memory
+import swaydb.core.segment.data.merge.stats.MergeStats
 import swaydb.core.segment.entry.reader.PersistentReader
 import swaydb.core.segment.io.SegmentReadIO
 import swaydb.core.segment.ref.search.ThreadReadState
-import swaydb.core.segment.cache.sweeper.MemorySweeper
-import swaydb.Benchmark
 import swaydb.core.{TestBase, TestCaseSweeper, TestExecutionContext, TestSweeper}
-import swaydb.config.compaction.CompactionConfig.CompactionParallelism
-import swaydb.config.SegmentRefCacheLife
-import swaydb.slice.order.{KeyOrder, TimeOrder}
-import swaydb.slice.Slice
 import swaydb.effect.{Dir, IOAction, IOStrategy}
+import swaydb.slice.Slice
+import swaydb.slice.order.{KeyOrder, TimeOrder}
 import swaydb.testkit.RunThis.FutureImplicits
 import swaydb.utils.StorageUnits._
 

diff --git a/core-queue/src/test/scala/swaydb/core/queue/VolatileQueueSpec.scala b/core-queue/src/test/scala/swaydb/core/queue/VolatileQueueSpec.scala
@@ -20,7 +20,6 @@ import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 import swaydb.testkit.RunThis._
 
-import scala.collection.parallel.CollectionConverters._
 import scala.concurrent.Future
 import scala.concurrent.duration.DurationInt
 import scala.util.Random

diff --git a/core-series/src/main/scala/swaydb/core/series/growable/SeriesGrowableList.scala b/core-series/src/main/scala/swaydb/core/series/growable/SeriesGrowableList.scala
@@ -55,7 +55,7 @@ private[swaydb] object SeriesGrowableList {
 }
 
 private[swaydb] class SeriesGrowableList[T >: Null : ClassTag] private(@volatile private var series: SeriesAppendableVolatile[SeriesAppendableVolatile[T]],
-                                                                     lengthPerSeries: Int) { self =>
+                                                                       lengthPerSeries: Int) { self =>
 
   @volatile private var _written = 0
 

diff --git a/core-skiplist/src/main/scala/swaydb/core/skiplist/AtomicRanges.scala b/core-skiplist/src/main/scala/swaydb/core/skiplist/AtomicRanges.scala
@@ -19,10 +19,9 @@ package swaydb.core.skiplist
 import com.typesafe.scalalogging.LazyLogging
 import swaydb.Bag
 import swaydb.Bag.Implicits._
-import swaydb.slice.MaxKey
-import swaydb.effect.Reserve
 import swaydb.core.skiplist.AtomicRanges.{Action, Value}
-import swaydb.slice.Slice
+import swaydb.effect.Reserve
+import swaydb.slice.{MaxKey, Slice}
 
 import java.util.concurrent.ConcurrentSkipListMap
 import java.util.concurrent.atomic.AtomicLong
@@ -275,7 +274,7 @@ private[swaydb] case object AtomicRanges extends LazyLogging {
 }
 
 private[swaydb] class AtomicRanges[K](private val transactions: ConcurrentSkipListMap[AtomicRanges.Key[K], Value[Reserve[Unit]]])(implicit val keyRangeOrdering: Ordering[AtomicRanges.Key[K]],
-                                                                                                                                keyOrder: Ordering[K]) {
+                                                                                                                                  keyOrder: Ordering[K]) {
 
   private implicit val self: AtomicRanges[K] =
     this

diff --git a/core-skiplist/src/main/scala/swaydb/core/skiplist/SkipListConcurrent.scala b/core-skiplist/src/main/scala/swaydb/core/skiplist/SkipListConcurrent.scala
@@ -32,8 +32,8 @@ object SkipListConcurrent {
 }
 
 private[swaydb] class SkipListConcurrent[OK, OV, K <: OK, V <: OV] private(@volatile protected var skipList: ConcurrentSkipListMap[K, V],
-                                                                         val nullKey: OK,
-                                                                         val nullValue: OV)(implicit val keyOrder: KeyOrder[K]) extends SkipListNavigable[OK, OV, K, V](skipList.size()) with SkipListBatchable[OK, OV, K, V] {
+                                                                           val nullKey: OK,
+                                                                           val nullValue: OV)(implicit val keyOrder: KeyOrder[K]) extends SkipListNavigable[OK, OV, K, V](skipList.size()) with SkipListBatchable[OK, OV, K, V] {
 
   /**
    * Does not support concurrent batch writes since it's only being used by [[swaydb.core.level.Level]] which

diff --git a/core-skiplist/src/main/scala/swaydb/core/skiplist/SkipListConcurrentLimit.scala b/core-skiplist/src/main/scala/swaydb/core/skiplist/SkipListConcurrentLimit.scala
@@ -16,8 +16,8 @@
 
 package swaydb.core.skiplist
 
-import swaydb.slice.order.KeyOrder
 import swaydb.slice.Slice
+import swaydb.slice.order.KeyOrder
 
 import java.util
 import scala.collection.mutable
@@ -42,9 +42,9 @@ object SkipListConcurrentLimit {
 }
 
 private[swaydb] class SkipListConcurrentLimit[OK, OV, K <: OK, V <: OV](limit: Int,
-                                                                      skipList: SkipListConcurrent[OK, OV, K, V],
-                                                                      val nullKey: OK,
-                                                                      val nullValue: OV)(implicit val keyOrder: KeyOrder[K]) extends SkipList[OK, OV, K, V] {
+                                                                        skipList: SkipListConcurrent[OK, OV, K, V],
+                                                                        val nullKey: OK,
+                                                                        val nullValue: OV)(implicit val keyOrder: KeyOrder[K]) extends SkipList[OK, OV, K, V] {
 
   def dropOverflow(key: K): Unit =
     while (skipList.size > limit)

diff --git a/core-skiplist/src/main/scala/swaydb/core/skiplist/SkipListNavigable.scala b/core-skiplist/src/main/scala/swaydb/core/skiplist/SkipListNavigable.scala
@@ -16,9 +16,9 @@
 
 package swaydb.core.skiplist
 
-import swaydb.utils.NullOps
-import swaydb.slice.order.KeyOrder
 import swaydb.slice.Slice
+import swaydb.slice.order.KeyOrder
+import swaydb.utils.NullOps
 
 import java.util
 import java.util.Map

diff --git a/core-skiplist/src/main/scala/swaydb/core/skiplist/SkipListSeries.scala b/core-skiplist/src/main/scala/swaydb/core/skiplist/SkipListSeries.scala
@@ -231,10 +231,10 @@ private[swaydb] object SkipListSeries {
  *
  */
 private[swaydb] class SkipListSeries[OK, OV, K <: OK, V <: OV] private(@volatile private[skiplist] var series: SeriesGrowableList[KeyValue.Some[K, V]],
-                                                                     //maintain a count of number of removed items i.e. value is null.
-                                                                     @volatile private[skiplist] var _removed: Int,
-                                                                     val nullKey: OK,
-                                                                     val nullValue: OV)(implicit val keyOrder: KeyOrder[K]) extends SkipList[OK, OV, K, V] with LazyLogging { self =>
+                                                                       //maintain a count of number of removed items i.e. value is null.
+                                                                       @volatile private[skiplist] var _removed: Int,
+                                                                       val nullKey: OK,
+                                                                       val nullValue: OV)(implicit val keyOrder: KeyOrder[K]) extends SkipList[OK, OV, K, V] with LazyLogging { self =>
 
   private val randomWriteWarning = WhenOccurs(500)(times => logger.warn(SkipListSeries.randomWriteWarning(times)))
 

diff --git a/core-skiplist/src/main/scala/swaydb/core/skiplist/SkipListTreeMap.scala b/core-skiplist/src/main/scala/swaydb/core/skiplist/SkipListTreeMap.scala
@@ -33,8 +33,8 @@ object SkipListTreeMap {
 }
 
 private[swaydb] class SkipListTreeMap[OK, OV, K <: OK, V <: OV] private(protected val skipList: util.TreeMap[K, V],
-                                                                      val nullKey: OK,
-                                                                      val nullValue: OV)(implicit val keyOrder: KeyOrder[K]) extends SkipListNavigable[OK, OV, K, V](skipList.size()) {
+                                                                        val nullKey: OK,
+                                                                        val nullValue: OV)(implicit val keyOrder: KeyOrder[K]) extends SkipListNavigable[OK, OV, K, V](skipList.size()) {
 
   override def remove(key: K): Unit =
     throw new IllegalAccessException("Operation not allowed - TreeMap SkipList")

diff --git a/core-skiplist/src/test/scala/swaydb/core/skiplist/SkipListSeriesSpec.scala b/core-skiplist/src/test/scala/swaydb/core/skiplist/SkipListSeriesSpec.scala
@@ -18,10 +18,10 @@ package swaydb.core.skiplist
 
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
-import swaydb.slice.order.KeyOrder
-import swaydb.slice.{Slice, SliceOption}
 import swaydb.serializers.Default._
 import swaydb.serializers._
+import swaydb.slice.order.KeyOrder
+import swaydb.slice.{Slice, SliceOption}
 
 import scala.util.Random