Skip to content

Commit 6d82134

Browse files
jreynard-codejreynard-code
committed
Fix spotless formatting
- upgrade plugins com.diffplug.spotless and io.gitlab.arturbosch.detekt - apply spotless to format correctly project files - reapply ktfmt in spotless gradle tasks
1 parent d794f3f commit 6d82134

File tree

6 files changed

+95
-95
lines changed

6 files changed

+95
-95
lines changed

‎build.gradle.kts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import org.gradle.kotlin.dsl.implementation
77
plugins {
88
val kotlinVersion = "1.9.23"
99
kotlin("jvm") version kotlinVersion
10-
id("com.diffplug.spotless") version "6.25.0"
10+
id("com.diffplug.spotless") version "7.0.2"
1111
id("org.springframework.boot") version "3.4.1" apply false
12-
id("io.gitlab.arturbosch.detekt") version "1.23.7"
12+
id("io.gitlab.arturbosch.detekt") version "1.23.8"
1313
id("pl.allegro.tech.build.axion-release") version "1.15.5"
1414
id("org.jetbrains.kotlinx.kover") version "0.7.6"
1515
id("project-report")
@@ -85,10 +85,12 @@ configure<SpotlessExtension> {
8585
licenseHeader(licenseHeaderComment)
8686
}
8787
kotlin {
88+
ktfmt()
8889
target("**/*.kt")
8990
licenseHeader(licenseHeaderComment)
9091
}
9192
kotlinGradle {
93+
ktfmt()
9294
target("**/*.kts")
9395
// licenseHeader(licenseHeaderComment, "import")
9496
}

‎src/main/kotlin/com/cosmotech/api/config/CsmOpenAPIConfiguration.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Licensed under the MIT license.
33
package com.cosmotech.api.config
44

5+
import com.cosmotech.api.utils.getAboutInfo
56
import io.swagger.v3.oas.models.OpenAPI
67
import io.swagger.v3.oas.models.security.OAuthFlow
78
import io.swagger.v3.oas.models.security.OAuthFlows
@@ -11,7 +12,6 @@ import java.io.BufferedReader
1112
import org.springframework.beans.factory.annotation.Value
1213
import org.springframework.context.annotation.Bean
1314
import org.springframework.context.annotation.Configuration
14-
import com.cosmotech.api.utils.getAboutInfo
1515

1616
@Configuration
1717
open class CsmOpenAPIConfiguration(val csmPlatformProperties: CsmPlatformProperties) {

‎src/main/kotlin/com/cosmotech/api/exceptions/CsmExceptionHandling.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,17 @@ open class CsmExceptionHandling : ResponseEntityExceptionHandler() {
4545
}
4646

4747
override fun handleMethodArgumentNotValid(
48-
exception: MethodArgumentNotValidException,
49-
headers: HttpHeaders,
50-
status: HttpStatusCode,
51-
request: WebRequest
48+
exception: MethodArgumentNotValidException,
49+
headers: HttpHeaders,
50+
status: HttpStatusCode,
51+
request: WebRequest
5252
): ResponseEntity<Any>? {
5353
val badRequestStatus = HttpStatus.BAD_REQUEST
5454
val problemDetail = ProblemDetail.forStatus(badRequestStatus)
5555
problemDetail.type = URI.create(httpStatusCodeTypePrefix + badRequestStatus.value())
5656
val globalErrors = BindErrorUtils.resolveAndJoin(exception.globalErrors)
5757
val fieldErrors = BindErrorUtils.resolveAndJoin(exception.fieldErrors)
58-
if( globalErrors.isBlank() && fieldErrors.isBlank() ) {
58+
if (globalErrors.isBlank() && fieldErrors.isBlank()) {
5959
problemDetail.detail = exception.message
6060
} else {
6161
problemDetail.detail = "$globalErrors $fieldErrors".trim()

‎src/main/kotlin/com/cosmotech/api/metrics/MonitorServiceAspect.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ private const val SERVICE_NAME = "API"
2525
@Aspect
2626
@Component
2727
@ConditionalOnProperty(
28-
name = ["csm.platform.metrics.enabled"],
29-
havingValue = "true",
30-
matchIfMissing = false)
28+
name = ["csm.platform.metrics.enabled"], havingValue = "true", matchIfMissing = false)
3129
class MonitorServiceAspect(
3230
private var meterRegistry: MeterRegistry,
3331
private val eventPublisher: CsmEventPublisher,

‎src/main/kotlin/com/cosmotech/api/utils/AboutInfo.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ import org.json.JSONObject
88

99
fun getAboutInfo(): JSONObject {
1010
val aboutJsonInputStream =
11-
object{}::class.java.getResourceAsStream("/about.json")
12-
?: throw IllegalStateException("Unable to read about info data from 'classpath:/about.json'")
13-
val aboutJsonContent = aboutJsonInputStream.use { it.bufferedReader().use(BufferedReader::readText) }
11+
object {}::class.java.getResourceAsStream("/about.json")
12+
?: throw IllegalStateException(
13+
"Unable to read about info data from 'classpath:/about.json'")
14+
val aboutJsonContent =
15+
aboutJsonInputStream.use { it.bufferedReader().use(BufferedReader::readText) }
1416

1517
try {
1618
return JSONObject(aboutJsonContent)
17-
}
18-
catch (e: JSONException)
19-
{
19+
} catch (e: JSONException) {
2020
throw IllegalStateException("Unable to parse about info from 'classpath:/about.json'", e)
2121
}
2222
}

‎src/test/kotlin/com/cosmotech/api/security/keycloak/KeycloakJwtAuthenticationConverterTests.kt‎

Lines changed: 78 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -61,36 +61,37 @@ class KeycloakJwtAuthenticationConverterTests {
6161
jwtConverted)
6262
}
6363

64-
@Test
65-
fun `convertRolesToAuthorities with correct values when no principalJwtClaim set`() {
66-
val principalClaimName = "unexisting-principal-claim"
67-
val applicationIdClaimValue = "123-456-798"
68-
val applicationIdClaimName = "sub"
69-
val claims =
70-
mutableMapOf(
71-
"claim1" to "10",
72-
"claimRoles" to listOf("role1", "role2", "role3"),
73-
"claimName" to "myClaimName",
74-
applicationIdClaimName to applicationIdClaimValue)
75-
val expectedSimpleGrantedAuthorities =
76-
listOf(
77-
SimpleGrantedAuthority("role1"),
78-
SimpleGrantedAuthority("role2"),
79-
SimpleGrantedAuthority("role3"))
80-
81-
every { jwt.claims } returns claims
82-
every { csmPlatformProperties.authorization.rolesJwtClaim } returns "claimRoles"
83-
every { csmPlatformProperties.authorization.principalJwtClaim } returns principalClaimName
84-
every { csmPlatformProperties.authorization.applicationIdJwtClaim } returns applicationIdClaimName
85-
every { jwt.getClaimAsString(principalClaimName) } returns null
86-
every { jwt.getClaimAsString(applicationIdClaimName) } returns applicationIdClaimValue
87-
88-
val jwtConverted = keycloakJwtAuthenticationConverter.convert(jwt)
89-
90-
assertEquals(
91-
JwtAuthenticationToken(jwt, expectedSimpleGrantedAuthorities, applicationIdClaimValue),
92-
jwtConverted)
93-
}
64+
@Test
65+
fun `convertRolesToAuthorities with correct values when no principalJwtClaim set`() {
66+
val principalClaimName = "unexisting-principal-claim"
67+
val applicationIdClaimValue = "123-456-798"
68+
val applicationIdClaimName = "sub"
69+
val claims =
70+
mutableMapOf(
71+
"claim1" to "10",
72+
"claimRoles" to listOf("role1", "role2", "role3"),
73+
"claimName" to "myClaimName",
74+
applicationIdClaimName to applicationIdClaimValue)
75+
val expectedSimpleGrantedAuthorities =
76+
listOf(
77+
SimpleGrantedAuthority("role1"),
78+
SimpleGrantedAuthority("role2"),
79+
SimpleGrantedAuthority("role3"))
80+
81+
every { jwt.claims } returns claims
82+
every { csmPlatformProperties.authorization.rolesJwtClaim } returns "claimRoles"
83+
every { csmPlatformProperties.authorization.principalJwtClaim } returns principalClaimName
84+
every { csmPlatformProperties.authorization.applicationIdJwtClaim } returns
85+
applicationIdClaimName
86+
every { jwt.getClaimAsString(principalClaimName) } returns null
87+
every { jwt.getClaimAsString(applicationIdClaimName) } returns applicationIdClaimValue
88+
89+
val jwtConverted = keycloakJwtAuthenticationConverter.convert(jwt)
90+
91+
assertEquals(
92+
JwtAuthenticationToken(jwt, expectedSimpleGrantedAuthorities, applicationIdClaimValue),
93+
jwtConverted)
94+
}
9495

9596
@Test
9697
fun `convertRolesToAuthorities with non-existing role claim values`() {
@@ -114,34 +115,35 @@ class KeycloakJwtAuthenticationConverterTests {
114115
assertEquals(JwtAuthenticationToken(jwt, emptyList(), principalClaimName), jwtConverted)
115116
}
116117

117-
@Test
118-
fun `convertRolesToAuthorities with non-existing role claim values when no principalJwtClaim set`() {
119-
val principalClaimName = "unexisting-principal-claim"
120-
val applicationIdClaimValue = "123-456-798"
121-
val applicationIdClaimName = "sub"
122-
val claims =
123-
mutableMapOf(
124-
"claim1" to "10",
125-
"claimRoles" to listOf("role1", "role2", "role3"),
126-
"claimName" to "myClaimName",
127-
"sub" to "123-456-798")
128-
129-
every { jwt.claims } returns claims
130-
every { csmPlatformProperties.authorization.rolesJwtClaim } returns "unexisting-role-claim"
131-
every { csmPlatformProperties.authorization.principalJwtClaim } returns principalClaimName
132-
every { csmPlatformProperties.authorization.applicationIdJwtClaim } returns applicationIdClaimName
133-
every { jwt.getClaimAsString(principalClaimName) } returns null
134-
every { jwt.getClaimAsString(applicationIdClaimName) } returns applicationIdClaimValue
135-
136-
val jwtConverted = keycloakJwtAuthenticationConverter.convert(jwt)
137-
138-
assertEquals(JwtAuthenticationToken(jwt, emptyList(), applicationIdClaimName), jwtConverted)
139-
}
118+
@Test
119+
fun `convertRolesToAuthorities with non-existing role claim values when no principalJwtClaim set`() {
120+
val principalClaimName = "unexisting-principal-claim"
121+
val applicationIdClaimValue = "123-456-798"
122+
val applicationIdClaimName = "sub"
123+
val claims =
124+
mutableMapOf(
125+
"claim1" to "10",
126+
"claimRoles" to listOf("role1", "role2", "role3"),
127+
"claimName" to "myClaimName",
128+
"sub" to "123-456-798")
129+
130+
every { jwt.claims } returns claims
131+
every { csmPlatformProperties.authorization.rolesJwtClaim } returns "unexisting-role-claim"
132+
every { csmPlatformProperties.authorization.principalJwtClaim } returns principalClaimName
133+
every { csmPlatformProperties.authorization.applicationIdJwtClaim } returns
134+
applicationIdClaimName
135+
every { jwt.getClaimAsString(principalClaimName) } returns null
136+
every { jwt.getClaimAsString(applicationIdClaimName) } returns applicationIdClaimValue
137+
138+
val jwtConverted = keycloakJwtAuthenticationConverter.convert(jwt)
139+
140+
assertEquals(JwtAuthenticationToken(jwt, emptyList(), applicationIdClaimName), jwtConverted)
141+
}
140142

141143
@Test
142144
fun `convertRolesToAuthorities with existing role claim but no roles defined`() {
143-
val principalClaimValue = "[email protected]"
144-
val principalClaimName = "email"
145+
val principalClaimValue = "[email protected]"
146+
val principalClaimName = "email"
145147
val claims =
146148
mutableMapOf(
147149
"claim1" to "10",
@@ -160,30 +162,28 @@ class KeycloakJwtAuthenticationConverterTests {
160162
assertEquals(JwtAuthenticationToken(jwt, emptyList(), principalClaimName), jwtConverted)
161163
}
162164

163-
@Test
164-
fun `convertRolesToAuthorities with existing role claim but no roles defined when no principalJwtClaim set`() {
165-
val principalClaimName = "unexisting-principal-claim"
166-
val applicationIdClaimValue = "123-456-798"
167-
val applicationIdClaimName = "sub"
168-
val claims =
169-
mutableMapOf(
170-
"claim1" to "10",
171-
"claimRoles" to emptyList<String>(),
172-
"claimName" to "myClaimName",
173-
"sub" to "123-456-798")
174-
175-
every { jwt.claims } returns claims
176-
every { csmPlatformProperties.authorization.rolesJwtClaim } returns "claimRoles"
177-
every { csmPlatformProperties.authorization.principalJwtClaim } returns principalClaimName
178-
every { csmPlatformProperties.authorization.applicationIdJwtClaim } returns applicationIdClaimName
179-
every { jwt.getClaimAsString(principalClaimName) } returns null
180-
every { jwt.getClaimAsString(applicationIdClaimName) } returns applicationIdClaimValue
181-
182-
val jwtConverted = keycloakJwtAuthenticationConverter.convert(jwt)
183-
184-
assertEquals(JwtAuthenticationToken(jwt, emptyList(), applicationIdClaimName), jwtConverted)
185-
}
165+
@Test
166+
fun `convertRolesToAuthorities with existing role claim but no roles defined when no principalJwtClaim set`() {
167+
val principalClaimName = "unexisting-principal-claim"
168+
val applicationIdClaimValue = "123-456-798"
169+
val applicationIdClaimName = "sub"
170+
val claims =
171+
mutableMapOf(
172+
"claim1" to "10",
173+
"claimRoles" to emptyList<String>(),
174+
"claimName" to "myClaimName",
175+
"sub" to "123-456-798")
186176

177+
every { jwt.claims } returns claims
178+
every { csmPlatformProperties.authorization.rolesJwtClaim } returns "claimRoles"
179+
every { csmPlatformProperties.authorization.principalJwtClaim } returns principalClaimName
180+
every { csmPlatformProperties.authorization.applicationIdJwtClaim } returns
181+
applicationIdClaimName
182+
every { jwt.getClaimAsString(principalClaimName) } returns null
183+
every { jwt.getClaimAsString(applicationIdClaimName) } returns applicationIdClaimValue
187184

185+
val jwtConverted = keycloakJwtAuthenticationConverter.convert(jwt)
188186

187+
assertEquals(JwtAuthenticationToken(jwt, emptyList(), applicationIdClaimName), jwtConverted)
188+
}
189189
}

0 commit comments

Comments
 (0)