Enable linting and fix formatting

build.gradle.kts

@@ -54,7 +54,7 @@ tasks.withType<Test> {
 
 spotless {
     kotlin {
-//        ktlint()
+        ktlint()
     }
     kotlinGradle {
         ktlint()

src/main/kotlin/software/tice/wallet/WalletServerApplication.kt

@@ -7,5 +7,5 @@ import org.springframework.boot.runApplication
 class WalletServerApplication
 
 fun main(args: Array<String>) {
-	runApplication<WalletServerApplication>(*args)
+    runApplication<WalletServerApplication>(*args)
 }

src/main/kotlin/software/tice/wallet/attestation/KeyConfiguration.kt

@@ -1,28 +1,27 @@
 package software.tice.wallet.attestation
 
 import org.springframework.beans.factory.annotation.Value
-import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import java.security.KeyFactory
 import java.security.PrivateKey
 import java.security.spec.PKCS8EncodedKeySpec
-import java.util.*
+import java.util.Base64
 
 @Configuration
 class KeyConfiguration {
-
     @Value("\${private.key}")
     private lateinit var privateKey: String
 
     @Bean
     fun decodePrivateKey(): PrivateKey {
-        val pem = privateKey
-            .replace("-----BEGIN PRIVATE KEY-----", "")
-            .replace("-----END PRIVATE KEY-----", "")
+        val pem =
+            privateKey
+                .replace("-----BEGIN PRIVATE KEY-----", "")
+                .replace("-----END PRIVATE KEY-----", "")
         val keyBytes = Base64.getDecoder().decode(pem)
         val keySpec = PKCS8EncodedKeySpec(keyBytes)
         val keyFactory = KeyFactory.getInstance("EC")
         return keyFactory.generatePrivate(keySpec)
     }
-}
+}

src/main/kotlin/software/tice/wallet/attestation/controllers/IssuerApi.kt

@@ -2,15 +2,19 @@ package software.tice.wallet.attestation.controllers
 
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
-import org.springframework.web.bind.annotation.*
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
 import software.tice.wallet.attestation.requests.ValidationRequest
 
 @RestController
 @RequestMapping("wallet")
 class IssuerApi {
-
     @PostMapping("/validation")
-    fun validateAttestation(@RequestBody request: ValidationRequest): ResponseEntity<Void> {
+    fun validateAttestation(
+        @RequestBody request: ValidationRequest,
+    ): ResponseEntity<Void> {
         return ResponseEntity.status(HttpStatus.OK).body(null)
     }
-}
+}

src/main/kotlin/software/tice/wallet/attestation/controllers/WalletApi.kt

@@ -4,43 +4,55 @@ import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.media.Content
 import io.swagger.v3.oas.annotations.media.Schema
 import io.swagger.v3.oas.annotations.responses.ApiResponse
-import io.swagger.v3.oas.annotations.responses.ApiResponses
 import org.springframework.http.MediaType
-import org.springframework.web.bind.annotation.*
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
 import software.tice.wallet.attestation.requests.AttestationRequest
 import software.tice.wallet.attestation.requests.NonceRequest
 import software.tice.wallet.attestation.responses.AttestationResponse
 import software.tice.wallet.attestation.responses.NonceResponse
 import software.tice.wallet.attestation.services.WalletApiService
 
-
 @RestController
 @RequestMapping("wallet")
-
 class WalletApi(val walletApiService: WalletApiService) {
-
     @PostMapping
-    fun requestNonces(@RequestBody request: NonceRequest): NonceResponse {
+    fun requestNonces(
+        @RequestBody request: NonceRequest,
+    ): NonceResponse {
         return walletApiService.requestNonces(request.walletId)
     }
 
     @PostMapping("/{walletId}/attestation")
     @Operation(summary = "Submits an attestation request for a given wallet ID.")
-
     @ApiResponse(description = "Wallet attestation issued", responseCode = "200")
     @ApiResponse(
-        description = "Wallet not found", responseCode = "404", content = [Content(
-            mediaType = MediaType.TEXT_PLAIN_VALUE, schema = Schema(implementation = String::class)
-        )]
+        description = "Wallet not found",
+        responseCode = "404",
+        content = [
+            Content(
+                mediaType = MediaType.TEXT_PLAIN_VALUE,
+                schema = Schema(implementation = String::class),
+            ),
+        ],
     )
     @ApiResponse(
-        description = "Public Key wrong", responseCode = "400", content = [Content(
-            mediaType = MediaType.TEXT_PLAIN_VALUE, schema = Schema(implementation = String::class)
-        )]
+        description = "Public Key wrong",
+        responseCode = "400",
+        content = [
+            Content(
+                mediaType = MediaType.TEXT_PLAIN_VALUE,
+                schema = Schema(implementation = String::class),
+            ),
+        ],
     )
     fun requestAttestation(
-        @RequestBody request: AttestationRequest, @PathVariable walletId: String
+        @RequestBody request: AttestationRequest,
+        @PathVariable walletId: String,
     ): AttestationResponse {
         return walletApiService.requestAttestation(request, walletId)
     }
-}
+}

src/main/kotlin/software/tice/wallet/attestation/exceptions/DecodingFailedException.kt

@@ -1,3 +1,3 @@
 package software.tice.wallet.attestation.exceptions
 
-class DecodingFailedException(message: String) : RuntimeException(message)
+class DecodingFailedException(message: String) : RuntimeException(message)

src/main/kotlin/software/tice/wallet/attestation/exceptions/ControllerAdvice.kt → src/main/kotlin/software/tice/wallet/attestation/exceptions/GlobalControllerAdvice.kt

@@ -5,12 +5,10 @@ import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.ControllerAdvice
 import org.springframework.web.bind.annotation.ExceptionHandler
 
-
 @ControllerAdvice
 class GlobalControllerAdvice {
     @ExceptionHandler(WalletNotFoundException::class)
-    fun handleWalletNotFound(ex: WalletNotFoundException): ResponseEntity<String> =
-        ResponseEntity(ex.message, HttpStatus.NOT_FOUND)
+    fun handleWalletNotFound(ex: WalletNotFoundException): ResponseEntity<String> = ResponseEntity(ex.message, HttpStatus.NOT_FOUND)
 
     @ExceptionHandler(PopVerificationException::class)
     fun handlePopVerificationFailed(ex: PopVerificationException): ResponseEntity<String> =
@@ -19,4 +17,4 @@ class GlobalControllerAdvice {
     @ExceptionHandler(DecodingFailedException::class)
     fun handleDecodingFailedException(ex: DecodingFailedException): ResponseEntity<String> =
         ResponseEntity(ex.message, HttpStatus.BAD_REQUEST)
-}
+}

src/main/kotlin/software/tice/wallet/attestation/exceptions/PopVerificationException.kt

@@ -1,3 +1,3 @@
 package software.tice.wallet.attestation.exceptions
 
-class PopVerificationException(message: String) : RuntimeException(message)
+class PopVerificationException(message: String) : RuntimeException(message)

src/main/kotlin/software/tice/wallet/attestation/exceptions/WalletNotFoundException.kt

@@ -1,3 +1,3 @@
 package software.tice.wallet.attestation.exceptions
 
-class WalletNotFoundException(message: String) : RuntimeException(message)
+class WalletNotFoundException(message: String) : RuntimeException(message)

src/main/kotlin/software/tice/wallet/attestation/repositories/WalletEntity.kt

@@ -1,8 +1,9 @@
 package software.tice.wallet.attestation.repositories
 
-import jakarta.persistence.*
-import java.util.*
-
+import jakarta.persistence.Entity
+import jakarta.persistence.GeneratedValue
+import jakarta.persistence.GenerationType
+import jakarta.persistence.Id
 
 @Entity(name = "users")
 data class WalletEntity(
@@ -12,5 +13,5 @@ data class WalletEntity(
     var walletId: String,
     var popNonce: String?,
     var keyAttestationNonce: String?,
-    var randomId: String?
-)
+    var randomId: String?,
+)

src/main/kotlin/software/tice/wallet/attestation/repositories/WalletRepository.kt

@@ -3,9 +3,7 @@ package software.tice.wallet.attestation.repositories
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository
 
-
 @Repository
 interface WalletRepository : JpaRepository<WalletEntity, Long> {
     fun findByWalletId(walletId: String): WalletEntity?
 }
-

src/main/kotlin/software/tice/wallet/attestation/requests/AttestationRequest.kt

@@ -4,5 +4,5 @@ data class AttestationRequest(
     val attestationPublicKey: String,
     val proofOfPossession: String,
     val keyAttestation: String,
-    val appAttestation: String
-)
+    val appAttestation: String,
+)

src/main/kotlin/software/tice/wallet/attestation/requests/NonceRequest.kt

@@ -1,3 +1,3 @@
 package software.tice.wallet.attestation.requests
 
-data class NonceRequest(val walletId: String)
+data class NonceRequest(val walletId: String)

src/main/kotlin/software/tice/wallet/attestation/requests/ValidationRequest.kt

@@ -1,3 +1,3 @@
 package software.tice.wallet.attestation.requests
 
-data class ValidationRequest(val walletAttestation: String)
+data class ValidationRequest(val walletAttestation: String)

src/main/kotlin/software/tice/wallet/attestation/responses/AttestationResponse.kt

@@ -1,3 +1,3 @@
 package software.tice.wallet.attestation.responses
 
-data class AttestationResponse(val walletAttestation: String)
+data class AttestationResponse(val walletAttestation: String)

src/main/kotlin/software/tice/wallet/attestation/responses/NonceResponse.kt

@@ -2,5 +2,5 @@ package software.tice.wallet.attestation.responses
 
 data class NonceResponse(
     val popNonce: String,
-    val keyAttestationNonce: String
-)
+    val keyAttestationNonce: String,
+)