Skip to content

Commit 1e46b5d

Browse files
darkfrog26darkfrog26
committed
Optimized imports
1 parent 6b03b64 commit 1e46b5d

File tree

51 files changed

+73
-113
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+73
-113
lines changed

‎benchmarks/src/main/scala/scribe/benchmark/LoggingSpeedBenchmark.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package scribe.benchmark
22

3-
import java.util.concurrent.TimeUnit
43
import org.openjdk.jmh.annotations
54
import scribe.benchmark.tester._
65

6+
import java.util.concurrent.TimeUnit
7+
78
// jmh:run -i 3 -wi 3 -f1 -t1 -rf JSON -rff benchmarks.json
89
@annotations.State(annotations.Scope.Thread)
910
class LoggingSpeedBenchmark {

‎benchmarks/src/main/scala/scribe/benchmark/LoggingStressTest.scala

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package scribe.benchmark
22

33
import scribe.file._
4-
5-
import java.nio.file.{Files, Paths}
6-
import java.util.concurrent.TimeUnit
7-
import scribe.{Level, LogRecord, Logger}
84
import scribe.format.Formatter
95
import scribe.handler.LogHandler
6+
import scribe.{Level, LogRecord, Logger}
107

8+
import java.nio.file.{Files, Paths}
9+
import java.util.concurrent.TimeUnit
1110
import scala.annotation.tailrec
1211

1312
object LoggingStressTest {

‎benchmarks/src/main/scala/scribe/benchmark/LoggingVisualizations.scala

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package scribe.benchmark
22

3-
import scribe.benchmark.tester.{LoggingTester, Testers}
4-
5-
import java.util.concurrent.TimeUnit
63
import perfolation._
4+
import scribe.benchmark.tester.{LoggingTester, Testers}
75

86
import java.io.{BufferedWriter, File, FileOutputStream, OutputStreamWriter}
7+
import java.util.concurrent.TimeUnit
98
import scala.annotation.tailrec
109
import scala.io.Source
1110

‎benchmarks/src/main/scala/scribe/benchmark/PerformanceBenchmark.scala

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package scribe.benchmark
22

33
import org.openjdk.jmh.annotations
4-
import scribe.format._
5-
import scribe.{Level, LogRecord, Logger}
6-
import scribe.handler.LogHandler
74
import scribe.output.LogOutput
85
import scribe.output.format.OutputFormat
96
import scribe.writer.Writer
7+
import scribe.{Level, LogRecord, Logger}
108

119
import java.util.concurrent.TimeUnit
1210
import java.util.concurrent.atomic.AtomicLong

‎benchmarks/src/main/scala/scribe/benchmark/tester/ScribeEffectLoggingTester.scala

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package scribe.benchmark.tester
22

33
import cats.effect.IO
44
import cats.effect.unsafe.implicits.global
5-
import cats.implicits._
65
import scribe.Logger
76
import scribe.cats._
87
import scribe.file._

‎benchmarks/src/main/scala/scribe/benchmark/tester/ScribeEffectParallelLoggingTester.scala

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package scribe.benchmark.tester
22

33
import cats.effect.IO
44
import cats.effect.unsafe.implicits.global
5-
import cats.implicits._
65
import scribe.Logger
76
import scribe.cats._
87
import scribe.file._

‎cats/shared/src/test/scala/spec/ScribeSpec.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package spec
22

33
import cats.MonadThrow
44
import cats.effect._
5-
import cats.syntax.all._
65
import cats.effect.testing.scalatest.AsyncIOSpec
6+
import cats.syntax.all._
77
import org.scalatest.matchers.should.Matchers
88
import org.scalatest.wordspec.AsyncWordSpec
99
import scribe.handler.LogHandler

‎config/src/main/scala/scribe/ScribeConfig.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package scribe
22

3-
import moduload.Moduload
43
import fabric.rw._
4+
import moduload.Moduload
55
import profig._
66

77
object ScribeConfig extends Moduload {

‎core/jvm/src/main/scala/LogExample.scala

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import scribe._
22
import scribe.data.MDC
3-
import scribe.message.LazyMessage
43

54
object LogExample extends App {
65
MDC.update("key1", "value1")

‎core/jvm/src/main/scala/scribe/handler/AsynchronousLogHandle.scala

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
package scribe.handler
22

3-
import java.util.concurrent.ConcurrentLinkedQueue
4-
import java.util.concurrent.atomic.AtomicLong
5-
63
import scribe.LogRecord
7-
import scribe.format.Formatter
8-
import scribe.modify.LogModifier
9-
import scribe.output.format.OutputFormat
10-
import scribe.writer.{ConsoleWriter, Writer}
114

5+
import java.util.concurrent.ConcurrentLinkedQueue
6+
import java.util.concurrent.atomic.AtomicLong
127
import scala.language.implicitConversions
138

149
/**

‎core/jvm/src/main/scala/scribe/handler/AtomicLongExtras.scala

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package scribe.handler
22

33
import java.util.concurrent.atomic.AtomicLong
4-
54
import scala.annotation.tailrec
65

76
class AtomicLongExtras(val value: AtomicLong) extends AnyVal {

‎core/jvm/src/main/scala/scribe/handler/package.scala

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package scribe
22

33
import java.util.concurrent.atomic.AtomicLong
4-
54
import scala.language.implicitConversions
65

76
package object handler {

‎core/jvm/src/test/scala/spec/AsynchronousLoggingSpec.scala

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,17 @@ package spec
22

33
import org.scalatest.matchers.should.Matchers
44
import org.scalatest.wordspec.AnyWordSpec
5-
6-
import java.util.concurrent.ConcurrentLinkedQueue
5+
import scribe.Execution.global
76
import scribe.format._
87
import scribe.output.LogOutput
98
import scribe.output.format.OutputFormat
109
import scribe.writer.Writer
1110
import scribe.{LogRecord, Logger}
1211

12+
import java.util.concurrent.ConcurrentLinkedQueue
1313
import scala.concurrent.Future
1414
import scala.jdk.CollectionConverters._
1515
import scala.language.implicitConversions
16-
import scribe.Execution.global
1716

1817
class AsynchronousLoggingSpec extends AnyWordSpec with Matchers {
1918
private val Regex = """(\d+) - (.+)""".r

‎core/shared/src/main/scala/scribe/LogRecord.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package scribe
22

3-
import scribe.message.{LoggableMessage, Message}
3+
import scribe.message.LoggableMessage
44
import scribe.modify.LogModifier
55
import scribe.output.{CompositeOutput, EmptyOutput, LogOutput, TextOutput}
66
import scribe.record.SimpleLogRecord

‎core/shared/src/main/scala/scribe/LogRecordCreator.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package scribe
22

3-
import scribe.message.{LoggableMessage, Message}
3+
import scribe.message.LoggableMessage
44
import scribe.util.Time
55

66
trait LogRecordCreator {

‎core/shared/src/main/scala/scribe/Loggable.scala

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package scribe
22

3-
import scribe.message.{LoggableMessage, Message}
4-
import scribe.output.{EmptyOutput, LogOutput, TextOutput}
3+
import scribe.output.LogOutput
54

65
import scala.language.implicitConversions
76

‎core/shared/src/main/scala/scribe/Logger.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package scribe
22

3-
import java.io.PrintStream
43
import scribe.format.Formatter
54
import scribe.handler.{LogHandle, LogHandler, SynchronousLogHandle}
65
import scribe.jul.JULHandler
7-
import scribe.message.{LoggableMessage, Message}
6+
import scribe.message.LoggableMessage
87
import scribe.modify.{LevelFilter, LogBooster, LogModifier}
98
import scribe.output.format.OutputFormat
109
import scribe.util.Time
1110
import scribe.writer.{ConsoleWriter, Writer}
1211
import sourcecode.{FileName, Line, Name, Pkg}
1312

13+
import java.io.PrintStream
1414
import scala.reflect._
1515
import scala.util.Try
1616

‎core/shared/src/main/scala/scribe/LoggerSupport.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package scribe
22

33
import scribe.data.MDC
4-
import scribe.message.{LoggableMessage, Message}
4+
import scribe.message.LoggableMessage
55

66
import scala.language.experimental.macros
77

‎core/shared/src/main/scala/scribe/handler/SynchronousLogHandle.scala

-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
package scribe.handler
22

33
import scribe.LogRecord
4-
import scribe.format.Formatter
5-
import scribe.modify.LogModifier
6-
import scribe.output.format.OutputFormat
7-
import scribe.writer.{ConsoleWriter, Writer}
84

95
object SynchronousLogHandle extends LogHandle {
106
def log(handler: LogHandlerBuilder, record: LogRecord): Unit = {

‎core/shared/src/main/scala/scribe/jul/JULHandler.scala

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package scribe.jul
22

3-
import scribe.message.Message
43
import scribe._
54

65
import java.util.logging.{Level => JLevel}

‎core/shared/src/main/scala/scribe/message/LoggableMessage.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package scribe.message
22

3-
import scribe.{LogRecord, Loggable}
43
import scribe.output.{EmptyOutput, LogOutput, TextOutput}
4+
import scribe.{LogRecord, Loggable}
55

66
import scala.language.implicitConversions
77

‎core/shared/src/main/scala/scribe/message/Message.scala

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package scribe.message
22

3-
import scribe.Loggable
4-
53
trait Message[M] extends LoggableMessage {
64
override def value: M
75
}

‎core/shared/src/main/scala/scribe/output/format/ANSIOutputFormat.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package scribe.output.format
22

3-
import scribe.output._
43
import scribe.ANSI
4+
import scribe.output._
55

66
import scala.language.implicitConversions
77

‎core/shared/src/main/scala/scribe/record/LogRecordPool.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package scribe.record
22

3-
import scribe.message.{LoggableMessage, Message}
4-
import scribe.output.{CompositeOutput, LogOutput}
3+
import scribe.message.LoggableMessage
4+
import scribe.output.LogOutput
55
import scribe.{Level, LogRecord, LogRecordCreator}
66

77
import java.util.concurrent.ConcurrentLinkedQueue

‎core/shared/src/main/scala/scribe/record/SimpleLogRecord.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package scribe.record
22

3-
import scribe.message.{LoggableMessage, Message}
3+
import scribe.message.LoggableMessage
4+
import scribe.output.LogOutput
45
import scribe.{Level, LogRecord, LogRecordCreator}
5-
import scribe.output.{CompositeOutput, LogOutput}
66

77
class SimpleLogRecord(val level: Level,
88
val levelValue: Double,

‎core/shared/src/main/scala/scribe/writer/SystemWriter.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ package scribe.writer
22

33
import scribe.output._
44
import scribe.output.format.OutputFormat
5-
import scribe.{ANSI, Level, LogRecord, Logger}
5+
import scribe.{Level, LogRecord, Logger}
66

77
import java.io.PrintStream
8-
import scala.math.Ordering.Implicits._
98
import scala.language.implicitConversions
9+
import scala.math.Ordering.Implicits._
1010

1111
/**
1212
* SystemWriter writes to System.out or System.err choosing the latter if the level is higher than Info

‎core/shared/src/test/scala/specs/ImplicitLoggingSpec.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class ImplicitLoggingSpec extends AnyWordSpec with Matchers {
1111
ImplicitLoggingTestObject.initialize()
1212
}
1313
"properly log a simple message" in {
14-
val line = Some(15)
14+
val line = Some(13)
1515

1616
ImplicitLoggingTestObject.doSomething()
1717
ImplicitLoggingTestObject.handler.records.length should be(1)

‎core/shared/src/test/scala/specs/ImplicitLoggingTestObject.scala

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package specs
22

33
import scribe._
4-
import scribe.handler.LogHandler
5-
import scribe.writer.NullWriter
64

75
object ImplicitLoggingTestObject {
86
val handler = new TestingHandler

‎core/shared/src/test/scala/specs/LoggingSpec.scala

+4-5
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,20 @@ package specs
22

33
import org.scalatest.matchers.should.Matchers
44
import org.scalatest.wordspec.AnyWordSpec
5-
6-
import java.util.concurrent.atomic.AtomicInteger
75
import perfolation._
86
import scribe._
97
import scribe.data._
108
import scribe.filter._
119
import scribe.format.{FormatBlock, Formatter}
12-
import scribe.handler.{LogHandler, SynchronousLogHandle}
10+
import scribe.handler.LogHandler
1311
import scribe.message.LoggableMessage
1412
import scribe.modify.{LevelFilter, LogBooster}
15-
import scribe.output.format.{HTMLOutputFormat, OutputFormat}
13+
import scribe.output.format.OutputFormat
1614
import scribe.output.{LogOutput, TextOutput}
1715
import scribe.util.Time
18-
import scribe.writer.{CacheWriter, NullWriter, Writer}
16+
import scribe.writer.{CacheWriter, Writer}
1917

18+
import java.util.concurrent.atomic.AtomicInteger
2019
import scala.collection.mutable.ListBuffer
2120
import scala.language.implicitConversions
2221

‎core/shared/src/test/scala/specs/TestingHandler.scala

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package specs
22

3+
import scribe.LogRecord
34
import scribe.handler.LogHandler
4-
import scribe.modify.LogModifier
5-
import scribe.{LogRecord, Priority}
65

76
import scala.collection.mutable.ListBuffer
87

‎fileModule/jvm/src/test/scala/spec/StressTestFileLogging.scala

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package spec
22

33
import scribe._
4-
import scribe.file._
5-
import scribe.file.FileWriter
4+
import scribe.file.{FileWriter, _}
65
import scribe.output.format.ASCIIOutputFormat
76

87
import scala.io.Source

‎fileModule/shared/src/main/scala/scribe/file/FlushMode.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import scribe.file.writer.LogFileWriter
44
import scribe.util.Time
55

66
import java.util.concurrent.atomic.{AtomicBoolean, AtomicLong}
7-
import scala.concurrent.{ExecutionContext, Future}
87
import scala.concurrent.duration._
8+
import scala.concurrent.{ExecutionContext, Future}
99

1010
trait FlushMode {
1111
def dataWritten(logFile: LogFile, writer: LogFileWriter): Unit

‎fileModule/shared/src/main/scala/scribe/file/package.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package scribe
22

3-
import scribe.file.path._
43
import scribe.file.path.PathPart.FileName
4+
import scribe.file.path._
55

66
import java.io.File
77
import java.nio.file.Path
8-
import scala.language.implicitConversions
98
import scala.concurrent.duration.{DurationInt, FiniteDuration}
9+
import scala.language.implicitConversions
1010

1111
package object file {
1212
val DefaultBufferSize: Int = 1024

‎fileModule/shared/src/main/scala/scribe/file/path/FileNamePart.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package scribe.file.path
22

3-
import scribe.file.FileWriter
43
import perfolation._
4+
import scribe.file.FileWriter
55

66
import java.util.Calendar
77

‎fileModule/shared/src/main/scala/scribe/file/path/MaxLogs.scala

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package scribe.file.path
33
import scribe.file.FileWriter
44
import scribe.util.Time
55

6-
import java.nio.file.Files
76
import scala.concurrent.duration._
87

98
case class MaxLogs(maxLogs: Int, checkFrequency: FiniteDuration) extends FileNamePart {

0 commit comments

Comments
 (0)