Bump org.jmailen.kotlinter from 3.9.0 to 3.12.0 (#220)

dependabot[bot] · web-flow · commit 2dde08931b52 · 2022-09-19T14:35:59.000Z
Bumps org.jmailen.kotlinter from 3.9.0 to 3.12.0.

---
updated-dependencies:
- dependency-name: org.jmailen.kotlinter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] &lt;support@github.com&gt;

Signed-off-by: dependabot[bot] &lt;support@github.com&gt;
Co-authored-by: dependabot[bot] &lt;49699333+dependabot[bot]@users.noreply.github.com&gt;
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -14,7 +14,7 @@ plugins {
     `maven-publish`
     jacoco
     id("com.github.kt3k.coveralls") version "2.12.0"
-    id("org.jmailen.kotlinter") version "3.9.0"
+    id("org.jmailen.kotlinter") version "3.12.0"
 }
 
 group = "com.github.moia-dev"
diff --git a/router-openapi-request-validator/src/main/kotlin/io/moia/router/openapi/OpenApiValidator.kt b/router-openapi-request-validator/src/main/kotlin/io/moia/router/openapi/OpenApiValidator.kt
@@ -20,32 +20,38 @@ class OpenApiValidator(val specUrlOrPayload: String) {
 
     fun assertValid(request: APIGatewayProxyRequestEvent, response: APIGatewayProxyResponseEvent) {
         return validate(request, response).let {
-            if (it.hasErrors()) throw ApiInteractionInvalid(
-                specUrlOrPayload,
-                request,
-                response,
-                it
-            )
+            if (it.hasErrors()) {
+                throw ApiInteractionInvalid(
+                    specUrlOrPayload,
+                    request,
+                    response,
+                    it
+                )
+            }
         }
     }
 
     fun assertValidRequest(request: APIGatewayProxyRequestEvent) =
         validator.validateRequest(request.toRequest()).let {
-            if (it.hasErrors()) throw ApiInteractionInvalid(
-                spec = specUrlOrPayload,
-                request = request,
-                validationReport = it
-            )
+            if (it.hasErrors()) {
+                throw ApiInteractionInvalid(
+                    spec = specUrlOrPayload,
+                    request = request,
+                    validationReport = it
+                )
+            }
         }
 
     fun assertValidResponse(request: APIGatewayProxyRequestEvent, response: APIGatewayProxyResponseEvent) =
         request.toRequest().let { r ->
             validator.validateResponse(r.path, r.method, response.toResponse()).let {
-                if (it.hasErrors()) throw ApiInteractionInvalid(
-                    spec = specUrlOrPayload,
-                    request = request,
-                    validationReport = it
-                )
+                if (it.hasErrors()) {
+                    throw ApiInteractionInvalid(
+                        spec = specUrlOrPayload,
+                        request = request,
+                        validationReport = it
+                    )
+                }
             }
         }
 
diff --git a/router-openapi-request-validator/src/main/kotlin/io/moia/router/openapi/ValidatingRequestRouterWrapper.kt b/router-openapi-request-validator/src/main/kotlin/io/moia/router/openapi/ValidatingRequestRouterWrapper.kt
@@ -31,7 +31,6 @@ class ValidatingRequestRouterWrapper(
         handleRequest(input = input, context = context, skipRequestValidation = true, skipResponseValidation = true)
 
     private fun handleRequest(input: APIGatewayProxyRequestEvent, context: Context, skipRequestValidation: Boolean, skipResponseValidation: Boolean): APIGatewayProxyResponseEvent {
-
         if (!skipRequestValidation) {
             try {
                 openApiValidator.assertValidRequest(input)
diff --git a/router-protobuf/src/main/kotlin/io/moia/router/proto/ProtoDeserializationHandler.kt b/router-protobuf/src/main/kotlin/io/moia/router/proto/ProtoDeserializationHandler.kt
@@ -16,9 +16,9 @@ class ProtoDeserializationHandler : DeserializationHandler {
     private val protoStructuredSuffixWildcard = MediaType.parse("application/*+x-protobuf")
 
     override fun supports(input: APIGatewayProxyRequestEvent): Boolean =
-        if (input.contentType() == null)
+        if (input.contentType() == null) {
             false
-        else {
+        } else {
             MediaType.parse(input.contentType()).let { proto.isCompatibleWith(it) || protoStructuredSuffixWildcard.isCompatibleWith(it) }
         }
 
diff --git a/router-protobuf/src/test/kotlin/io/moia/router/proto/RequestHandlerTest.kt b/router-protobuf/src/test/kotlin/io/moia/router/proto/RequestHandlerTest.kt
@@ -23,7 +23,6 @@ class RequestHandlerTest {
 
     @Test
     fun `should match request to proto handler and return json`() {
-
         val response = testRequestHandler.handleRequest(
             APIGatewayProxyRequestEvent()
                 .withPath("/some-proto")
@@ -38,7 +37,6 @@ class RequestHandlerTest {
 
     @Test
     fun `should match request to proto handler with version accept header and return json`() {
-
         val response = testRequestHandler.handleRequest(
             APIGatewayProxyRequestEvent()
                 .withPath("/some-proto")
@@ -53,7 +51,6 @@ class RequestHandlerTest {
 
     @Test
     fun `should match request to proto handler and return proto`() {
-
         val response = testRequestHandler.handleRequest(
             APIGatewayProxyRequestEvent()
                 .withPath("/some-proto")
@@ -68,7 +65,6 @@ class RequestHandlerTest {
 
     @Test
     fun `should match request to proto handler and deserialize and return proto`() {
-
         val request = Sample.newBuilder().setHello("Hello").setRequest("").build()
 
         val response = testRequestHandler.handleRequest(
@@ -92,7 +88,6 @@ class RequestHandlerTest {
 
     @Test
     fun `should return 406-unacceptable error in proto`() {
-
         val response = testRequestHandler.handleRequest(
             GET("/some-proto")
                 .withHeaders(
@@ -109,7 +104,6 @@ class RequestHandlerTest {
 
     @Test
     fun `should return api error in protos`() {
-
         val response = testRequestHandler.handleRequest(
             GET("/some-error")
                 .withHeaders(
diff --git a/router/src/main/kotlin/io/moia/router/DeserializationHandler.kt b/router/src/main/kotlin/io/moia/router/DeserializationHandler.kt
@@ -48,9 +48,9 @@ class JsonDeserializationHandler(private val objectMapper: ObjectMapper) : Deser
     private val jsonStructuredSuffixWildcard = MediaType.parse("application/*+json; charset=UTF-8")
 
     override fun supports(input: APIGatewayProxyRequestEvent) =
-        if (input.contentType() == null)
+        if (input.contentType() == null) {
             false
-        else {
+        } else {
             MediaType.parse(input.contentType()!!)
                 .let { json.isCompatibleWith(it) || jsonStructuredSuffixWildcard.isCompatibleWith(it) }
         }
@@ -74,10 +74,11 @@ class JsonDeserializationHandler(private val objectMapper: ObjectMapper) : Deser
 object PlainTextDeserializationHandler : DeserializationHandler {
     private val text = MediaType.parse("text/*")
     override fun supports(input: APIGatewayProxyRequestEvent): Boolean =
-        if (input.contentType() == null)
+        if (input.contentType() == null) {
             false
-        else
+        } else {
             MediaType.parse(input.contentType()!!).isCompatibleWith(text)
+        }
 
     override fun deserialize(input: APIGatewayProxyRequestEvent, target: KType?): Any? =
         input.body
diff --git a/router/src/main/kotlin/io/moia/router/MediaTypeExtensions.kt b/router/src/main/kotlin/io/moia/router/MediaTypeExtensions.kt
@@ -17,9 +17,9 @@
 import com.google.common.net.MediaType
 
 fun MediaType.isCompatibleWith(other: MediaType): Boolean =
-    if (this.`is`(other))
+    if (this.`is`(other)) {
         true
-    else {
+    } else {
         type() == other.type() && (subtype().contains("+") && other.subtype().contains("+")) && this.subtype()
             .substringBeforeLast("+") == "*" && this.subtype().substringAfterLast("+") == other.subtype()
             .substringAfterLast("+") && (other.parameters().isEmpty || this.parameters() == other.parameters())
diff --git a/router/src/main/kotlin/io/moia/router/PermissionHandler.kt b/router/src/main/kotlin/io/moia/router/PermissionHandler.kt
@@ -68,8 +68,11 @@ open class JwtPermissionHandler(
     ) : this(JwtAccessor(request), permissionsClaim, permissionSeparator)
 
     override fun hasAnyRequiredPermission(requiredPermissions: Set<String>): Boolean =
-        if (requiredPermissions.isEmpty()) true
-        else extractPermissions().any { requiredPermissions.contains(it) }
+        if (requiredPermissions.isEmpty()) {
+            true
+        } else {
+            extractPermissions().any { requiredPermissions.contains(it) }
+        }
 
     internal open fun extractPermissions(): Set<String> =
         accessor.extractJwtClaims()
diff --git a/router/src/main/kotlin/io/moia/router/RequestHandler.kt b/router/src/main/kotlin/io/moia/router/RequestHandler.kt
@@ -56,7 +56,6 @@ abstract class RequestHandler : RequestHandler<APIGatewayProxyRequestEvent, APIG
             val matchResult = routerFunction.requestPredicate.match(input)
             log.debug("match result for route '$routerFunction' is '$matchResult'")
             if (matchResult.match) {
-
                 val matchedAcceptType = routerFunction.requestPredicate.matchedAcceptType(input.acceptedMediaTypes())
                     ?: MediaType.parse(router.defaultContentType)
 
@@ -109,7 +108,8 @@ abstract class RequestHandler : RequestHandler<APIGatewayProxyRequestEvent, APIG
     }
 
     open fun serializationHandlers(): List<SerializationHandler> = listOf(
-        JsonSerializationHandler(objectMapper), PlainTextSerializationHandler()
+        JsonSerializationHandler(objectMapper),
+        PlainTextSerializationHandler()
     )
 
     open fun deserializationHandlers(): List<DeserializationHandler> = listOf(
diff --git a/router/src/test/kotlin/io/moia/router/APIGatewayProxyEventExtensionsTest.kt b/router/src/test/kotlin/io/moia/router/APIGatewayProxyEventExtensionsTest.kt
@@ -25,7 +25,6 @@ class APIGatewayProxyEventExtensionsTest {
 
     @Test
     fun `should add location header`() {
-
         val request = GET()
             .withHeader("Host", "example.com")
             .withHeader("X-Forwarded-Proto", "http")
@@ -39,7 +38,6 @@ class APIGatewayProxyEventExtensionsTest {
 
     @Test
     fun `should add location header with default host and proto and without port`() {
-
         val request = GET()
 
         val response = APIGatewayProxyResponseEvent()
@@ -50,7 +48,6 @@ class APIGatewayProxyEventExtensionsTest {
 
     @Test
     fun `should omit default https port`() {
-
         val request = GET()
             .withHeader("Host", "example.com")
             .withHeader("X-Forwarded-Proto", "https")
@@ -63,7 +60,6 @@ class APIGatewayProxyEventExtensionsTest {
 
     @Test
     fun `should omit default http port`() {
-
         val request = GET()
             .withHeader("Host", "example.com")
             .withHeader("X-Forwarded-Proto", "http")
@@ -76,15 +72,13 @@ class APIGatewayProxyEventExtensionsTest {
 
     @Test
     fun `header class should work as expected with APIGatewayProxyRequestEvent`() {
-
         val request = APIGatewayProxyRequestEvent().withHeader(Header("foo", "bar"))
 
         then(request.headers["foo"]).isEqualTo("bar")
     }
 
     @Test
     fun `header class should work as expected with APIGatewayProxyResponseEvent`() {
-
         val request = APIGatewayProxyResponseEvent().withHeader(Header("foo", "bar"))
 
         then(request.headers["foo"]).isEqualTo("bar")
diff --git a/router/src/test/kotlin/io/moia/router/JwtPermissionHandlerTest.kt b/router/src/test/kotlin/io/moia/router/JwtPermissionHandlerTest.kt
@@ -31,6 +31,7 @@ class JwtPermissionHandlerTest {
     }
     */
     val jwtWithScopeClaimSpace = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyLCJzY29wZSI6Im9uZSB0d28ifQ.2tPrDymXDejHfVjNlVh4XUj22ZuDrKHP6dvWN7JNAWY"
+
     /*
     {
       "sub": "1234567890",
diff --git a/router/src/test/kotlin/io/moia/router/PlainTextDeserializationHandlerTest.kt b/router/src/test/kotlin/io/moia/router/PlainTextDeserializationHandlerTest.kt
@@ -55,6 +55,7 @@ class PlainTextDeserializationHandlerTest {
             )
         )
     }
+
     @Test
     fun `should not support anything when content type is null`() {
         assertFalse(PlainTextDeserializationHandler.supports(APIGatewayProxyRequestEvent()))
diff --git a/router/src/test/kotlin/io/moia/router/RequestHandlerTest.kt b/router/src/test/kotlin/io/moia/router/RequestHandlerTest.kt
diff --git a/router/src/test/kotlin/io/moia/router/ResponseEntityTest.kt b/router/src/test/kotlin/io/moia/router/ResponseEntityTest.kt
diff --git a/router/src/test/kotlin/io/moia/router/RouterTest.kt b/router/src/test/kotlin/io/moia/router/RouterTest.kt

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ plugins {`
`14`	`14`	`maven-publish`
`15`	`15`	`jacoco`
`16`	`16`	`id("com.github.kt3k.coveralls") version "2.12.0"`
`17`		`- id("org.jmailen.kotlinter") version "3.9.0"`
	`17`	`+ id("org.jmailen.kotlinter") version "3.12.0"`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`group = "com.github.moia-dev"`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,6 @@ abstract class RequestHandler : RequestHandler<APIGatewayProxyRequestEvent, APIG`
`56`	`56`	`val matchResult = routerFunction.requestPredicate.match(input)`
`57`	`57`	`log.debug("match result for route '$routerFunction' is '$matchResult'")`
`58`	`58`	`if (matchResult.match) {`
`59`		`-`
`60`	`59`	`val matchedAcceptType = routerFunction.requestPredicate.matchedAcceptType(input.acceptedMediaTypes())`
`61`	`60`	`?: MediaType.parse(router.defaultContentType)`
`62`	`61`
`@@ -109,7 +108,8 @@ abstract class RequestHandler : RequestHandler<APIGatewayProxyRequestEvent, APIG`
`109`	`108`	`}`
`110`	`109`
`111`	`110`	`open fun serializationHandlers(): List<SerializationHandler> = listOf(`
`112`		`- JsonSerializationHandler(objectMapper), PlainTextSerializationHandler()`
	`111`	`+ JsonSerializationHandler(objectMapper),`
	`112`	`+ PlainTextSerializationHandler()`
`113`	`113`	`)`
`114`	`114`
`115`	`115`	`open fun deserializationHandlers(): List<DeserializationHandler> = listOf(`