Removed casting on MigrationInfoService filters collections

Author: hhandoko

src/main/java/com/builtamont/cassandra/migration/CassandraMigration.kt

@@ -59,7 +59,7 @@ class CassandraMigration : CassandraMigrationConfiguration {
     /**
      * The Cassandra migration configuration.
      */
-    val configs: MigrationConfigs
+    lateinit var configs: MigrationConfigs
 
     /**
      * CassandraMigration initialization.

src/main/java/com/builtamont/cassandra/migration/internal/command/Migrate.kt

@@ -72,10 +72,7 @@ class Migrate(
 
             // Initialise `firstRun` and `currentSchemaVersion` variables
             val firstRun = migrationSuccessCount == 0
-            var currentSchemaVersion = MigrationVersion.EMPTY
-            if (infoService.current() != null) {
-                currentSchemaVersion = infoService.current()!!.version
-            }
+            val currentSchemaVersion = infoService.current()?.version ?: MigrationVersion.CURRENT
 
             // First run only
             // ~~~~~
@@ -93,7 +90,7 @@ class Migrate(
             // Log future migrations and warn users if there are no resolved migrations, or
             // if there current version migration is newer than what is available
             val future = infoService.future()
-            if (future.size > 0) {
+            if (future.isNotEmpty()) {
                 val resolvedLogMsg = "Keyspace $keyspaceName has version $currentSchemaVersion"
                 val resolved = infoService.resolved()
                 if (resolved.size == 0) {
@@ -108,7 +105,7 @@ class Migrate(
             // ~~~~~
             // Log failed future migrations and throw `CassandraMigrationException` for everything else
             val failed = infoService.failed()
-            if (failed.size > 0) {
+            if (failed.isNotEmpty()) {
                 val isFutureFailed = failed[0].state === MigrationState.FUTURE_FAILED
                 val failedVersion = failed[0].version
                 if (failed.size == 1 && isFutureFailed) {
@@ -122,14 +119,17 @@ class Migrate(
 
             // Pending migrations
             // ~~~~~
-            // Early return if there are no pending migrations, otherwise
-            // apply pending migrations and exit when error is thrown
-            val pendingMigrations = infoService.pending() as Array<MigrationInfoImpl>
-            if (pendingMigrations.size == 0) {
+            // Apply pending migrations
+            val pendingMigrations = infoService.pending()
+            if (pendingMigrations.isNotEmpty()) {
+                if (pendingMigrations[0] is MigrationInfoImpl) {
+                    val isOutOfOrder = pendingMigrations[0].version.compareTo(currentSchemaVersion) < 0
+                    applyMigration(pendingMigrations[0] as MigrationInfoImpl, isOutOfOrder) ?: break
+                }
+            } else {
+                // Exit if there are no more pending migrations
                 break
             }
-            val isOutOfOrder = pendingMigrations[0].version.compareTo(currentSchemaVersion) < 0
-            applyMigration(pendingMigrations[0], isOutOfOrder) ?: break
 
             migrationSuccessCount++
         }
@@ -184,9 +184,9 @@ class Migrate(
         stopWatch.start()
 
         var isMigrationSuccess = false
-        val migrationExecutor = migration.resolvedMigration?.executor
         try {
-            migrationExecutor!!.execute(session)
+            val executor = migration.resolvedMigration!!.executor!!
+            executor.execute(session)
             isMigrationSuccess = true
             LOG.debug("$logMsg success!")
         } catch (e: Exception) {

src/main/java/com/builtamont/cassandra/migration/internal/info/MigrationInfoImpl.kt

@@ -34,9 +34,9 @@ import java.util.*
  * @param context The current context.
  */
 class MigrationInfoImpl(
-        val resolvedMigration: ResolvedMigration?,
-        val appliedMigration: AppliedMigration?,
-        private val context: MigrationInfoContext
+    val resolvedMigration: ResolvedMigration?,
+    val appliedMigration: AppliedMigration?,
+    private val context: MigrationInfoContext
 ) : MigrationInfo {
 
     /**

src/main/java/com/builtamont/cassandra/migration/internal/info/MigrationInfoServiceImpl.kt

@@ -48,7 +48,7 @@ class MigrationInfoServiceImpl(
     /**
      * The migrations infos calculated at the last refresh.
      */
-    private var migrationInfos: List<MigrationInfoImpl>? = null
+    private var migrationInfos: List<MigrationInfoImpl> = emptyList()
 
     /**
      * Refreshes the info about all known migrations from both the classpath and the DB.
@@ -60,7 +60,7 @@ class MigrationInfoServiceImpl(
         migrationInfos = mergeAvailableAndAppliedMigrations(availableMigrations, appliedMigrations)
 
         if (MigrationVersion.CURRENT === target) {
-            target = current()!!.version
+            target = current()?.version
         }
     }
 
@@ -70,7 +70,7 @@ class MigrationInfoServiceImpl(
      * @return The error message, or `null` if everything is fine.
      */
     override fun validate(): String? {
-        migrationInfos?.forEach { it.validate()?.let { return it } }
+        migrationInfos.forEach { it.validate()?.let { return it } }
         return null
     }
 
@@ -80,14 +80,14 @@ class MigrationInfoServiceImpl(
      * @return The migrations.
      */
     override fun all(): Array<MigrationInfo> {
-        return migrationInfos?.toTypedArray<MigrationInfo>() ?: emptyArray()
+        return migrationInfos.toTypedArray()
     }
 
     /**
      * @return Current migration to be run.
      */
     override fun current(): MigrationInfo? {
-        return migrationInfos?.lastOrNull { it.state.isApplied }
+        return migrationInfos.lastOrNull { it.state.isApplied }
     }
 
     /**
@@ -96,7 +96,7 @@ class MigrationInfoServiceImpl(
      * @return The pending migrations. An empty array if none.
      */
     override fun pending(): Array<MigrationInfo> {
-        return migrationInfos?.filter { it.state === MigrationState.PENDING }.orEmpty<MigrationInfo>().toTypedArray()
+        return migrationInfos.filter { it.state === MigrationState.PENDING }.orEmpty().toTypedArray()
     }
 
     /**
@@ -105,7 +105,7 @@ class MigrationInfoServiceImpl(
      * @return The applied migrations. An empty array if none.
      */
     override fun applied(): Array<MigrationInfo> {
-        return migrationInfos?.filter { it.state.isApplied }.orEmpty<MigrationInfo>().toTypedArray()
+        return migrationInfos.filter { it.state.isApplied }.orEmpty().toTypedArray()
     }
 
     /**
@@ -114,7 +114,7 @@ class MigrationInfoServiceImpl(
      * @return The resolved migrations. An empty array if none.
      */
     override fun resolved(): Array<MigrationInfo> {
-        return migrationInfos?.filter { it.state.isResolved }.orEmpty<MigrationInfo>().toTypedArray()
+        return migrationInfos.filter { it.state.isResolved }.orEmpty().toTypedArray()
     }
 
     /**
@@ -123,7 +123,7 @@ class MigrationInfoServiceImpl(
      * @return The failed migrations. An empty array if none.
      */
     override fun failed(): Array<MigrationInfo> {
-        return migrationInfos?.filter { it.state.isFailed }.orEmpty<MigrationInfo>().toTypedArray()
+        return migrationInfos.filter { it.state.isFailed }.orEmpty().toTypedArray()
     }
 
     /**
@@ -132,7 +132,7 @@ class MigrationInfoServiceImpl(
      * @return The future migrations. An empty array if none.
      */
     override fun future(): Array<MigrationInfo> {
-        return migrationInfos?.filter { it.state === MigrationState.FUTURE_SUCCESS }.orEmpty<MigrationInfo>().toTypedArray()
+        return migrationInfos.filter { it.state === MigrationState.FUTURE_SUCCESS }.orEmpty().toTypedArray()
     }
 
     /**
@@ -141,7 +141,7 @@ class MigrationInfoServiceImpl(
      * @return The out of order migrations. An empty array if none.
      */
     override fun outOfOrder(): Array<MigrationInfo> {
-        return migrationInfos?.filter { it.state === MigrationState.OUT_OF_ORDER }.orEmpty<MigrationInfo>().toTypedArray()
+        return migrationInfos.filter { it.state === MigrationState.OUT_OF_ORDER }.orEmpty().toTypedArray()
     }
 
     /**