add casting utils

Flank · May 12, 2021 · 942c9a9 · 942c9a9
1 parent 841b83c
commit 942c9a9
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 18 deletions.
diff --git a/...in/kotlin/ftl/presentation/cli/firebase/test/android/locales/AndroidLocalesListCommand.kt b/...in/kotlin/ftl/presentation/cli/firebase/test/android/locales/AndroidLocalesListCommand.kt
@@ -7,6 +7,7 @@ import ftl.domain.invoke
 import ftl.presentation.cli.firebase.test.locale.toCliTable
 import ftl.presentation.outputLogger
 import ftl.presentation.throwUnknownType
+import ftl.util.asListOrNull
 import picocli.CommandLine
 
 @CommandLine.Command(
@@ -30,11 +31,6 @@ class AndroidLocalesListCommand :
     )
     override var configPath: String = FtlConstants.defaultAndroidConfig
 
-    override val out = outputLogger {
-        @Suppress("UNCHECKED_CAST")
-        (this as? List<Locale>)?.toCliTable() ?: throwUnknownType()
-    }
-
     @CommandLine.Option(
         names = ["-h", "--help"],
         usageHelp = true,
@@ -43,4 +39,8 @@ class AndroidLocalesListCommand :
     var usageHelpRequested: Boolean = false
 
     override fun run() = invoke()
+
+    override val out = outputLogger {
+        asListOrNull<Locale>()?.toCliTable() ?: throwUnknownType()
+    }
 }
diff --git a/...ftl/presentation/cli/firebase/test/android/orientations/AndroidOrientationsListCommand.kt b/...ftl/presentation/cli/firebase/test/android/orientations/AndroidOrientationsListCommand.kt
@@ -6,6 +6,7 @@ import ftl.domain.ListAndroidOrientations
 import ftl.domain.invoke
 import ftl.presentation.outputLogger
 import ftl.presentation.throwUnknownType
+import ftl.util.asListOrNull
 import picocli.CommandLine
 
 @CommandLine.Command(
@@ -39,7 +40,6 @@ class AndroidOrientationsListCommand :
     override fun run() = invoke()
 
     override val out = outputLogger {
-        @Suppress("UNCHECKED_CAST")
-        (this as? List<Orientation>)?.toCliTable() ?: throwUnknownType()
+        asListOrNull<Orientation>()?.toCliTable() ?: throwUnknownType()
     }
 }
diff --git a/...ner/src/main/kotlin/ftl/presentation/cli/firebase/test/environment/TestEnvironmentInfo.kt b/...ner/src/main/kotlin/ftl/presentation/cli/firebase/test/environment/TestEnvironmentInfo.kt
@@ -2,13 +2,12 @@ package ftl.presentation.cli.firebase.test.environment
 
 import ftl.api.TestEnvironment
 import ftl.environment.android.toCliTable
-import ftl.environment.common.toCliTable
 import ftl.environment.ios.toCliTable
 import ftl.presentation.cli.firebase.test.android.orientations.toCliTable
 import ftl.presentation.cli.firebase.test.ipblocks.toCliTable
 import ftl.presentation.cli.firebase.test.locale.toCliTable
-import ftl.presentation.cli.firebase.test.providedsoftware.toCliTable
 import ftl.presentation.cli.firebase.test.networkprofiles.toCliTable
