chore(formatting): fix formatting on some files (#1122)

spinnaker · Mar 31, 2020 · 85df33c · 85df33c
1 parent 841a391
commit 85df33c
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/gate-plugins/src/main/kotlin/com/netflix/spinnaker/gate/plugins/deck/DeckPluginCache.kt b/gate-plugins/src/main/kotlin/com/netflix/spinnaker/gate/plugins/deck/DeckPluginCache.kt
@@ -19,11 +19,11 @@ import com.netflix.spectator.api.Id
 import com.netflix.spectator.api.Registry
 import com.netflix.spinnaker.kork.plugins.bundle.PluginBundleExtractor
 import com.netflix.spinnaker.kork.plugins.update.SpinnakerUpdateManager
-import org.slf4j.LoggerFactory
-import org.springframework.scheduling.annotation.Scheduled
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.StandardCopyOption
+import org.slf4j.LoggerFactory
+import org.springframework.scheduling.annotation.Scheduled
 
 /**
  * Responsible for keeping an up-to-date cache of all plugins that Deck needs to know about.

diff --git a/gate-plugins/src/main/kotlin/com/netflix/spinnaker/gate/plugins/deck/DeckPluginService.kt b/gate-plugins/src/main/kotlin/com/netflix/spinnaker/gate/plugins/deck/DeckPluginService.kt
@@ -16,8 +16,8 @@
 package com.netflix.spinnaker.gate.plugins.deck
 
 import com.netflix.spectator.api.Registry
-import org.slf4j.LoggerFactory
 import java.io.File
+import org.slf4j.LoggerFactory
 
 /**
  * Provides Deck with means of discovering what plugins it needs to download and a standard interface for

diff --git a/...-plugins/src/main/kotlin/com/netflix/spinnaker/gate/plugins/deck/DeckPluginsController.kt b/...-plugins/src/main/kotlin/com/netflix/spinnaker/gate/plugins/deck/DeckPluginsController.kt
@@ -17,6 +17,8 @@ package com.netflix.spinnaker.gate.plugins.deck
 
 import com.netflix.spinnaker.kork.web.exceptions.NotFoundException
 import io.swagger.annotations.ApiOperation
+import java.util.concurrent.TimeUnit
+import javax.servlet.http.HttpServletResponse
 import org.springframework.http.CacheControl
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
@@ -25,8 +27,6 @@ import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RestController
-import java.util.concurrent.TimeUnit
-import javax.servlet.http.HttpServletResponse
 
 @RestController
 @RequestMapping("/plugins/deck")

diff --git a/...gins/src/main/kotlin/com/netflix/spinnaker/gate/plugins/publish/PluginBinaryController.kt b/...gins/src/main/kotlin/com/netflix/spinnaker/gate/plugins/publish/PluginBinaryController.kt
@@ -20,6 +20,7 @@ import com.netflix.spinnaker.gate.config.ServiceConfiguration
 import com.netflix.spinnaker.kork.exceptions.SystemException
 import com.netflix.spinnaker.security.AuthenticatedRequest
 import io.swagger.annotations.ApiOperation
+import java.lang.String.format
 import lombok.SneakyThrows
 import okhttp3.MediaType
 import okhttp3.MultipartBody
@@ -32,7 +33,6 @@ import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
 import org.springframework.web.multipart.MultipartFile
-import java.lang.String.format
 
 @RestController
 @RequestMapping("/plugins/upload")

diff --git a/gate-plugins/src/test/kotlin/com/netflix/spinnaker/gate/plugins/deck/DeckPluginCacheTest.kt b/gate-plugins/src/test/kotlin/com/netflix/spinnaker/gate/plugins/deck/DeckPluginCacheTest.kt
@@ -24,12 +24,12 @@ import dev.minutest.rootContext
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.slot
+import java.nio.file.Files
+import java.nio.file.Paths
 import org.pf4j.update.PluginInfo
 import strikt.api.expectThat
 import strikt.assertions.hasSize
 import strikt.assertions.isEqualTo
-import java.nio.file.Files
-import java.nio.file.Paths
 
 class DeckPluginCacheTest : JUnit5Minutests {
 

diff --git a/gate-proxy/src/main/kotlin/com/netflix/spinnaker/config/ProxyConfiguration.kt b/gate-proxy/src/main/kotlin/com/netflix/spinnaker/config/ProxyConfiguration.kt
@@ -17,10 +17,6 @@
 package com.netflix.spinnaker.config
 
 import com.squareup.okhttp.OkHttpClient
-import org.slf4j.LoggerFactory
-import org.springframework.boot.context.properties.ConfigurationProperties
-import org.springframework.boot.context.properties.EnableConfigurationProperties
-import org.springframework.context.annotation.Configuration
 import java.io.File
 import java.security.KeyStore
 import java.security.cert.X509Certificate
@@ -31,6 +27,10 @@ import javax.net.ssl.SSLContext
 import javax.net.ssl.TrustManager
 import javax.net.ssl.TrustManagerFactory
 import javax.net.ssl.X509TrustManager
+import org.slf4j.LoggerFactory
+import org.springframework.boot.context.properties.ConfigurationProperties
+import org.springframework.boot.context.properties.EnableConfigurationProperties
+import org.springframework.context.annotation.Configuration
 
 @Configuration
 @EnableConfigurationProperties(

diff --git a/gate-proxy/src/main/kotlin/com/netflix/spinnaker/gate/controllers/ProxyController.kt b/gate-proxy/src/main/kotlin/com/netflix/spinnaker/gate/controllers/ProxyController.kt
@@ -23,6 +23,9 @@ import com.netflix.spinnaker.kork.web.exceptions.InvalidRequestException
 import com.squareup.okhttp.Request
 import com.squareup.okhttp.RequestBody
 import com.squareup.okhttp.internal.http.HttpMethod
+import java.net.SocketException
+import java.util.stream.Collectors
+import javax.servlet.http.HttpServletRequest
 import org.springframework.http.HttpHeaders
 import org.springframework.http.HttpStatus
 import org.springframework.http.MediaType
@@ -34,9 +37,6 @@ import org.springframework.web.bind.annotation.RequestMethod.POST
 import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
 import org.springframework.web.servlet.HandlerMapping
-import java.net.SocketException
-import java.util.stream.Collectors
-import javax.servlet.http.HttpServletRequest
 
 @RestController
 @RequestMapping(value = ["/proxies"])