refactor: PR changes

Author: jakubjanecek

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

@@ -1,11 +1,27 @@
 package com.avast.sst.flyway.pureconfig
 
+import java.nio.charset.{Charset, IllegalCharsetNameException, UnsupportedCharsetException}
+
+import cats.syntax.either._
 import com.avast.sst.flyway.FlywayConfig
+import org.flywaydb.core.api.MigrationVersion
 import pureconfig.ConfigReader
+import pureconfig.error.ExceptionThrown
 import pureconfig.generic.semiauto.deriveReader
 
 trait ConfigReaders {
 
+  implicit private[pureconfig] val charsetReader: ConfigReader[Charset] = ConfigReader[String].emap { value =>
+    try {
+      Charset.forName(value).asRight
+    } catch {
+      case ex @ (_: IllegalArgumentException | _: IllegalCharsetNameException | _: UnsupportedCharsetException) =>
+        ExceptionThrown(ex).asLeft
+    }
+  }
+
+  implicit val migrationVersionReader: ConfigReader[MigrationVersion] = ConfigReader[String].map(MigrationVersion.fromVersion)
+
   implicit val configReader: ConfigReader[FlywayConfig] = deriveReader
 
 }

flyway/src/main/scala/com/avast/sst/flyway/FlywayConfig.scala

@@ -1,16 +1,17 @@
 package com.avast.sst.flyway
 
-final case class FlywayConfig(url: String,
-                              username: String,
-                              password: String,
-                              baselineOnMigrate: Boolean = false,
-                              baselineVersion: Option[String] = None,
+import java.nio.charset.{Charset, StandardCharsets}
+
+import org.flywaydb.core.api.MigrationVersion
+
+final case class FlywayConfig(baselineOnMigrate: Boolean = false,
+                              baselineVersion: Option[MigrationVersion] = None,
                               baselineDescription: Option[String] = None,
                               batch: Boolean = false,
                               cleanDisabled: Boolean = false,
                               cleanOnValidationError: Boolean = false,
                               connectRetries: Int = 0,
-                              encoding: String = "UTF-8",
+                              encoding: Charset = StandardCharsets.UTF_8,
                               group: Boolean = false,
                               ignoreFutureMigrations: Boolean = true,
                               ignoreIgnoredMigrations: Boolean = false,

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

@@ -1,16 +1,17 @@
 package com.avast.sst.flyway
 
 import cats.effect.Sync
+import javax.sql.DataSource
 import org.flywaydb.core.Flyway
 
 object FlywayModule {
 
   @SuppressWarnings(Array("org.wartremover.warts.NonUnitStatements"))
-  def make[F[_]: Sync](config: FlywayConfig): F[Flyway] = {
+  def make[F[_]: Sync](dataSource: DataSource, config: FlywayConfig): F[Flyway] = {
     Sync[F].delay {
       val builder = Flyway
         .configure
-        .dataSource(config.url, config.username, config.password)
+        .dataSource(dataSource)
         .baselineOnMigrate(config.baselineOnMigrate)
         .batch(config.batch)
         .cleanDisabled(config.cleanDisabled)