Upgrade detekt (#2697)

Author: abrooksv

gradle.properties

@@ -14,7 +14,7 @@ ideProfileName=2020.2
 kotlinVersion=1.4.21
 awsSdkVersion=2.16.65
 coroutinesVersion=1.3.3
-detektVersion=1.16.0
+detektVersion=1.17.1
 jacksonVersion=2.11.1
 telemetryVersion=1.0.6
 commonsMarkVersion=0.17.1

jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/stack/EventsFetcher.kt

@@ -8,7 +8,7 @@ import software.amazon.awssdk.services.cloudformation.model.StackEvent
 import javax.swing.SwingUtilities
 
 /**
- * AWS returns events in Events in reverse chronological order. This class remembers last event id and returns only new one.
+ * AWS returns events in reverse chronological order. This class remembers last event id and returns only new one.
  * [lastEventIdOfCurrentPage] String? id of the last event used to prevent duplicates.
  * [id] String field used as event id
  * [previousPages] stack of tokens for all pages except first. First page does not have token
@@ -27,48 +27,47 @@ class EventsFetcher(private val stackName: String) {
      * @return new events from last call or all events if [pageToSwitchTo] is set (because all events
      * are new to another page) and set of available [Page]s
      */
-    fun fetchEvents(client: CloudFormationClient, pageToSwitchTo: Page?):
-        Pair<List<StackEvent>, Set<Page>> {
-            assert(!SwingUtilities.isEventDispatchThread())
+    fun fetchEvents(client: CloudFormationClient, pageToSwitchTo: Page?): Pair<List<StackEvent>, Set<Page>> {
+        assert(!SwingUtilities.isEventDispatchThread())
 
-            val pageToFetch: String? = when (pageToSwitchTo) {
-                Page.NEXT -> nextPage
-                Page.PREVIOUS -> previousPages.lastOrNull()
-                else -> currentPage
-            }
-
-            val request = DescribeStackEventsRequest.builder().stackName(stackName).nextToken(pageToFetch).build()
-            val response = client.describeStackEvents(request)
+        val pageToFetch: String? = when (pageToSwitchTo) {
+            Page.NEXT -> nextPage
+            Page.PREVIOUS -> previousPages.lastOrNull()
+            else -> currentPage
+        }
 
-            when (pageToSwitchTo) {
-                Page.NEXT -> currentPage?.let { previousPages.add(it) } // Store current as prev
-                Page.PREVIOUS -> if (previousPages.isNotEmpty()) previousPages.removeAt(previousPages.size - 1)
-            }
-            nextPage = response.nextToken()
-            currentPage = pageToFetch
+        val request = DescribeStackEventsRequest.builder().stackName(stackName).nextToken(pageToFetch).build()
+        val response = client.describeStackEvents(request)
 
-            if (pageToSwitchTo != null) { // page changed, last event is not valid
-                lastEventIdOfCurrentPage = null
-            }
+        when (pageToSwitchTo) {
+            Page.NEXT -> currentPage?.let { previousPages.add(it) } // Store current as prev
+            Page.PREVIOUS -> if (previousPages.isNotEmpty()) previousPages.removeAt(previousPages.size - 1)
+        }
+        nextPage = response.nextToken()
+        currentPage = pageToFetch
 
-            val eventsUnprocessed = response.stackEvents()
-            val eventsProcessed = when (lastEventIdOfCurrentPage) {
-                null -> eventsUnprocessed
-                else -> eventsUnprocessed.takeWhile { it.id != lastEventIdOfCurrentPage }
-            }
-            eventsProcessed.firstOrNull()?.let { lastEventIdOfCurrentPage = it.id }
+        if (pageToSwitchTo != null) { // page changed, last event is not valid
+            lastEventIdOfCurrentPage = null
+        }
 
-            val availablePages = mutableSetOf<Page>()
+        val eventsUnprocessed = response.stackEvents()
+        val eventsProcessed = when (lastEventIdOfCurrentPage) {
+            null -> eventsUnprocessed
+            else -> eventsUnprocessed.takeWhile { it.id != lastEventIdOfCurrentPage }
+        }
+        eventsProcessed.firstOrNull()?.let { lastEventIdOfCurrentPage = it.id }
 
-            if (currentPage != null) { // We only can go prev. if current page is not first (not null)
-                availablePages.add(Page.PREVIOUS)
-            }
-            if (nextPage != null) {
-                availablePages.add(Page.NEXT)
-            }
+        val availablePages = mutableSetOf<Page>()
 
-            return Pair(eventsProcessed, availablePages)
+        if (currentPage != null) { // We only can go prev. if current page is not first (not null)
+            availablePages.add(Page.PREVIOUS)
+        }
+        if (nextPage != null) {
+            availablePages.add(Page.NEXT)
         }
 
+        return Pair(eventsProcessed, availablePages)
+    }
+
     private val StackEvent.id: String get() = eventId()
 }

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

@@ -27,11 +27,11 @@ open class LambdaFunctionNode(
     project: Project,
     function: LambdaFunction
 ) : AwsExplorerResourceNode<LambdaFunction>(
-        project,
-        LambdaClient.SERVICE_NAME,
-        function,
-        AwsIcons.Resources.LAMBDA_FUNCTION
-    ),
+    project,
+    LambdaClient.SERVICE_NAME,
+    function,
+    AwsIcons.Resources.LAMBDA_FUNCTION
+),
     ResourceLocationNode {
 
     override fun resourceType() = "function"

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

@@ -27,11 +27,11 @@ open class SchemaRegistryNode(
     project: Project,
     val registry: RegistrySummary
 ) : AwsExplorerResourceNode<RegistrySummary>(
-        project,
-        SchemasClient.SERVICE_NAME,
-        registry,
-        AwsIcons.Resources.SCHEMA_REGISTRY
-    ),
+    project,
+    SchemasClient.SERVICE_NAME,
+    registry,
+    AwsIcons.Resources.SCHEMA_REGISTRY
+),
     ResourceParentNode {
     override fun resourceType() = "registry"