Skip to content

Commit 4bf4e4f

Browse files
jakubjanecekscala-steward
jakubjanecek
and
scala-steward
authored
Update scalafmt-core to 2.5.1 (#231)
* Update scalafmt-core to 2.5.1 * style: Reformat after Scalafmt update Co-authored-by: Scala Steward <[email protected]>
1 parent e285b0a commit 4bf4e4f

File tree

15 files changed

+151
-132
lines changed

15 files changed

+151
-132
lines changed

‎.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "2.4.2"
1+
version = "2.5.1"
22

33
maxColumn = 140
44
assumeStandardLibraryStripMargin = true

‎cassandra-datastax-driver/src/main/scala/com/avast/sst/datastax/config/basic.scala

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -150,19 +150,20 @@ sealed abstract class ConsistencyLevel {
150150

151151
import ConsistencyLevel._
152152

153-
def toStringRepr: String = this match {
154-
case Any => "ANY"
155-
case One => "ONE"
156-
case Two => "TWO"
157-
case Three => "THREE"
158-
case Quorum => "QUORUM"
159-
case All => "ALL"
160-
case LocalOne => "LOCAL_ONE"
161-
case LocalQuorum => "LOCAL_QUORUM"
162-
case EachQuorum => "EACH_QUORUM "
163-
case Serial => "SERIAL"
164-
case LocalSerial => "LOCAL_SERIAL"
165-
}
153+
def toStringRepr: String =
154+
this match {
155+
case Any => "ANY"
156+
case One => "ONE"
157+
case Two => "TWO"
158+
case Three => "THREE"
159+
case Quorum => "QUORUM"
160+
case All => "ALL"
161+
case LocalOne => "LOCAL_ONE"
162+
case LocalQuorum => "LOCAL_QUORUM"
163+
case EachQuorum => "EACH_QUORUM "
164+
case Serial => "SERIAL"
165+
case LocalSerial => "LOCAL_SERIAL"
166+
}
166167

167168
}
168169

‎example/src/main/scala/com/avast/sst/example/Main.scala

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,17 @@ object Main extends ZioServerApp {
4444
meterRegistry <- MicrometerJmxModule.make[Task](configuration.jmx)
4545
_ <- Resource.liftF(MicrometerJvmModule.make[Task](meterRegistry))
4646
serverMetricsModule <- Resource.liftF(MicrometerHttp4sServerMetricsModule.make[Task](meterRegistry, clock))
47-
boundedConnectExecutionContext <- executorModule
48-
.makeThreadPoolExecutor(
49-
configuration.boundedConnectExecutor,
50-
new ConfigurableThreadFactory(Config(Some("hikari-connect-%02d")))
51-
)
52-
.map(ExecutionContext.fromExecutorService)
47+
boundedConnectExecutionContext <-
48+
executorModule
49+
.makeThreadPoolExecutor(
50+
configuration.boundedConnectExecutor,
51+
new ConfigurableThreadFactory(Config(Some("hikari-connect-%02d")))
52+
)
53+
.map(ExecutionContext.fromExecutorService)
5354
hikariMetricsFactory = new MicrometerMetricsTrackerFactory(meterRegistry)
54-
doobieTransactor <- DoobieHikariModule
55-
.make[Task](configuration.database, boundedConnectExecutionContext, executorModule.blocker, Some(hikariMetricsFactory))
55+
doobieTransactor <-
56+
DoobieHikariModule
57+
.make[Task](configuration.database, boundedConnectExecutionContext, executorModule.blocker, Some(hikariMetricsFactory))
5658
randomService = RandomService(doobieTransactor)
5759
httpClient <- Http4sBlazeClientModule.make[Task](configuration.client, executorModule.executionContext)
5860
circuitBreakerMetrics <- Resource.liftF(MicrometerCircuitBreakerMetricsModule.make[Task]("test-http-client", meterRegistry))

‎example/src/main/scala/com/avast/sst/example/service/RandomService.scala

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@ trait RandomService {
1313

1414
object RandomService {
1515

16-
def apply(transactor: Transactor[Task]): RandomService = new RandomService {
17-
override def randomNumber: Task[Double] = {
18-
sql"select random()"
19-
.query[Double]
20-
.unique
21-
.transact(transactor)
16+
def apply(transactor: Transactor[Task]): RandomService =
17+
new RandomService {
18+
override def randomNumber: Task[Double] = {
19+
sql"select random()"
20+
.query[Double]
21+
.unique
22+
.transact(transactor)
23+
}
2224
}
23-
}
2425

2526
}

‎grpc-server-micrometer/src/main/scala/com/avast/sst/grpc/server/micrometer/MonitoringServerInterceptor.scala

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,14 @@ class MonitoringServerInterceptor(meterRegistry: MeterRegistry) extends ServerIn
4747
}
4848

4949
private def makeGauge(name: String): AtomicLong = {
50-
gaugeCache.computeIfAbsent(name, n => {
51-
val counter = new AtomicLong()
52-
meterRegistry.gauge(n, counter)
53-
counter
54-
})
50+
gaugeCache.computeIfAbsent(
51+
name,
52+
n => {
53+
val counter = new AtomicLong()
54+
meterRegistry.gauge(n, counter)
55+
counter
56+
}
57+
)
5558
}
5659

5760
private def makeTimer(name: String): Timer = timerCache.computeIfAbsent(name, meterRegistry.timer(_))

‎http4s-server-blaze/src/main/scala/com/avast/sst/http4s/server/Http4sBlazeServerModule.scala

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,23 @@ object Http4sBlazeServerModule {
2727
InetSocketAddress.createUnresolved(config.listenAddress, config.listenPort)
2828
)
2929
)
30-
server <- BlazeServerBuilder[F](executionContext)
31-
.bindSocketAddress(inetSocketAddress)
32-
.withHttpApp(httpApp)
33-
.withoutBanner
34-
.withNio2(config.nio2Enabled)
35-
.withWebSockets(config.webSocketsEnabled)
36-
.enableHttp2(config.http2Enabled)
37-
.withResponseHeaderTimeout(Duration.fromNanos(config.responseHeaderTimeout.toNanos))
38-
.withIdleTimeout(Duration.fromNanos(config.idleTimeout.toNanos))
39-
.withBufferSize(config.bufferSize)
40-
.withMaxRequestLineLength(config.maxRequestLineLength)
41-
.withMaxHeadersLength(config.maxHeadersLength)
42-
.withChunkBufferMaxSize(config.chunkBufferMaxSize)
43-
.withConnectorPoolSize(config.connectorPoolSize)
44-
.withChannelOption[java.lang.Boolean](StandardSocketOptions.TCP_NODELAY, config.socketOptions.tcpNoDelay)
45-
.resource
30+
server <-
31+
BlazeServerBuilder[F](executionContext)
32+
.bindSocketAddress(inetSocketAddress)
33+
.withHttpApp(httpApp)
34+
.withoutBanner
35+
.withNio2(config.nio2Enabled)
36+
.withWebSockets(config.webSocketsEnabled)
37+
.enableHttp2(config.http2Enabled)
38+
.withResponseHeaderTimeout(Duration.fromNanos(config.responseHeaderTimeout.toNanos))
39+
.withIdleTimeout(Duration.fromNanos(config.idleTimeout.toNanos))
40+
.withBufferSize(config.bufferSize)
41+
.withMaxRequestLineLength(config.maxRequestLineLength)
42+
.withMaxHeadersLength(config.maxHeadersLength)
43+
.withChunkBufferMaxSize(config.chunkBufferMaxSize)
44+
.withConnectorPoolSize(config.connectorPoolSize)
45+
.withChannelOption[java.lang.Boolean](StandardSocketOptions.TCP_NODELAY, config.socketOptions.tcpNoDelay)
46+
.resource
4647
} yield server
4748
}
4849
}

