diff options
| author | vlad <vlad@driver.xyz> | 2017-07-20 10:37:08 -0700 |
|---|---|---|
| committer | vlad <vlad@driver.xyz> | 2017-07-20 10:37:08 -0700 |
| commit | 5279d01cedb35a759347f194c0e8adb21d19e88e (patch) | |
| tree | e340bb2eaba41d917bbca8c5e42b0b76bd164e37 /src/main/scala/xyz/driver/pdsuicommon/concurrent/Cron.scala | |
| parent | d9c3283c307105e03253c621b9b25a6308ac3b94 (diff) | |
| parent | 7f7bd651122754a3df47894b64ddb0456561bbe7 (diff) | |
| download | rest-query-5279d01cedb35a759347f194c0e8adb21d19e88e.tar.gz rest-query-5279d01cedb35a759347f194c0e8adb21d19e88e.tar.bz2 rest-query-5279d01cedb35a759347f194c0e8adb21d19e88e.zip | |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# build.sbt
# src/main/scala/xyz/driver/pdsuicommon/auth/AuthenticatedRequestContext.scala
# src/main/scala/xyz/driver/pdsuicommon/domain/User.scala
# src/main/scala/xyz/driver/pdsuidomain/formats/json/user/ApiPartialUser.scala
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuicommon/concurrent/Cron.scala')
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuicommon/concurrent/Cron.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/scala/xyz/driver/pdsuicommon/concurrent/Cron.scala b/src/main/scala/xyz/driver/pdsuicommon/concurrent/Cron.scala index dd84beb..6659088 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/concurrent/Cron.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/concurrent/Cron.scala @@ -45,9 +45,9 @@ class Cron(settings: Cron.Settings) extends Closeable with StrictLogging { * Checks unused jobs */ def verify(): Unit = { - import scala.collection.JavaConversions.asScalaSet + import scala.collection.JavaConverters._ - val unusedJobs = settings.intervals.keySet -- jobs.toSet + val unusedJobs = settings.intervals.keySet -- jobs.asScala.toSet unusedJobs.foreach { job => logger.warn(s"The job '$job' is listed, but not registered or ignored") } @@ -60,7 +60,7 @@ class Cron(settings: Cron.Settings) extends Closeable with StrictLogging { object Cron { - case class Settings(disable: String, intervals: Map[String, FiniteDuration]) + final case class Settings(disable: String, intervals: Map[String, FiniteDuration]) private class SingletonTask(taskName: String, job: () => Future[Unit])(implicit ec: ExecutionContext) extends TimerTask with StrictLogging { |