From cbb067690b31a69d6ba6c543057ed75f2dd55414 Mon Sep 17 00:00:00 2001 From: Nathan Fischer Date: Wed, 10 Apr 2019 16:05:34 -0700 Subject: tidy up --- contrib/flyway/src/FlywayModule.scala | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'contrib') diff --git a/contrib/flyway/src/FlywayModule.scala b/contrib/flyway/src/FlywayModule.scala index 0d4c3462..6ee9ea0b 100644 --- a/contrib/flyway/src/FlywayModule.scala +++ b/contrib/flyway/src/FlywayModule.scala @@ -12,7 +12,6 @@ import org.flywaydb.core.internal.configuration.{ConfigUtils => flyway} import org.flywaydb.core.internal.info.MigrationInfoDumper import org.flywaydb.core.internal.logging.console.ConsoleLog.Level import org.flywaydb.core.internal.logging.console.ConsoleLogCreator -import upickle.default.writer import scala.collection.JavaConverters._ @@ -22,8 +21,6 @@ trait FlywayModule extends JavaModule { def flywayUrl: T[String] def flywayUser: T[String] = T("") def flywayPassword: T[String] = T("") - //def flywayClassLocationDeps: T[Agg[Dep]] = Agg.empty[Dep] - //def flywayClassLocations: T[Seq[String]] = T(Nil) def flywayFileLocations: T[Seq[PathRef]] = T(resources().map(pr => PathRef(pr.path / "db" / "migration", pr.quick))) def flywayDriverDeps: T[Agg[Dep]] def jdbcClasspath = T ( resolveDependencies( @@ -34,10 +31,7 @@ trait FlywayModule extends JavaModule { private def strToOptPair[A](key: String, v: String) = Option(v) - .filter { - case a: String => a.nonEmpty - case _ => true - } + .filter(_.nonEmpty) .map(key -> _) def flywayInstance = T.worker { -- cgit v1.2.3