‎http4s-server-micrometer/src/main/scala/com/avast/sst/http4s/server/micrometer/RouteMetrics.scala

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ class RouteMetrics[F[_]: Sync](meterRegistry: MeterRegistry, clock: Clock[F]) {
2525
val httpStatusCodes = new HttpStatusMetrics(prefix, meterRegistry)
2626
for {
2727
start <- clock.monotonic(TimeUnit.NANOSECONDS)
28-
response <- F
29-
.delay(activeRequests.increment())
30-
.bracket { _ => route.flatTap(response => F.delay(httpStatusCodes.recordHttpStatus(response.status))) } { _ =>
31-
for {
32-
time <- computeTime(start)
33-
_ <- F.delay(activeRequests.increment(-1))
34-
_ <- F.delay(timer.record(time, TimeUnit.NANOSECONDS))
35-
} yield ()
36-
}
28+
response <-
29+
F.delay(activeRequests.increment())
30+
.bracket { _ => route.flatTap(response => F.delay(httpStatusCodes.recordHttpStatus(response.status))) } { _ =>
31+
for {
32+
time <- computeTime(start)
33+
_ <- F.delay(activeRequests.increment(-1))
34+
_ <- F.delay(timer.record(time, TimeUnit.NANOSECONDS))
35+
} yield ()
36+
}
3737
} yield response
3838
}
3939

‎http4s-server/src/main/scala/com/avast/sst/http4s/server/middleware/CorrelationIdMiddleware.scala

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,21 @@ class CorrelationIdMiddleware[F[_]: Sync](
2626

2727
private val F = Sync[F]
2828

29-
def wrap(routes: HttpRoutes[F]): HttpRoutes[F] = Kleisli[OptionT[F, *], Request[F], Response[F]] { request =>
30-
request.headers.get(correlationIdHeaderName) match {
31-
case Some(header) =>
32-
val requestWithAttribute = request.withAttribute(attributeKey, CorrelationId(header.value))
33-
routes(requestWithAttribute).map(r => r.withHeaders(r.headers.put(header)))
34-
case None =>
35-
for {
36-
newCorrelationId <- OptionT.liftF(F.delay(generator()))
37-
_ <- log(newCorrelationId)
38-
requestWithAttribute = request.withAttribute(attributeKey, CorrelationId(newCorrelationId))
39-
response <- routes(requestWithAttribute)
40-
} yield response.withHeaders(response.headers.put(Header(correlationIdHeaderName.value, newCorrelationId)))
29+
def wrap(routes: HttpRoutes[F]): HttpRoutes[F] =
30+
Kleisli[OptionT[F, *], Request[F], Response[F]] { request =>
31+
request.headers.get(correlationIdHeaderName) match {
32+
case Some(header) =>
33+
val requestWithAttribute = request.withAttribute(attributeKey, CorrelationId(header.value))
34+
routes(requestWithAttribute).map(r => r.withHeaders(r.headers.put(header)))
35+
case None =>
36+
for {
37+
newCorrelationId <- OptionT.liftF(F.delay(generator()))
38+
_ <- log(newCorrelationId)
39+
requestWithAttribute = request.withAttribute(attributeKey, CorrelationId(newCorrelationId))
40+
response <- routes(requestWithAttribute)
41+
} yield response.withHeaders(response.headers.put(Header(correlationIdHeaderName.value, newCorrelationId)))
42+
}
4143
}
42-
}
4344

4445
def retrieveCorrelationId(request: Request[F]): Option[CorrelationId] = request.attributes.lookup(attributeKey)
4546

‎jvm/src/main/scala/com/avast/sst/jvm/execution/ForkJoinPoolConfig.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ final case class ForkJoinPoolConfig(
1414
math.min(math.max(math.ceil(numOfCpus * parallelismFactor).toInt, parallelismMin), parallelismMax)
1515
}
1616

17-
private[sst] def computeAsyncMode: Boolean = taskPeekingMode match {
18-
case FIFO => true
19-
case LIFO => false
20-
}
17+
private[sst] def computeAsyncMode: Boolean =
18+
taskPeekingMode match {
19+
case FIFO => true
20+
case LIFO => false
21+
}
2122

2223
}
2324

‎jvm/src/main/scala/com/avast/sst/jvm/system/console/Console.scala

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,25 @@ trait Console[F[_]] {
2020

2121
object Console {
2222

23-
def apply[F[_]: Sync](in: Reader, out: OutputStream, err: OutputStream): Console[F] = new Console[F] {
23+
def apply[F[_]: Sync](in: Reader, out: OutputStream, err: OutputStream): Console[F] =
24+
new Console[F] {
2425

25-
private val F = Sync[F]
26+
private val F = Sync[F]
2627

27-
override def printLine(value: String): F[Unit] = F.delay {
28-
SConsole.withOut(out)(SConsole.println(value))
29-
}
28+
override def printLine(value: String): F[Unit] =
29+
F.delay {
30+
SConsole.withOut(out)(SConsole.println(value))
31+
}
3032

31-
override def printLineToError(value: String): F[Unit] = F.delay {
32-
SConsole.withErr(err)(SConsole.err.println(value))
33-
}
33+
override def printLineToError(value: String): F[Unit] =
34+
F.delay {
35+
SConsole.withErr(err)(SConsole.err.println(value))
36+
}
3437

35-
override def readLine: F[String] = F.delay {
36-
SConsole.withIn(in)(StdIn.readLine())
38+
override def readLine: F[String] =
39+
F.delay {
40+
SConsole.withIn(in)(StdIn.readLine())
41+
}
3742
}
38-
}
3943

4044
}

‎jvm/src/main/scala/com/avast/sst/jvm/system/random/Random.scala

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,26 @@ trait Random[F[_]] {
1818

1919
object Random {
2020

21-
def apply[F[_]: Sync](rnd: scala.util.Random): Random[F] = new Random[F] {
21+
def apply[F[_]: Sync](rnd: scala.util.Random): Random[F] =
22+
new Random[F] {
2223

23-
private val F = Sync[F]
24+
private val F = Sync[F]
2425

25-
override def nextDouble: F[Double] = F.delay(rnd.nextDouble())
26+
override def nextDouble: F[Double] = F.delay(rnd.nextDouble())
2627

27-
override def nextBoolean: F[Boolean] = F.delay(rnd.nextBoolean())
28+
override def nextBoolean: F[Boolean] = F.delay(rnd.nextBoolean())
2829

29-
override def nextFloat: F[Float] = F.delay(rnd.nextFloat())
30+
override def nextFloat: F[Float] = F.delay(rnd.nextFloat())
3031

31-
override def nextInt: F[Int] = F.delay(rnd.nextInt())
32+
override def nextInt: F[Int] = F.delay(rnd.nextInt())
3233

33-
override def nextInt(n: Int): F[Int] = F.delay(rnd.nextInt(n))
34+
override def nextInt(n: Int): F[Int] = F.delay(rnd.nextInt(n))
3435

35-
override def nextLong: F[Long] = F.delay(rnd.nextLong())
36+
override def nextLong: F[Long] = F.delay(rnd.nextLong())
3637

37-
override def nextPrintableChar: F[Char] = F.delay(rnd.nextPrintableChar())
38+
override def nextPrintableChar: F[Char] = F.delay(rnd.nextPrintableChar())
3839

39-
override def nextString(length: Int): F[String] = F.delay(rnd.nextString(length))
40-
}
40+
override def nextString(length: Int): F[String] = F.delay(rnd.nextString(length))
41+
}
4142

4243
}

‎micrometer-jmx/src/main/scala/com/avast/sst/micrometer/jmx/TypeScopeNameObjectNameFactory.scala

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,28 @@ private[jmx] class TypeScopeNameObjectNameFactory(separator: String = ".") exten
2323
parsedName.getOrElse(defaultFactory.createName(`type`, domain, name))
2424
}
2525

26-
private def parseName(domain: String, name: String) = Either.catchNonFatal {
27-
val parts = name.split(quotedSeparator, partNames.length)
26+
private def parseName(domain: String, name: String) =
27+
Either.catchNonFatal {
28+
val parts = name.split(quotedSeparator, partNames.length)
2829

29-
/* The following block of code is a little hack. The problem is that ObjectName requires HashTable as parameter but HashTable
30+
/* The following block of code is a little hack. The problem is that ObjectName requires HashTable as parameter but HashTable
3031
is unsorted and thus unusable for us. We hack it by raping the HashTable and in-fact using LinkedHashMap which is
3132
much more suitable for our needs. */
32-
val map = new java.util.LinkedHashMap[String, String](parts.length)
33-
val properties = new java.util.Hashtable[String, String](parts.length) {
34-
override def entrySet(): util.Set[util.Map.Entry[String, String]] = map.entrySet()
33+
val map = new java.util.LinkedHashMap[String, String](parts.length)
34+
val properties = new java.util.Hashtable[String, String](parts.length) {
35+
override def entrySet(): util.Set[util.Map.Entry[String, String]] = map.entrySet()
36+
}
37+
38+
parts.zip(partNames).foreach {
39+
case (part, partName) =>
40+
val quoted = quote(part)
41+
properties.put(partName, quoted)
42+
map.put(partName, quoted)
43+
}
44+
45+
new ObjectName(domain, properties)
3546
}
3647

37-
parts.zip(partNames).foreach {
38-
case (part, partName) =>
39-
val quoted = quote(part)
40-
properties.put(partName, quoted)
41-
map.put(partName, quoted)
42-
}
43-
44-
new ObjectName(domain, properties)
45-
}
46-
4748
private def quote(objectName: String) = objectName.replaceAll("[\\Q.?*\"\\E]", "_")
4849

4950
}

‎monix-catnap/src/main/scala/com/avast/sst/monix/catnap/CircuitBreakerMetrics.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ object CircuitBreakerMetrics {
2424

2525
}
2626

27-
def noop[F[_]](implicit F: Applicative[F]): CircuitBreakerMetrics[F] = new CircuitBreakerMetrics[F] {
28-
override def increaseRejected: F[Unit] = F.unit
29-
override def setState(state: State): F[Unit] = F.unit
30-
}
27+
def noop[F[_]](implicit F: Applicative[F]): CircuitBreakerMetrics[F] =
28+
new CircuitBreakerMetrics[F] {
29+
override def increaseRejected: F[Unit] = F.unit
30+
override def setState(state: State): F[Unit] = F.unit
31+
}
3132

3233
}

‎ssl-config/src/main/scala/com/avast/sst/ssl/Slf4jLogger.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ private class Slf4jLogger(l: Logger) extends NoDepsLogger {
2121

2222
private[ssl] object Slf4jLogger {
2323

24-
def factory: LoggerFactory = new LoggerFactory {
25-
override def apply(clazz: Class[_]): NoDepsLogger = new Slf4jLogger(Slf4jLoggerFactory.getLogger(clazz))
26-
override def apply(name: String): NoDepsLogger = new Slf4jLogger(Slf4jLoggerFactory.getLogger(name))
27-
}
24+
def factory: LoggerFactory =
25+
new LoggerFactory {
26+
override def apply(clazz: Class[_]): NoDepsLogger = new Slf4jLogger(Slf4jLoggerFactory.getLogger(clazz))
27+
override def apply(name: String): NoDepsLogger = new Slf4jLogger(Slf4jLoggerFactory.getLogger(name))
28+
}
2829

2930
}

0 commit comments

Comments
 (0)