Reformat with scalafmt 3.5.0
This commit is contained in:
parent
2ee331e6b5
commit
c396fe5c4a
|
@ -26,13 +26,12 @@ object LCFramework {
|
|||
corsHeader = config.corsHeader
|
||||
)
|
||||
|
||||
Runtime.getRuntime.addShutdownHook( new Thread {
|
||||
override def run(): Unit = {
|
||||
println("Shutting down gracefully...")
|
||||
backgroundTask.shutdown()
|
||||
}
|
||||
Runtime.getRuntime.addShutdownHook(new Thread {
|
||||
override def run(): Unit = {
|
||||
println("Shutting down gracefully...")
|
||||
backgroundTask.shutdown()
|
||||
}
|
||||
)
|
||||
})
|
||||
|
||||
server.start()
|
||||
}
|
||||
|
|
|
@ -26,7 +26,7 @@ class BackgroundTask(config: Config, captchaManager: CaptchaManager) {
|
|||
val countExisting = captchaManager.getCount(param).getOrElse(0)
|
||||
val countRequired = requiredCountPerCombination - countExisting
|
||||
if (countRequired > 0) {
|
||||
val countCreate = Math.min(1.0 + requiredCountPerCombination/10.0, countRequired).toInt
|
||||
val countCreate = Math.min(1.0 + requiredCountPerCombination / 10.0, countRequired).toInt
|
||||
println(s"Creating $countCreate of $countRequired captchas for $param")
|
||||
|
||||
for (i <- 0 until countCreate) {
|
||||
|
@ -42,10 +42,10 @@ class BackgroundTask(config: Config, captchaManager: CaptchaManager) {
|
|||
}
|
||||
|
||||
private def allParameterCombinations(): List[Parameters] = {
|
||||
(config.captchaConfig).flatMap {captcha =>
|
||||
(captcha.allowedLevels).flatMap {level =>
|
||||
(captcha.allowedMedia).flatMap {media =>
|
||||
(captcha.allowedInputType).map {inputType =>
|
||||
(config.captchaConfig).flatMap { captcha =>
|
||||
(captcha.allowedLevels).flatMap { level =>
|
||||
(captcha.allowedMedia).flatMap { media =>
|
||||
(captcha.allowedInputType).map { inputType =>
|
||||
Parameters(level, media, inputType, Some(Size(0, 0)))
|
||||
}
|
||||
}
|
||||
|
|
|
@ -37,10 +37,10 @@ class CaptchaManager(config: Config, captchaProviders: CaptchaProviders) {
|
|||
captchaProviders.getProvider(param).flatMap { provider =>
|
||||
val providerId = provider.getId()
|
||||
val challenge = provider.returnChallenge()
|
||||
val blob = new ByteArrayInputStream(challenge.content)
|
||||
val blob = new ByteArrayInputStream(challenge.content)
|
||||
val token = insertCaptcha(provider, challenge, providerId, param, blob)
|
||||
// println("Added new challenge: " + token.toString)
|
||||
token.map(_.toInt)
|
||||
// println("Added new challenge: " + token.toString)
|
||||
token.map(_.toInt)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -3,7 +3,8 @@ package lc.database
|
|||
import java.sql.{Connection, DriverManager, Statement}
|
||||
|
||||
class DBConn() {
|
||||
val con: Connection = DriverManager.getConnection("jdbc:h2:./data/H2/captcha2;MAX_COMPACT_TIME=8000;DB_CLOSE_ON_EXIT=FALSE", "sa", "")
|
||||
val con: Connection =
|
||||
DriverManager.getConnection("jdbc:h2:./data/H2/captcha2;MAX_COMPACT_TIME=8000;DB_CLOSE_ON_EXIT=FALSE", "sa", "")
|
||||
|
||||
def getStatement(): Statement = {
|
||||
con.createStatement()
|
||||
|
|
|
@ -13,7 +13,13 @@ import java.net.InetSocketAddress
|
|||
import java.util
|
||||
import scala.jdk.CollectionConverters._
|
||||
|
||||
class Server(address: String, port: Int, captchaManager: CaptchaManager, playgroundEnabled: Boolean, corsHeader: String) {
|
||||
class Server(
|
||||
address: String,
|
||||
port: Int,
|
||||
captchaManager: CaptchaManager,
|
||||
playgroundEnabled: Boolean,
|
||||
corsHeader: String
|
||||
) {
|
||||
var headerMap: util.Map[String, util.List[String]] = _
|
||||
if (corsHeader.nonEmpty) {
|
||||
headerMap = Map("Access-Control-Allow-Origin" -> List(corsHeader).asJava).asJava
|
||||
|
|
Loading…
Reference in New Issue