Refactor: code style (#52)

Ahoo-Wang · Jan 5, 2023 · e9afd1d · e9afd1d
1 parent 26e78b2
commit e9afd1d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/cosec-core/src/main/kotlin/me/ahoo/cosec/context/request/XForwardedRemoteIpResolver.kt b/cosec-core/src/main/kotlin/me/ahoo/cosec/context/request/XForwardedRemoteIpResolver.kt
@@ -46,7 +46,7 @@ abstract class XForwardedRemoteIpResolver<R>(
 
         val xForwardedValues = xForwardedHeaderValues[0]
             .split(DELIMITER)
-            .dropWhile { it.isBlank() }
+            .filter { it.isNotBlank() }
             .reversed()
         if (xForwardedValues.isEmpty()) {
             return defaultRemoteIpResolver.resolve(request)

diff --git a/cosec-core/src/test/kotlin/me/ahoo/cosec/policy/condition/part/DefaultPartExtractorTest.kt b/cosec-core/src/test/kotlin/me/ahoo/cosec/policy/condition/part/DefaultPartExtractorTest.kt
@@ -104,7 +104,7 @@ class DefaultPartExtractorTest {
             DefaultPartExtractor(SecurityContextParts.PRINCIPAL_ATTRIBUTES_PREFIX + "key").extract(mockk(), context),
             equalTo("value")
         )
-                assertThat(
+        assertThat(
             DefaultPartExtractor(SecurityContextParts.PRINCIPAL_ATTRIBUTES_PREFIX + "not_exist").extract(mockk(), context),
             equalTo("")
         )

diff --git a/cosec-webflux/src/main/kotlin/me/ahoo/cosec/webflux/ReactiveRequestParser.kt b/cosec-webflux/src/main/kotlin/me/ahoo/cosec/webflux/ReactiveRequestParser.kt
@@ -20,15 +20,15 @@ import org.springframework.http.HttpHeaders
 import org.springframework.web.server.ServerWebExchange
 
 class ReactiveRequestParser(
-    private val remoteIPResolver: RemoteIpResolver<ServerWebExchange>
+    private val remoteIpResolver: RemoteIpResolver<ServerWebExchange>
 ) :
     RequestParser<ServerWebExchange> {
     override fun parse(request: ServerWebExchange): Request {
         return ReactiveRequest(
             delegate = request,
             path = request.request.path.value(),
             method = request.request.methodValue,
-            remoteIp = remoteIPResolver.resolve(request),
+            remoteIp = remoteIpResolver.resolve(request),
             origin = request.request.headers.origin.orEmpty(),
             referer = request.request.headers.getFirst(HttpHeaders.REFERER).orEmpty()
         )

diff --git a/gradle.properties b/gradle.properties
@@ -11,7 +11,7 @@
 # limitations under the License.
 #
 group=me.ahoo.cosec
-version=1.8.5
+version=1.8.6
 description=RBAC-based And Policy-based Multi-Tenant Reactive Security Framework
 website=https://github.com/Ahoo-Wang/CoSec
 issues=https://github.com/Ahoo-Wang/CoSec/issues