refactor code style

Author: Ahoo-Wang

cosec-jwt/src/main/kotlin/me/ahoo/cosec/jwt/Jwts.kt

@@ -53,12 +53,11 @@ object Jwts {
 
     @JvmStatic
     fun parseAccessToken(authorization: String?): SimpleAccessToken? {
-        if (authorization != null && authorization.startsWith(TOKEN_PREFIX)
-        ) {
-            val accessToken = authorization.substring(TOKEN_PREFIX.length)
-            return SimpleAccessToken(accessToken)
+        if (authorization?.startsWith(TOKEN_PREFIX) != true) {
+            return null
         }
-        return null
+        val accessToken = authorization.substring(TOKEN_PREFIX.length)
+        return SimpleAccessToken(accessToken)
     }
 
     fun decode(token: String): DecodedJWT {

cosec-spring-boot-starter/src/test/kotlin/me/ahoo/cosec/spring/boot/starter/authorization/CoSecAuthorizationAutoConfigurationTest.kt

@@ -20,7 +20,6 @@ import me.ahoo.cosec.spring.boot.starter.authentication.CoSecAuthenticationAutoC
 import me.ahoo.cosec.spring.boot.starter.authorization.cache.CoSecCacheAutoConfiguration
 import me.ahoo.cosec.spring.boot.starter.jwt.CoSecJwtAutoConfiguration
 import me.ahoo.cosec.spring.boot.starter.jwt.JwtProperties
-import me.ahoo.cosec.token.TokenCompositeAuthentication
 import me.ahoo.cosid.IdGenerator
 import me.ahoo.cosid.test.MockIdGenerator
 import org.assertj.core.api.AssertionsForInterfaceTypes.assertThat
@@ -36,7 +35,7 @@ internal class CoSecAuthorizationAutoConfigurationTest {
     fun contextLoads() {
         contextRunner
             .withPropertyValues(
-                "${JwtProperties.PREFIX}.secret=FyN0Igd80Gas8stTavArGKOYnS9uLwGA_",
+                "${JwtProperties.PREFIX}.secret=FyN0Igd80Gas8stTavArGKOYnS9uLwGA_"
             )
             .withBean(IdGenerator::class.java, { MockIdGenerator.INSTANCE })
             .withUserConfiguration(

cosec-spring-boot-starter/src/test/kotlin/me/ahoo/cosec/spring/boot/starter/authorization/gateway/CoSecGatewayAuthorizationAutoConfigurationTest.kt

@@ -34,7 +34,7 @@ internal class CoSecGatewayAuthorizationAutoConfigurationTest {
     fun contextLoads() {
         contextRunner
             .withPropertyValues(
-                "${JwtProperties.PREFIX}.secret=FyN0Igd80Gas8stTavArGKOYnS9uLwGA_",
+                "${JwtProperties.PREFIX}.secret=FyN0Igd80Gas8stTavArGKOYnS9uLwGA_"
             )
             .withBean(IdGenerator::class.java, { MockIdGenerator.INSTANCE })
             .withUserConfiguration(

cosec-spring-boot-starter/src/test/kotlin/me/ahoo/cosec/spring/boot/starter/jwt/CoSecJwtAutoConfigurationTest.kt

@@ -14,25 +14,14 @@
 package me.ahoo.cosec.spring.boot.starter.jwt
 
 import com.auth0.jwt.algorithms.Algorithm
-import me.ahoo.cache.spring.boot.starter.CoCacheAutoConfiguration
-import me.ahoo.cosec.api.authorization.Authorization
-import me.ahoo.cosec.servlet.AuthorizationFilter
 import me.ahoo.cosec.spring.boot.starter.authentication.CoSecAuthenticationAutoConfiguration
-import me.ahoo.cosec.spring.boot.starter.authentication.oauth.OAuthClientAuthenticationProperties
-import me.ahoo.cosec.spring.boot.starter.authorization.AuthorizationProperties
-import me.ahoo.cosec.spring.boot.starter.authorization.CoSecAuthorizationAutoConfiguration
-import me.ahoo.cosec.spring.boot.starter.authorization.cache.CoSecCacheAutoConfiguration
 import me.ahoo.cosec.token.TokenCompositeAuthentication
 import me.ahoo.cosec.token.TokenConverter
 import me.ahoo.cosec.token.TokenVerifier
 import me.ahoo.cosid.IdGenerator
 import me.ahoo.cosid.test.MockIdGenerator
 import org.assertj.core.api.AssertionsForInterfaceTypes
-import org.junit.jupiter.api.Assertions.*
-import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.Matchers.*
 import org.junit.jupiter.api.Test
-import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration
 import org.springframework.boot.test.context.assertj.AssertableApplicationContext
 import org.springframework.boot.test.context.runner.ApplicationContextRunner
 
@@ -43,7 +32,7 @@ class CoSecJwtAutoConfigurationTest {
     fun contextLoads() {
         contextRunner
             .withPropertyValues(
-                "${JwtProperties.PREFIX}.secret=FyN0Igd80Gas8stTavArGKOYnS9uLwGA_",
+                "${JwtProperties.PREFIX}.secret=FyN0Igd80Gas8stTavArGKOYnS9uLwGA_"
             )
             .withBean(IdGenerator::class.java, { MockIdGenerator.INSTANCE })
             .withUserConfiguration(
@@ -63,7 +52,7 @@ class CoSecJwtAutoConfigurationTest {
     fun contextLoadsWhenDisable() {
         contextRunner
             .withPropertyValues(
-                "${JwtProperties.PREFIX}.enabled=false",
+                "${JwtProperties.PREFIX}.enabled=false"
             )
             .withUserConfiguration(
                 CoSecJwtAutoConfiguration::class.java
@@ -76,4 +65,4 @@ class CoSecJwtAutoConfigurationTest {
                     .doesNotHaveBean(TokenVerifier::class.java)
             }
     }
-}
+}

cosec-webflux/src/test/kotlin/me/ahoo/cosec/webflux/SecurityContextParserSpec.kt

@@ -38,7 +38,6 @@ abstract class SecurityContextParserSpec {
         }
     }
 
-
     val jwtTokenVerifier = JwtTokenVerifier(algorithm)
     abstract fun createSecurityContextParser(): SecurityContextParser<ServerWebExchange>
 

gradle.properties

@@ -11,7 +11,7 @@
 # limitations under the License.
 #
 group=me.ahoo.cosec
-version=1.5.2
+version=1.5.3
 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