+import ftl.presentation.cli.firebase.test.providedsoftware.toCliTable
 
 fun TestEnvironment.Android.prepareOutputString() = buildString {
     appendLine(osVersions.toCliTable())

diff --git a/.../kotlin/ftl/presentation/cli/firebase/test/ios/configuration/IosLocalesDescribeCommand.kt b/.../kotlin/ftl/presentation/cli/firebase/test/ios/configuration/IosLocalesDescribeCommand.kt
@@ -9,7 +9,6 @@ import ftl.presentation.outputLogger
 import ftl.presentation.throwUnknownType
 import picocli.CommandLine
 
-@Suppress("UNCHECKED_CAST")
 @CommandLine.Command(
     name = "describe",
     headerHeading = "",

diff --git a/...main/kotlin/ftl/presentation/cli/firebase/test/ios/configuration/IosLocalesListCommand.kt b/...main/kotlin/ftl/presentation/cli/firebase/test/ios/configuration/IosLocalesListCommand.kt
@@ -7,6 +7,7 @@ import ftl.domain.invoke
 import ftl.presentation.cli.firebase.test.locale.toCliTable
 import ftl.presentation.outputLogger
 import ftl.presentation.throwUnknownType
+import ftl.util.asListOrNull
 import picocli.CommandLine
 
 @CommandLine.Command(
@@ -40,7 +41,6 @@ class IosLocalesListCommand :
     override fun run() = invoke()
 
     override val out = outputLogger {
-        @Suppress("UNCHECKED_CAST")
-        (this as? List<Locale>)?.toCliTable() ?: throwUnknownType()
+        asListOrNull<Locale>()?.toCliTable() ?: throwUnknownType()
     }
 }
diff --git a/.../kotlin/ftl/presentation/cli/firebase/test/ios/orientations/IosOrientationsListCommand.kt b/.../kotlin/ftl/presentation/cli/firebase/test/ios/orientations/IosOrientationsListCommand.kt
@@ -5,8 +5,10 @@ import ftl.config.FtlConstants
 import ftl.domain.ListIosOrientations
 import ftl.domain.invoke
 import ftl.presentation.cli.firebase.test.android.orientations.toCliTable
+import ftl.presentation.cli.firebase.test.locale.toCliTable
 import ftl.presentation.outputLogger
 import ftl.presentation.throwUnknownType
+import ftl.util.asListOrNull
 import picocli.CommandLine
 
 @CommandLine.Command(
@@ -40,7 +42,6 @@ class IosOrientationsListCommand :
     override fun run() = invoke()
 
     override val out = outputLogger {
-        @Suppress("UNCHECKED_CAST")
-        (this as? List<Orientation>)?.toCliTable() ?: throwUnknownType()
+        asListOrNull<Orientation>()?.toCliTable() ?: throwUnknownType()
     }
 }
diff --git a/...n/kotlin/ftl/presentation/cli/firebase/test/networkprofiles/NetworkProfilesListCommand.kt b/...n/kotlin/ftl/presentation/cli/firebase/test/networkprofiles/NetworkProfilesListCommand.kt
@@ -3,9 +3,10 @@ package ftl.presentation.cli.firebase.test.networkprofiles
 import ftl.api.NetworkProfile
 import ftl.domain.ListNetworkProfiles
 import ftl.domain.invoke
-import ftl.environment.common.toCliTable
 import ftl.presentation.outputLogger
 import ftl.presentation.throwUnknownType
+import ftl.util.asList
+import ftl.util.asListOrNull
 import picocli.CommandLine
 
 @CommandLine.Command(
@@ -25,10 +26,8 @@ class NetworkProfilesListCommand :
     override fun run() = invoke()
 
     override val out = outputLogger {
-
-        @Suppress("UNCHECKED_CAST")
         when {
-            (this as? List<NetworkProfile>) != null -> this.toCliTable()
+            asListOrNull<NetworkProfile>() != null -> asList<NetworkProfile>().toCliTable()
             this is String -> this
             else -> throwUnknownType()
         }

diff --git a/test_runner/src/main/kotlin/ftl/util/CastingUtils.kt b/test_runner/src/main/kotlin/ftl/util/CastingUtils.kt
@@ -0,0 +1,7 @@
+package ftl.util
+
+@Suppress("UNCHECKED_CAST")
+fun <T> Any.asList(): List<T> = this as List<T>
+
+@Suppress("UNCHECKED_CAST")
+fun <T> Any.asListOrNull(): List<T>? = this as? List<T>