Apply scalafix rules

lichess-org · Mar 4, 2024 · 607467f · 607467f
1 parent cf01d8a
commit 607467f
Show file tree

Hide file tree

Showing 37 changed files with 78 additions and 55 deletions.
diff --git a/src/main/scala/Auth.scala b/src/main/scala/Auth.scala
@@ -1,9 +1,10 @@
 package lila.ws
 
-import reactivemongo.api.bson.*
-import util.RequestHeader
 import com.roundeights.hasher.Algo
 import com.typesafe.config.Config
+import reactivemongo.api.bson.*
+
+import util.RequestHeader
 
 final class Auth(mongo: Mongo, seenAt: SeenAtUpdate, config: Config)(using Executor):
 

diff --git a/src/main/scala/Chess.scala b/src/main/scala/Chess.scala
@@ -1,12 +1,12 @@
 package lila.ws
 
-import play.api.libs.json.*
-import chess.format.{ Fen, Uci, UciCharPair, UciPath }
-import chess.opening.{ Opening, OpeningDb }
+import cats.syntax.option.*
 import chess.Square
 import chess.bitboard.Bitboard
+import chess.format.{ Fen, Uci, UciCharPair, UciPath }
+import chess.opening.{ Opening, OpeningDb }
 import chess.variant.{ Crazyhouse, Variant }
-import cats.syntax.option.*
+import play.api.libs.json.*
 
 import ipc.*
 

diff --git a/src/main/scala/Controller.scala b/src/main/scala/Controller.scala
@@ -1,11 +1,12 @@
 package lila.ws
 
+import cats.syntax.all.*
 import com.typesafe.config.Config
 import com.typesafe.scalalogging.Logger
 import io.netty.handler.codec.http.HttpResponseStatus
+
 import util.RequestHeader
 import ClientActor.{ Deps, Req }
