Skip to content

Commit 4a77b59

Browse files
tomashermantomasherman
authored
Use -source:future code dialect
Changes made by automatic migration tool
1 parent 9c8c624 commit 4a77b59

File tree

73 files changed

+153
-148
lines changed

Some content is hidden

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

73 files changed

+153
-148
lines changed

‎.scalafmt.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
version = "3.5.1"
2-
runner.dialect = "scala213"
2+
runner.dialect = "scala3"
33

44
maxColumn = 140
55
assumeStandardLibraryStripMargin = true

‎build.sbt

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ def pureconfig = libraryDependencies ++= {
99
Dependencies.pureConfigCore,
1010
Dependencies.pureConfigGeneric
1111
)
12+
case _ => List.empty
1213
}
1314
}
1415

‎bundle-zio-http4s-blaze/src/main/scala/com/avast/sst/bundle/ZioResourceApp.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package com.avast.sst.bundle
22

33
import cats.effect.Resource
44
import org.slf4j.LoggerFactory
5-
import zio._
6-
import zio.interop.catz._
5+
import zio.*
6+
import zio.interop.catz.*
77

88
/** Extend this `trait` if you want to implement application using [[zio.ZIO]] effect data type.
99
*

‎bundle-zio-http4s-blaze/src/main/scala/com/avast/sst/bundle/ZioServerApp.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package com.avast.sst.bundle
33
import cats.effect.Resource
44
import org.http4s.server.Server
55
import org.slf4j.LoggerFactory
6-
import zio._
7-
import zio.interop.catz._
6+
import zio.*
7+
import zio.interop.catz.*
88

99
import scala.annotation.nowarn
1010

‎cassandra-datastax-driver-pureconfig/src/main/scala-3/com/avast/sst/datastax/pureconfig/ConfigReaders.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.avast.sst.datastax.pureconfig
22

3-
import com.avast.sst.datastax.config._
3+
import com.avast.sst.datastax.config.*
44
import pureconfig.{ConfigFieldMapping, ConfigReader}
5-
import pureconfig.generic.derivation.default._
5+
import pureconfig.generic.derivation.default.*
66

77
trait ConfigReaders {
88

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.avast.sst.datastax
22

33
import cats.effect.{Resource, Sync}
4-
import com.avast.sst.datastax.DatastaxHelper._
4+
import com.avast.sst.datastax.DatastaxHelper.*
55
import com.avast.sst.datastax.config.CassandraDatastaxDriverConfig
66
import com.datastax.oss.driver.api.core.CqlSession
7-
import com.datastax.oss.driver.api.core.config.DefaultDriverOption._
8-
import com.datastax.oss.driver.api.core.config.{DriverConfigLoader, ProgrammaticDriverConfigLoaderBuilder => DriverBuilder}
7+
import com.datastax.oss.driver.api.core.config.DefaultDriverOption.*
8+
import com.datastax.oss.driver.api.core.config.{DriverConfigLoader, ProgrammaticDriverConfigLoaderBuilder as DriverBuilder}
99

1010
import javax.net.ssl.SSLContext
1111

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.avast.sst.datastax
22

3-
import com.datastax.oss.driver.api.core.config.{DriverOption, ProgrammaticDriverConfigLoaderBuilder => DriverBuilder}
3+
import com.datastax.oss.driver.api.core.config.{DriverOption, ProgrammaticDriverConfigLoaderBuilder as DriverBuilder}
44

55
import scala.concurrent.duration.Duration
6-
import scala.jdk.CollectionConverters._
6+
import scala.jdk.CollectionConverters.*
77

88
/** Helper functions to construct Datastax session using Java builder. */
99
private[datastax] object DatastaxHelper {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.avast.sst.datastax.config
22

3-
import scala.concurrent.duration._
3+
import scala.concurrent.duration.*
44

55
/** Advanced datastax driver configuration
66
*

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.avast.sst.datastax.config
22

3-
import scala.concurrent.duration._
3+
import scala.concurrent.duration.*
44

55
/** Basic datastax driver configuration.
66
*
@@ -142,7 +142,7 @@ final case class FilterConfig(`class`: String)
142142
*/
143143
sealed abstract class ConsistencyLevel {
144144

145-
import ConsistencyLevel._
145+
import ConsistencyLevel.*
146146

147147
def toStringRepr: String =
148148
this match {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.avast.sst.datastax
22

3-
import scala.concurrent.duration._
3+
import scala.concurrent.duration.*
44

55
package object config {
66
val ConnectTimeout: Duration = 5.seconds

‎cats-effect/src/main/scala/com/avast/sst/catseffect/TimeUtils.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.avast.sst.catseffect
22

3-
import cats.effect.syntax.bracket._
3+
import cats.effect.syntax.bracket.*
44
import cats.effect.{Bracket, Clock, ExitCase}
5-
import cats.syntax.flatMap._
6-
import cats.syntax.functor._
5+
import cats.syntax.flatMap.*
6+
import cats.syntax.functor.*
77

88
import java.util.concurrent.TimeUnit
99
import scala.concurrent.duration.Duration

‎cats-effect/src/test/scala/com/avast/sst/catseffect/syntax/FOpsTest.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.avast.sst.catseffect.syntax
22

33
import cats.effect.concurrent.Ref
44
import cats.effect.{Clock, IO, Timer}
5-
import com.avast.sst.catseffect.syntax.time._
5+
import com.avast.sst.catseffect.syntax.time.*
66
import org.scalatest.funsuite.AsyncFunSuite
77

88
import scala.concurrent.ExecutionContext

‎doobie-hikari-pureconfig/src/main/scala-3/com/avast/sst/doobie/pureconfig/ConfigReaders.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.avast.sst.doobie.pureconfig
22

3-
import cats.syntax.either._
3+
import cats.syntax.either.*
44
import com.avast.sst.doobie.DoobieHikariConfig
55
import doobie.enumerated.TransactionIsolation
66
import pureconfig.ConfigReader
77
import pureconfig.error.CannotConvert
8-
import pureconfig.generic.derivation.default._
8+
import pureconfig.generic.derivation.default.*
99

1010
trait ConfigReaders {
1111

‎doobie-hikari/src/main/scala/com/avast/sst/doobie/DoobieHikariModule.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.avast.sst.doobie
22

33
import cats.Show
44
import cats.effect.{Async, Blocker, ContextShift, Resource, Sync}
5-
import cats.syntax.show._
5+
import cats.syntax.show.*
66
import com.zaxxer.hikari.HikariConfig
77
import com.zaxxer.hikari.metrics.MetricsTrackerFactory
88
import doobie.enumerated.TransactionIsolation

‎example/src/main/scala-3/com/avast/sst/example/config/Configuration.scala

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
package com.avast.sst.example.config
22

33
import com.avast.sst.doobie.DoobieHikariConfig
4-
import com.avast.sst.doobie.pureconfig.implicits._
4+
import com.avast.sst.doobie.pureconfig.implicits.*
55
import com.avast.sst.http4s.client.Http4sBlazeClientConfig
6-
import com.avast.sst.http4s.client.pureconfig.implicits._
6+
import com.avast.sst.http4s.client.pureconfig.implicits.*
77
import com.avast.sst.http4s.server.Http4sBlazeServerConfig
8-
import com.avast.sst.http4s.server.pureconfig.implicits._
8+
import com.avast.sst.http4s.server.pureconfig.implicits.*
99
import com.avast.sst.jvm.execution.ThreadPoolExecutorConfig
10-
import com.avast.sst.jvm.pureconfig.implicits._
10+
import com.avast.sst.jvm.pureconfig.implicits.*
1111
import com.avast.sst.micrometer.jmx.MicrometerJmxConfig
12-
import com.avast.sst.micrometer.jmx.pureconfig.implicits._
12+
import com.avast.sst.micrometer.jmx.pureconfig.implicits.*
1313
import com.avast.sst.monix.catnap.CircuitBreakerConfig
14-
import com.avast.sst.monix.catnap.pureconfig.implicits._
14+
import com.avast.sst.monix.catnap.pureconfig.implicits.*
1515
import pureconfig.ConfigReader
16-
import pureconfig.generic.derivation.default._
16+
import pureconfig.generic.derivation.default.*
1717

1818
final case class Configuration(
1919
server: Http4sBlazeServerConfig,

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import com.avast.sst.pureconfig.PureConfigModule
2222
import com.zaxxer.hikari.metrics.micrometer.MicrometerMetricsTrackerFactory
2323
import org.http4s.server.Server
2424
import zio.Task
25-
import zio.interop.catz._
26-
import zio.interop.catz.implicits._
25+
import zio.interop.catz.*
26+
import zio.interop.catz.implicits.*
2727

2828
import java.util.concurrent.TimeUnit
2929
import scala.concurrent.ExecutionContext

‎example/src/main/scala/com/avast/sst/example/module/Http4sRoutingModule.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
package com.avast.sst.example.module
22

3-
import cats.implicits._
3+
import cats.implicits.*
44
import com.avast.sst.example.service.RandomService
55
import com.avast.sst.http4s.server.Http4sRouting
66
import com.avast.sst.http4s.server.micrometer.MicrometerHttp4sServerMetricsModule
77
import org.http4s.client.Client
88
import org.http4s.dsl.Http4sDsl
99
import org.http4s.{HttpApp, HttpRoutes}
1010
import zio.Task
11-
import zio.interop.catz._
11+
import zio.interop.catz.*
1212

1313
class Http4sRoutingModule(
1414
randomService: RandomService,
1515
client: Client[Task],
1616
serverMetricsModule: MicrometerHttp4sServerMetricsModule[Task]
1717
) extends Http4sDsl[Task] {
1818

19-
import serverMetricsModule._
19+
import serverMetricsModule.*
2020

2121
private val helloWorldRoute = routeMetrics.wrap("hello")(Ok("Hello World!"))
2222

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.avast.sst.example.service
22

33
import doobie.Fragment
4-
import doobie.implicits._
4+
import doobie.implicits.*
55
import doobie.util.transactor.Transactor
66
import zio.Task
7-
import zio.interop.catz._
7+
import zio.interop.catz.*
88

99
trait RandomService {
1010

‎flyway-pureconfig/src/main/scala-3/com/avast/sst/flyway/pureconfig/ConfigReaders.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.avast.sst.flyway.pureconfig
22

3-
import cats.syntax.either._
3+
import cats.syntax.either.*
44
import com.avast.sst.flyway.FlywayConfig
55
import org.flywaydb.core.api.MigrationVersion
66
import pureconfig.ConfigReader
77
import pureconfig.error.ExceptionThrown
8-
import pureconfig.generic.derivation.default._
9-
import pureconfig.generic.derivation.default._
8+
import pureconfig.generic.derivation.default.*
9+
import pureconfig.generic.derivation.default.*
1010

1111
import java.nio.charset.Charset
1212

‎flyway/src/main/scala/com/avast/sst/flyway/FlywayModule.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import cats.effect.Sync
44
import org.flywaydb.core.Flyway
55

66
import javax.sql.DataSource
7-
import scala.jdk.CollectionConverters._
7+
import scala.jdk.CollectionConverters.*
88

99
object FlywayModule {
1010

@@ -19,7 +19,7 @@ object FlywayModule {
1919
.connectRetries(config.connectRetries)
2020
.encoding(config.encoding)
2121
.group(config.group)
22-
.ignoreMigrationPatterns(config.ignoreMigrationPatterns: _*)
22+
.ignoreMigrationPatterns(config.ignoreMigrationPatterns*)
2323
.mixed(config.mixed)
2424
.outOfOrder(config.outOfOrder)
2525
.validateOnMigrate(config.validateOnMigrate)
@@ -30,7 +30,7 @@ object FlywayModule {
3030
config.targetVersion.foreach(builder.target)
3131
config.baselineDescription.foreach(builder.baselineDescription)
3232
config.installedBy.foreach(builder.installedBy)
33-
if (config.locations.nonEmpty) builder.locations(config.locations: _*)
33+
if (config.locations.nonEmpty) builder.locations(config.locations*)
3434

3535
builder.load()
3636
}

‎fs2-kafka-pureconfig/src/main/scala-3/com/avast/sst/fs2kafka/pureconfig/ConfigReaders.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.avast.sst.fs2kafka.pureconfig
22

3-
import cats.syntax.either._
3+
import cats.syntax.either.*
44
import com.avast.sst.fs2kafka.{ConsumerConfig, ProducerConfig}
55
import fs2.kafka.{Acks, AutoOffsetReset, CommitRecovery, IsolationLevel}
66
import pureconfig.ConfigReader
77
import pureconfig.error.CannotConvert
8-
import pureconfig.generic.derivation.default._
8+
import pureconfig.generic.derivation.default.*
99

1010
@SuppressWarnings(Array("scalafix:DisableSyntax.=="))
1111
trait ConfigReaders {

‎fs2-kafka/src/main/scala/com/avast/sst/fs2kafka/ConsumerConfig.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.avast.sst.fs2kafka
22

3-
import com.avast.sst.fs2kafka.ConsumerConfig._
3+
import com.avast.sst.fs2kafka.ConsumerConfig.*
44
import fs2.kafka.{AutoOffsetReset, CommitRecovery, IsolationLevel}
5-
import org.apache.kafka.clients.consumer.{ConsumerConfig => ApacheConsumerConfig}
5+
import org.apache.kafka.clients.consumer.{ConsumerConfig as ApacheConsumerConfig}
66

77
import java.util.concurrent.TimeUnit.{MILLISECONDS, SECONDS}
88
import scala.annotation.nowarn
99
import scala.concurrent.duration.FiniteDuration
10-
import scala.jdk.CollectionConverters._
10+
import scala.jdk.CollectionConverters.*
1111

1212
@nowarn("msg=dead code")
1313
final case class ConsumerConfig(

‎fs2-kafka/src/main/scala/com/avast/sst/fs2kafka/Fs2KafkaModule.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.avast.sst.fs2kafka
22

33
import cats.effect.{Blocker, ConcurrentEffect, ContextShift, Resource, Timer}
4-
import fs2.kafka._
4+
import fs2.kafka.*
55

66
object Fs2KafkaModule {
77

‎fs2-kafka/src/main/scala/com/avast/sst/fs2kafka/ProducerConfig.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.avast.sst.fs2kafka
22

3-
import com.avast.sst.fs2kafka.ProducerConfig._
3+
import com.avast.sst.fs2kafka.ProducerConfig.*
44
import fs2.kafka.Acks
5-
import org.apache.kafka.clients.producer.{ProducerConfig => ApacheProducerConfig}
5+
import org.apache.kafka.clients.producer.{ProducerConfig as ApacheProducerConfig}
66

77
import java.util.concurrent.TimeUnit.{MILLISECONDS, SECONDS}
88
import scala.concurrent.duration.FiniteDuration
9-
import scala.jdk.CollectionConverters._
9+
import scala.jdk.CollectionConverters.*
1010

1111
final case class ProducerConfig(
1212
bootstrapServers: List[String],

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.avast.sst.grpc.server.micrometer
22

33
import io.grpc.ForwardingServerCall.SimpleForwardingServerCall
4-
import io.grpc._
4+
import io.grpc.*
55
import io.micrometer.core.instrument.{MeterRegistry, Timer}
66

77
import java.util.concurrent.atomic.AtomicLong

‎grpc-server-pureconfig/src/main/scala-3/com/avast/sst/grpc/server/pureconfig/ConfigReaders.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.avast.sst.grpc.server.pureconfig
22

33
import com.avast.sst.grpc.server.GrpcServerConfig
44
import pureconfig.ConfigReader
5-
import pureconfig.generic.derivation.default._
5+
import pureconfig.generic.derivation.default.*
66

77
trait ConfigReaders {
88

‎grpc-server/src/main/scala/com/avast/sst/grpc/server/interceptor/LoggingServerInterceptor.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.avast.sst.grpc.server.interceptor
22

33
import io.grpc.ForwardingServerCall.SimpleForwardingServerCall
44
import io.grpc.ForwardingServerCallListener.SimpleForwardingServerCallListener
5-
import io.grpc._
5+
import io.grpc.*
66
import org.slf4j.Logger
77

88
/** Adds basic logging around each gRPC call. */
@@ -42,7 +42,7 @@ class LoggingServerInterceptor(logger: Logger) extends ServerInterceptor {
4242
status.getCause
4343
)
4444
} else {
45-
logger.debug("Successful response from method {}: {}", Array(methodName, status): _*)
45+
logger.debug("Successful response from method {}: {}", Array(methodName, status)*)
4646
}
4747
super.close(status, trailers)
4848
}

‎http4s-client-blaze-pureconfig/src/main/scala-3/com/avast/sst/http4s/client/pureconfig/ConfigReaders.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.avast.sst.http4s.client.pureconfig
22

3-
import cats.syntax.either._
3+
import cats.syntax.either.*
44
import com.avast.sst.http4s.client.Http4sBlazeClientConfig
55
import org.http4s.blaze.client.ParserMode
66
import org.http4s.headers.`User-Agent`
77
import pureconfig.ConfigReader
88
import pureconfig.error.CannotConvert
9-
import pureconfig.generic.derivation.default._
9+
import pureconfig.generic.derivation.default.*
1010

1111
trait ConfigReaders {
1212

‎http4s-client-blaze/src/test/scala/com/avast/sst/http4s/client/Http4SBlazeClientTest.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.avast.sst.http4s.client
22

3-
import cats.effect._
4-
import org.http4s.headers._
3+
import cats.effect.*
4+
import org.http4s.headers.*
55
import org.http4s.{ProductComment, ProductId}
66
import org.scalatest.funsuite.AsyncFunSuite
77

0 commit comments

Comments
 (0)