More detekt rules (#3101)

Author: rli

detekt-rules/detekt.yml

@@ -64,8 +64,6 @@ formatting:
   EnumEntryNameCase:
     active: false
     autoCorrect: true
-  ExpressionBodySyntax:
-    includeLineWrapping: true
   Filename:
     active: true
   FinalNewline:
@@ -283,3 +281,24 @@ potential-bugs:
     active: false
   WrongEqualsTypeParameter:
     active: true
+
+style:
+  EqualsNullCall:
+    active: true
+  ExpressionBodySyntax:
+    active: true
+    includeLineWrapping: true
+  MayBeConst:
+    active: true
+  ModifierOrder:
+    active: true
+  NoTabs:
+    active: true
+  OptionalAbstractKeyword:
+    active: true
+  SafeCast:
+    active: true
+  UnusedPrivateClass:
+    active: true
+  VarCouldBeVal:
+    active: true

jetbrains-core/src/software/aws/toolkits/jetbrains/services/dynamic/CloudControlApiResources.kt

@@ -16,15 +16,14 @@ import software.aws.toolkits.jetbrains.core.map
 import software.aws.toolkits.jetbrains.services.s3.resources.S3Resources
 
 object CloudControlApiResources {
-    fun listResources(typeName: String): Resource<List<DynamicResource>> {
-        return when (typeName) {
+    fun listResources(typeName: String): Resource<List<DynamicResource>> =
+        when (typeName) {
             S3_BUCKET -> S3Resources.LIST_BUCKETS.map { it.name() }
             else -> ClientBackedCachedResource(CloudControlClient::class, "cloudcontrolapi.dynamic.resources.$typeName") {
                 this.listResourcesPaginator { req -> req.typeName(typeName) }
                     .flatMap { page -> page.resourceDescriptions().map { it.identifier() } }
             }
         }.map { DynamicResource(resourceTypeFromResourceTypeName(typeName), it) }
-    }
 
     fun resourceTypeFromResourceTypeName(typeName: String): ResourceType {
         val (_, svc, type) = typeName.split("::")

jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/CreateEcrRepoDialog.kt

@@ -56,9 +56,8 @@ class CreateEcrRepoDialog(
 
     override fun continuousValidation() = false
 
-    override fun doValidateAll(): List<ValidationInfo> {
-        return panel.validateCallbacks.mapNotNull { it() }
-    }
+    override fun doValidateAll(): List<ValidationInfo> =
+        panel.validateCallbacks.mapNotNull { it() }
 
     override fun doOKAction() {
         val validation = doValidateAll()

jetbrains-core/src/software/aws/toolkits/jetbrains/services/federation/AwsConsoleUrlFactory.kt

@@ -73,9 +73,8 @@ object AwsConsoleUrlFactory {
         return "$consoleHome${fragment ?: "/"}"
     }
 
-    fun getSigninUrl(connectionSettings: ConnectionSettings, destination: String?, httpClientBuilder: HttpClientBuilder = defaultHttpClientBuilder): String {
-        return getSigninUrl(getSigninToken(connectionSettings, httpClientBuilder), destination, connectionSettings.region)
-    }
+    fun getSigninUrl(connectionSettings: ConnectionSettings, destination: String?, httpClientBuilder: HttpClientBuilder = defaultHttpClientBuilder): String =
+        getSigninUrl(getSigninToken(connectionSettings, httpClientBuilder), destination, connectionSettings.region)
 
     fun getSigninToken(connectionSettings: ConnectionSettings, httpClientBuilder: HttpClientBuilder = defaultHttpClientBuilder): String {
         val resolvedCreds = connectionSettings.credentials.resolveCredentials()

jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SamInitProjectBuilderCommon.kt

@@ -23,13 +23,7 @@ import javax.swing.JTextField
 @JvmOverloads
 fun setupSamSelectionElements(samExecutableField: JTextField, editButton: JButton, label: JComponent, postEditCallback: Runnable? = null) {
     fun getSamExecutable(): ExecutableInstance.ExecutableWithPath? =
-        ExecutableManager.getInstance().getExecutableIfPresent<SamExecutable>().let {
-            if (it is ExecutableInstance.ExecutableWithPath) {
-                it
-            } else {
-                null
-            }
-        }
+        ExecutableManager.getInstance().getExecutableIfPresent<SamExecutable>().let { it as? ExecutableInstance.ExecutableWithPath }
 
     fun updateUi(validSamPath: Boolean) {
         runInEdt(ModalityState.any()) {

jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/resources/SchemasResources.kt

@@ -14,10 +14,8 @@ import software.aws.toolkits.jetbrains.services.lambda.wizard.SchemaSelectionIte
 import java.time.Duration
 
 object SchemasResources {
-    @JvmField
-    val AWS_EVENTS_REGISTRY = "aws.events"
+    const val AWS_EVENTS_REGISTRY = "aws.events"
 
-    @JvmField
     val LIST_REGISTRIES: Resource.Cached<List<RegistrySummary>> =
         ClientBackedCachedResource(SchemasClient::class, "schemas.list_registries") {
             listRegistriesPaginator { it.build() }
@@ -26,7 +24,6 @@ object SchemasResources {
                 .toList()
         }
 
-    @JvmField
     val LIST_REGISTRIES_AND_SCHEMAS: Resource.Cached<List<SchemaSelectionItem>> =
         ClientBackedCachedResource(SchemasClient::class, "schemas.list_registries_and_schemas") {
             listRegistriesPaginator { it.build() }

jetbrains-core/tst/software/aws/toolkits/jetbrains/services/dynamic/explorer/DynamicResourceUpdateManagerTest.kt

@@ -66,7 +66,7 @@ class DynamicResourceUpdateManagerTest {
 
     @Test
     fun `Resource State Change Triggers are correctly reflected`() {
-        var testOperationState: MutableList<ResourceMutationState> = mutableListOf()
+        val testOperationState: MutableList<ResourceMutationState> = mutableListOf()
         dynamicResourceUpdateManager = DynamicResourceUpdateManager.getInstance(projectRule.project)
 
         cloudControlClient.stub {
@@ -115,7 +115,7 @@ class DynamicResourceUpdateManagerTest {
 
     @Test
     fun `Resource State Change Triggers are updates status text`() {
-        var testOperationStatus: MutableList<OperationStatus> = mutableListOf()
+        val testOperationStatus: MutableList<OperationStatus> = mutableListOf()
         dynamicResourceUpdateManager = DynamicResourceUpdateManager.getInstance(projectRule.project)
 
         cloudControlClient.stub {

jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/clouddebug/nodejs/NodeJsDebuggerSupport.kt

@@ -86,6 +86,6 @@ class NodeJsDebuggerSupport : DebuggerSupport() {
 
     private companion object {
         private val NODE_EXECUTABLES = setOf("node", "nodejs")
-        private val NODE_DEBUG = "--inspect-brk"
+        private const val NODE_DEBUG = "--inspect-brk"
     }
 }