-import cats.syntax.all.*
 
 final class Controller(
     config: Config,

diff --git a/src/main/scala/Fens.scala b/src/main/scala/Fens.scala
@@ -1,10 +1,11 @@
 package lila.ws
 
-import org.apache.pekko.actor.typed.ActorRef
 import chess.Color
 import chess.format.{ Fen, Uci }
-import java.util.concurrent.ConcurrentHashMap
 import lila.ws.ipc.*
+import org.apache.pekko.actor.typed.ActorRef
+
+import java.util.concurrent.ConcurrentHashMap
 
 /* Manages subscriptions to Fen updates */
 object Fens:

diff --git a/src/main/scala/LightUser.scala b/src/main/scala/LightUser.scala
@@ -2,6 +2,7 @@ package lila.ws
 
 import com.github.blemale.scaffeine.{ AsyncLoadingCache, Scaffeine }
 import reactivemongo.api.bson.*
+
 import Mongo.given
 
 final class LightUserApi(mongo: Mongo)(using Executor):

diff --git a/src/main/scala/Lila.scala b/src/main/scala/Lila.scala
@@ -5,10 +5,12 @@ import com.typesafe.config.Config
 import com.typesafe.scalalogging.Logger
 import io.lettuce.core.*
 import io.lettuce.core.pubsub.*
-import ipc.*
+
 import java.util.concurrent.ConcurrentLinkedQueue
 import scala.concurrent.Await
 
+import ipc.*
+
 final class Lila(config: Config)(using Executor):
 
   import Lila.*

diff --git a/src/main/scala/LilaHandler.scala b/src/main/scala/LilaHandler.scala
@@ -1,10 +1,11 @@
 package lila.ws
 
-import org.apache.pekko.actor.typed.ActorRef
 import com.typesafe.scalalogging.Logger
-import ipc.*
+import org.apache.pekko.actor.typed.ActorRef
 import ornicar.scalalib.ThreadLocalRandom
 
+import ipc.*
+
 final class LilaHandler(
     lila: Lila,
     users: Users,

diff --git a/src/main/scala/LilaRequest.scala b/src/main/scala/LilaRequest.scala
@@ -1,10 +1,11 @@
 package lila.ws
 
-import java.util.concurrent.atomic.AtomicInteger
-import com.github.blemale.scaffeine.Scaffeine
 import com.github.benmanes.caffeine.cache.RemovalCause
+import com.github.blemale.scaffeine.Scaffeine
 import com.typesafe.scalalogging.Logger
 
+import java.util.concurrent.atomic.AtomicInteger
+
 // send a request to lila and await a response
 object LilaRequest:
 

diff --git a/src/main/scala/LilaWs.scala b/src/main/scala/LilaWs.scala
@@ -1,8 +1,8 @@
 package lila.ws
 
-import org.apache.pekko.actor.typed.{ ActorSystem, Scheduler }
 import com.softwaremill.macwire.*
 import com.typesafe.config.{ Config, ConfigFactory }
+import org.apache.pekko.actor.typed.{ ActorSystem, Scheduler }
 
 object LilaWs extends App:
 

diff --git a/src/main/scala/Mongo.scala b/src/main/scala/Mongo.scala
@@ -5,10 +5,11 @@ import com.github.blemale.scaffeine.{ AsyncLoadingCache, Scaffeine }
 import com.typesafe.config.Config
 import reactivemongo.api.bson.*
 import reactivemongo.api.bson.collection.BSONCollection
-import reactivemongo.api.{ AsyncDriver, DB, MongoConnection, ReadConcern, ReadPreference, WriteConcern }
 import reactivemongo.api.commands.WriteResult
-import scala.util.{ Success, Try }
+import reactivemongo.api.{ AsyncDriver, DB, MongoConnection, ReadConcern, ReadPreference, WriteConcern }
+
 import java.time.LocalDateTime
+import scala.util.{ Success, Try }
 
 final class Mongo(config: Config)(using Executor) extends MongoHandlers:
 

diff --git a/src/main/scala/Monitor.scala b/src/main/scala/Monitor.scala
@@ -4,9 +4,10 @@ import com.typesafe.config.Config
 import com.typesafe.scalalogging.Logger
 import kamon.Kamon
 import kamon.tag.TagSet
-import java.util.concurrent.TimeUnit
 import lila.ws.util.Domain
 
+import java.util.concurrent.TimeUnit
+
 final class Monitor(
     config: Config,
     services: Services

diff --git a/src/main/scala/RelayCrowd.scala b/src/main/scala/RelayCrowd.scala
@@ -1,7 +1,7 @@
 package lila.ws
 
-import org.apache.pekko.actor.typed.Scheduler
 import cats.syntax.all.*
+import org.apache.pekko.actor.typed.Scheduler
 
 final private class RelayCrowd(roomCrowd: RoomCrowd, mongo: Mongo)(using ex: Executor, scheduler: Scheduler):
 

diff --git a/src/main/scala/RoundCrowd.scala b/src/main/scala/RoundCrowd.scala
@@ -1,6 +1,7 @@
 package lila.ws
 
 import chess.{ ByColor, Color }
+
 import java.util.concurrent.ConcurrentHashMap
 
 import ipc.*

diff --git a/src/main/scala/SeenAtUpdate.scala b/src/main/scala/SeenAtUpdate.scala
@@ -4,6 +4,7 @@ import com.github.blemale.scaffeine.{ Cache, Scaffeine }
 import reactivemongo.api.bson.*
 import reactivemongo.api.bson.collection.BSONCollection
 import reactivemongo.api.{ ReadConcern, WriteConcern }
+
 import java.time.LocalDateTime
 
 final class SeenAtUpdate(mongo: Mongo)(using

diff --git a/src/main/scala/SocialGraph.scala b/src/main/scala/SocialGraph.scala
@@ -1,6 +1,7 @@
 package lila.ws
 
 import com.typesafe.config.Config
+
 import java.util.concurrent.locks.ReentrantLock
 import scala.jdk.CollectionConverters.*
 import scala.util.{ boundary, Random }

diff --git a/src/main/scala/Users.scala b/src/main/scala/Users.scala
@@ -1,6 +1,7 @@
 package lila.ws
 
 import org.apache.pekko.actor.typed.Scheduler
+
 import java.util.concurrent.ConcurrentHashMap
 import scala.jdk.CollectionConverters.*
 

diff --git a/src/main/scala/actor/ApiActor.scala b/src/main/scala/actor/ApiActor.scala
@@ -1,7 +1,7 @@
 package lila.ws
 
-import org.apache.pekko.actor.typed.{ Behavior, PostStop }
 import org.apache.pekko.actor.typed.scaladsl.{ ActorContext, Behaviors }
+import org.apache.pekko.actor.typed.{ Behavior, PostStop }
 
 import ipc.*
 

diff --git a/src/main/scala/actor/ClientActor.scala b/src/main/scala/actor/ClientActor.scala
@@ -1,10 +1,11 @@
 package lila.ws
 
+import com.typesafe.scalalogging.Logger
+import lila.ws.util.SmallBoundedQueueSet
 import org.apache.pekko.actor.typed.Behavior
 import org.apache.pekko.actor.typed.scaladsl.{ ActorContext, Behaviors }
-import com.typesafe.scalalogging.Logger
+
 import ipc.*
-import lila.ws.util.SmallBoundedQueueSet
 
 object ClientActor:
 

diff --git a/src/main/scala/actor/RoundClientActor.scala b/src/main/scala/actor/RoundClientActor.scala
@@ -1,9 +1,10 @@
 package lila.ws
 
+import chess.Centis
 import org.apache.pekko.actor.typed.scaladsl.Behaviors
 import org.apache.pekko.actor.typed.{ Behavior, PostStop }
+
 import ipc.*
-import chess.Centis
 
 object RoundClientActor:
 

diff --git a/src/main/scala/evalCache/EvalCacheApi.scala b/src/main/scala/evalCache/EvalCacheApi.scala
@@ -1,16 +1,16 @@
 package lila.ws
 package evalCache
 
+import cats.syntax.all.*
+import chess.ErrorStr
+import chess.format.Fen
 import com.github.blemale.scaffeine.{ AsyncLoadingCache, Scaffeine }
-
-import lila.ws.ipc.ClientOut.{ EvalGet, EvalGetMulti, EvalPut }
+import com.typesafe.scalalogging.Logger
 import lila.ws.ipc.ClientIn
-import chess.format.Fen
-import chess.ErrorStr
+import lila.ws.ipc.ClientOut.{ EvalGet, EvalGetMulti, EvalPut }
 import play.api.libs.json.JsString
-import com.typesafe.scalalogging.Logger
-import cats.syntax.all.*
 import reactivemongo.api.bson.BSONDocument
+
 import java.time.LocalDateTime
 
 final class EvalCacheApi(mongo: Mongo)(using

diff --git a/src/main/scala/evalCache/EvalCacheBsonHandlers.scala b/src/main/scala/evalCache/EvalCacheBsonHandlers.scala
@@ -1,12 +1,13 @@
 package lila.ws
 package evalCache
 
-import reactivemongo.api.bson.*
-import reactivemongo.api.bson.exceptions.TypeDoesNotMatchException
-import scala.util.{ Failure, Success, Try }
 import cats.data.NonEmptyList
 import cats.syntax.all.*
 import chess.format.Uci
+import reactivemongo.api.bson.*
+import reactivemongo.api.bson.exceptions.TypeDoesNotMatchException
+
+import scala.util.{ Failure, Success, Try }
 
 object EvalCacheBsonHandlers:
 

diff --git a/src/main/scala/evalCache/EvalCacheEntry.scala b/src/main/scala/evalCache/EvalCacheEntry.scala
@@ -1,13 +1,14 @@
 package lila.ws
 package evalCache
 
+import cats.data.NonEmptyList
 import chess.format.{ Fen, Uci }
 import chess.variant.Variant
-import cats.data.NonEmptyList
 
-import Eval.Score
 import java.time.LocalDateTime
 
+import Eval.Score
+
 case class EvalCacheEntry(
     _id: EvalCacheEntry.Id,
     nbMoves: Int,                     // multipv cannot be greater than number of legal moves

diff --git a/src/main/scala/evalCache/EvalCacheJsonHandlers.scala b/src/main/scala/evalCache/EvalCacheJsonHandlers.scala
@@ -3,8 +3,8 @@ package evalCache
 
 import cats.syntax.all.*
 import chess.format.{ Fen, Uci, UciPath }
-import play.api.libs.json.*
 import chess.variant.Variant
+import play.api.libs.json.*
 
 import evalCache.EvalCacheEntry.*
 import evalCache.Eval.*

diff --git a/src/main/scala/evalCache/EvalCacheMulti.scala b/src/main/scala/evalCache/EvalCacheMulti.scala
@@ -3,9 +3,9 @@ package evalCache
 
 import chess.format.Fen
 import chess.variant.Variant
-import lila.ws.util.ExpireCallbackMemo
-import lila.ws.ipc.ClientOut.EvalGetMulti
 import lila.ws.ipc.ClientIn.EvalHitMulti
+import lila.ws.ipc.ClientOut.EvalGetMulti
+import lila.ws.util.ExpireCallbackMemo
 
 import scala.collection.mutable
 

diff --git a/src/main/scala/evalCache/EvalCacheTruster.scala b/src/main/scala/evalCache/EvalCacheTruster.scala
@@ -3,6 +3,7 @@ package evalCache
 
 import com.github.blemale.scaffeine.{ AsyncLoadingCache, Scaffeine }
 import reactivemongo.api.bson.*
+
 import java.time.LocalDateTime
 
 final private class EvalCacheTruster(mongo: Mongo)(using Executor) extends MongoHandlers:

diff --git a/src/main/scala/evalCache/EvalCacheUpgrade.scala b/src/main/scala/evalCache/EvalCacheUpgrade.scala
@@ -1,13 +1,12 @@
 package lila.ws
 package evalCache
 
-import play.api.libs.json.JsString
-
 import chess.format.{ Fen, UciPath }
 import chess.variant.Variant
-import lila.ws.util.ExpireCallbackMemo
-import lila.ws.ipc.ClientOut.EvalGet
 import lila.ws.ipc.ClientIn.EvalHit
+import lila.ws.ipc.ClientOut.EvalGet
+import lila.ws.util.ExpireCallbackMemo
+import play.api.libs.json.JsString
 
 import scala.collection.mutable
 

diff --git a/src/main/scala/ipc/ClientIn.scala b/src/main/scala/ipc/ClientIn.scala
@@ -1,11 +1,11 @@
 package lila.ws
 package ipc
 
-import chess.{ Check, Color, Ply }
+import chess.bitboard.Bitboard
 import chess.format.{ EpdFen, Uci, UciCharPair, UciPath }
 import chess.opening.Opening
 import chess.variant.Crazyhouse
-import chess.bitboard.Bitboard
+import chess.{ Check, Color, Ply }
 import play.api.libs.json.*
 
 sealed trait ClientIn extends ClientMsg:

diff --git a/src/main/scala/ipc/ClientOut.scala b/src/main/scala/ipc/ClientOut.scala
@@ -1,12 +1,13 @@
 package lila.ws
 package ipc
 
+import cats.data.NonEmptyList
 import chess.format.{ Fen, Uci, UciPath }
 import chess.variant.Variant
 import chess.{ Centis, Color, Square }
 import play.api.libs.json.*
+
 import scala.util.{ Success, Try }
-import cats.data.NonEmptyList
 
 sealed trait ClientOut extends ClientMsg
 

diff --git a/src/main/scala/ipc/types.scala b/src/main/scala/ipc/types.scala
@@ -1,8 +1,7 @@
 package lila.ws
 package ipc
 
-import chess.MoveMetrics
-import chess.Centis
+import chess.{ Centis, MoveMetrics }
 
 trait ClientMsg
 

diff --git a/src/main/scala/model.scala b/src/main/scala/model.scala
@@ -1,7 +1,7 @@
 package lila.ws
 
-import chess.{ ByColor, Color }
 import chess.format.{ Fen, Uci }
+import chess.{ ByColor, Color }
 import ornicar.scalalib.SecureRandom
 
 object User:

diff --git a/src/main/scala/netty/ActorChannelConnector.scala b/src/main/scala/netty/ActorChannelConnector.scala
@@ -1,14 +1,15 @@
 package lila.ws
 package netty
 
+import io.netty.buffer.Unpooled
+import io.netty.channel.*
+import io.netty.handler.codec.http.websocketx.*
+import io.netty.util.concurrent.{ Future as NettyFuture, GenericFutureListener }
 import lila.ws.Controller.Endpoint
 import org.apache.pekko.actor.typed.ActorRef
-import io.netty.channel.*
+
 import ProtocolHandler.key
-import io.netty.util.concurrent.{ Future as NettyFuture, GenericFutureListener }
 import ipc.ClientIn
-import io.netty.handler.codec.http.websocketx.*
-import io.netty.buffer.Unpooled
 
 final private class ActorChannelConnector(clients: ActorRef[Clients.Control])(using Executor):
 

diff --git a/src/main/scala/netty/FrameHandler.scala b/src/main/scala/netty/FrameHandler.scala
@@ -5,6 +5,7 @@ import com.typesafe.scalalogging.Logger
 import io.netty.channel.*
 import io.netty.handler.codec.http.websocketx.*
 import io.netty.util.concurrent.GenericFutureListener
+
 import ipc.ClientOut
 
 final private class FrameHandler(using Executor) extends SimpleChannelInboundHandler[WebSocketFrame]: