Merge pull request #381 from navikt/oppgradering-mai-2023

Oppgradert avhengigheter + ktlint
navikt · May 24, 2023 · 5a3e7b8 · 5a3e7b8
2 parents fdea7cb + 31c7f85
commit 5a3e7b8
Show file tree

Hide file tree

Showing 25 changed files with 59 additions and 57 deletions.
diff --git a/pom.xml b/pom.xml
@@ -20,15 +20,15 @@
         <jvmTarget>17</jvmTarget>
         <main-class>no.nav.familie.dokument.LauncherKt</main-class> 
         <felles.version>1.20230117091843_19b020f</felles.version>
-        <kotlin.version>1.8.10</kotlin.version>
-        <mockk.version>1.13.3</mockk.version>
+        <kotlin.version>1.8.20</kotlin.version>
+        <mockk.version>1.13.5</mockk.version>
         <token-validation-spring.version>2.1.9</token-validation-spring.version>
         <openhtmltopdf.version>1.0.10</openhtmltopdf.version>
-        <gcp.version>0.184.0</gcp.version>
+        <gcp.version>0.195.0</gcp.version>
         <kontrakter.version>2.0_20230112155838_ab5a243</kontrakter.version>
         <tika.core.version>2.6.0</tika.core.version>
         <tika.parser.version>2.6.0</tika.parser.version>
-        <jsoup.version>1.15.3</jsoup.version>
+        <jsoup.version>1.16.1</jsoup.version>
         <!-- Setter disse til token-support sine versjoner, versjoner(9.x) i spring er ikke kompatibel med oauth2-oidc-sdk -->
         <nimbus-jose-jwt.version>8.20.2</nimbus-jose-jwt.version>
         <testcontainers.version>1.17.6</testcontainers.version>
@@ -243,7 +243,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
+                <version>3.1.0</version>
                 <configuration>
                     <argLine>-Dfile.encoding=UTF-8</argLine>
                 </configuration>
@@ -339,7 +339,7 @@
                     <dependency>
                         <groupId>com.pinterest</groupId>
                         <artifactId>ktlint</artifactId>
-                        <version>0.47.1</version>
+                        <version>0.49.1</version>
                     </dependency>
                     <!-- additional 3rd party ruleset(s) can be specified here -->
                 </dependencies>

diff --git a/src/main/kotlin/no/nav/familie/dokument/ApiExceptionHandler.kt b/src/main/kotlin/no/nav/familie/dokument/ApiExceptionHandler.kt
@@ -33,7 +33,7 @@ class ApiExceptionHandler : ResponseEntityExceptionHandler() {
         body: Any?,
         headers: HttpHeaders,
         status: HttpStatus,
-        request: WebRequest
+        request: WebRequest,
     ): ResponseEntity<Any> {
         if (ex is HttpRequestMethodNotSupportedException || ex is HttpMediaTypeNotSupportedException || ex is HttpMediaTypeNotAcceptableException) {
             secureLogger.warn("En feil har oppstått", ex)
@@ -82,7 +82,7 @@ class ApiExceptionHandler : ResponseEntityExceptionHandler() {
     // Denne håndterer eks JwtTokenUnauthorizedException
     private fun håndtertResponseStatusFeil(
         throwable: Throwable,
-        responseStatus: ResponseStatus
+        responseStatus: ResponseStatus,
     ): ResponseEntity<Ressurs<String>> {
         val status = if (responseStatus.value != HttpStatus.INTERNAL_SERVER_ERROR) responseStatus.value else responseStatus.code
         val loggMelding = "En håndtert feil har oppstått" +

diff --git a/src/main/kotlin/no/nav/familie/dokument/ApiExceptions.kt b/src/main/kotlin/no/nav/familie/dokument/ApiExceptions.kt
@@ -19,5 +19,5 @@ enum class BadRequestCode {
     DOCUMENT_MISSING,
     IMAGE_TOO_LARGE,
     IMAGE_DIMENSIONS_TOO_SMALL,
-    VIRUS_FOUND
+    VIRUS_FOUND,
 }
diff --git a/src/main/kotlin/no/nav/familie/dokument/pdf/PdfService.kt b/src/main/kotlin/no/nav/familie/dokument/pdf/PdfService.kt
@@ -62,21 +62,21 @@ class PdfService {
                     "Source Sans Pro",
                     400,
                     BaseRendererBuilder.FontStyle.NORMAL,
-                    true
+                    true,
                 )
                 .useFont(
                     FontSupplier("SourceSansPro-Bold.ttf"),
                     "Source Sans Pro",
                     700,
                     BaseRendererBuilder.FontStyle.OBLIQUE,
-                    true
+                    true,
                 )
                 .useFont(
                     FontSupplier("SourceSansPro-It.ttf"),
                     "Source Sans Pro",
                     400,
                     BaseRendererBuilder.FontStyle.ITALIC,
-                    true
+                    true,
                 )
                 .useSVGDrawer(BatikSVGDrawer())
                 .withW3cDocument(w3cDokument, "")

diff --git a/src/main/kotlin/no/nav/familie/dokument/storage/StonadController.kt b/src/main/kotlin/no/nav/familie/dokument/storage/StonadController.kt
@@ -27,25 +27,25 @@ import org.springframework.web.bind.annotation.RestController
 @RequestMapping("familie/dokument/api/soknad", "api/soknad")
 @RequiredIssuers(
     ProtectedWithClaims(issuer = EksternBrukerUtils.ISSUER_SELVBETJENING, claimMap = ["acr=Level4"]),
-    ProtectedWithClaims(issuer = EksternBrukerUtils.ISSUER_TOKENX, claimMap = ["acr=Level4"])
+    ProtectedWithClaims(issuer = EksternBrukerUtils.ISSUER_TOKENX, claimMap = ["acr=Level4"]),
 )
 class StonadController(
     @Autowired val storage: MellomLagerService,
     @Autowired val contextHolder: TokenValidationContextHolder,
     @Autowired val objectMapper: ObjectMapper,
-    @Autowired val hasher: Hasher
+    @Autowired val hasher: Hasher,
 ) {
 
     private val log: Logger = LoggerFactory.getLogger(this::class.java)
 
     @PostMapping(
         path = ["/{stonad}"],
         consumes = [MediaType.APPLICATION_JSON_VALUE],
-        produces = [MediaType.APPLICATION_JSON_VALUE]
+        produces = [MediaType.APPLICATION_JSON_VALUE],
     )
     fun mellomlagreSøknad(
         @PathVariable("stonad") stønad: StønadParameter,
-        @RequestBody(required = true) søknad: String
+        @RequestBody(required = true) søknad: String,
     ): ResponseEntity<Unit> {
         log.debug("Mellomlagrer søknad om overgangsstønad")
 
@@ -91,6 +91,6 @@ class StonadController(
         barnetilsyn("barnetilsyn"),
         skolepenger("skolepenger"),
         barnetrygd("barnetrygd"),
-        kontantstotte("kontantstotte")
+        kontantstotte("kontantstotte"),
     }
 }
diff --git a/src/main/kotlin/no/nav/familie/dokument/storage/StorageController.kt b/src/main/kotlin/no/nav/familie/dokument/storage/StorageController.kt
@@ -31,26 +31,26 @@ import java.util.UUID
 @RequestMapping("familie/dokument/api/mapper", "api/mapper")
 @RequiredIssuers(
     ProtectedWithClaims(issuer = EksternBrukerUtils.ISSUER_SELVBETJENING, claimMap = ["acr=Level4"]),
-    ProtectedWithClaims(issuer = EksternBrukerUtils.ISSUER_TOKENX, claimMap = ["acr=Level4"])
+    ProtectedWithClaims(issuer = EksternBrukerUtils.ISSUER_TOKENX, claimMap = ["acr=Level4"]),
 )
 class StorageController(
     val storage: AttachmentStorage,
     val virusScanService: VirusScanService,
     val contextHolder: TokenValidationContextHolder,
     @Value("\${attachment.max.size.mb}") val maxFileSizeInMb: Int,
     val hasher: Hasher,
-    val pdfService: PdfService
+    val pdfService: PdfService,
 ) {
 
     // / TODO: "bucket"-path brukes ikke ennå. "familievedlegg" brukes alltid
     @PostMapping(
         path = ["{bucket}"],
         consumes = [MediaType.MULTIPART_FORM_DATA_VALUE],
-        produces = [MediaType.APPLICATION_JSON_VALUE]
+        produces = [MediaType.APPLICATION_JSON_VALUE],
     )
     fun addAttachment(
         @PathVariable("bucket") bucket: String,
-        @RequestParam("file") multipartFile: MultipartFile
+        @RequestParam("file") multipartFile: MultipartFile,
     ): ResponseEntity<Map<String, String>> {
         if (multipartFile.isEmpty) {
             throw InvalidDocumentSize(BadRequestCode.DOCUMENT_MISSING)
@@ -78,11 +78,11 @@ class StorageController(
     @PostMapping(
         path = ["/merge/{bucket}"],
         consumes = [MediaType.APPLICATION_JSON_VALUE],
-        produces = [MediaType.APPLICATION_JSON_VALUE]
+        produces = [MediaType.APPLICATION_JSON_VALUE],
     )
     fun mergeAndStoreDocuments(
         @PathVariable("bucket") bucket: String,
-        @RequestBody documentList: List<UUID>
+        @RequestBody documentList: List<UUID>,
     ): ResponseEntity<Map<String, String>> {
         if (documentList.isEmpty()) {
             throw InvalidDocumentSize(BadRequestCode.DOCUMENT_MISSING)
@@ -106,7 +106,7 @@ class StorageController(
     @GetMapping(path = ["{bucket}/{dokumentId}"], produces = [MediaType.APPLICATION_JSON_VALUE])
     fun getAttachment(
         @PathVariable("bucket") bucket: String,
-        @PathVariable("dokumentId") dokumentId: String
+        @PathVariable("dokumentId") dokumentId: String,
     ): ResponseEntity<Ressurs<ByteArray>> {
         val directory = hasher.lagFnrHash(contextHolder.hentFnr())
         val data = storage[directory, dokumentId]

diff --git a/src/main/kotlin/no/nav/familie/dokument/storage/attachment/AttachmentConfiguration.kt b/src/main/kotlin/no/nav/familie/dokument/storage/attachment/AttachmentConfiguration.kt
@@ -22,7 +22,7 @@ class AttachmentConfiguration {
     @Bean
     fun attachmentStorage(
         @Qualifier(ATTACHMENT_ENCRYPTED_STORAGE) storage: EncryptedStorage,
-        storableFormatConverter: AttachmentToStorableFormatConverter
+        storableFormatConverter: AttachmentToStorableFormatConverter,
     ): AttachmentStorage {
         return AttachmentStorage(storage, storableFormatConverter)
     }

diff --git a/src/main/kotlin/no/nav/familie/dokument/storage/attachment/AttachmentStorage.kt b/src/main/kotlin/no/nav/familie/dokument/storage/attachment/AttachmentStorage.kt
@@ -6,7 +6,7 @@ import java.io.ByteArrayInputStream
 
 class AttachmentStorage constructor(
     private val delegate: EncryptedStorage,
-    private val storableFormatConverter: AttachmentToStorableFormatConverter
+    private val storableFormatConverter: AttachmentToStorableFormatConverter,
 ) :
     Storage<ByteArray, ByteArray> {
 

diff --git a/.../kotlin/no/nav/familie/dokument/storage/attachment/AttachmentToStorableFormatConverter.kt b/.../kotlin/no/nav/familie/dokument/storage/attachment/AttachmentToStorableFormatConverter.kt
@@ -4,7 +4,7 @@ import org.apache.tika.Tika
 
 class AttachmentToStorableFormatConverter(
     private val imageConversionService: ImageConversionService,
-    private val flattenPdfService: FlattenPdfService
+    private val flattenPdfService: FlattenPdfService,
 ) {
 
     fun toStorageFormat(input: ByteArray): ByteArray {

diff --git a/src/main/kotlin/no/nav/familie/dokument/storage/attachment/Format.kt b/src/main/kotlin/no/nav/familie/dokument/storage/attachment/Format.kt
@@ -8,7 +8,8 @@ enum class Format(var mimeType: String) {
 
     PDF("application/pdf"),
     PNG("image/png"),
-    JPEG("image/jpeg");
+    JPEG("image/jpeg"),
+    ;
 
     companion object {
 

diff --git a/src/main/kotlin/no/nav/familie/dokument/storage/attachment/ImageConversionService.kt b/src/main/kotlin/no/nav/familie/dokument/storage/attachment/ImageConversionService.kt
@@ -50,7 +50,7 @@ class ImageConversionService {
                     "Portrait h=${portraitImage.height} w=${portraitImage.width} " +
                     "ImageSize height=${imageSize.height} width=${imageSize.width} " +
                     " lowHeight=${imageSize.height < page.cropBox.height} lowWidth=${imageSize.width < page.cropBox.width}" +
-                    " inputSize=${input.size / 1024} diffSize=${outputBytes.size / input.size} "
+                    " inputSize=${input.size / 1024} diffSize=${outputBytes.size / input.size} ",
             )
             outputBytes
         }
@@ -59,7 +59,7 @@ class ImageConversionService {
     private fun createPdImage(
         document: PDDocument,
         portraitImage: BufferedImage,
-        detectedType: Format
+        detectedType: Format,
     ): PDImageXObject {
         val quality = 1.0f
         return try {

diff --git a/src/main/kotlin/no/nav/familie/dokument/storage/encryption/EncryptedStorage.kt b/src/main/kotlin/no/nav/familie/dokument/storage/encryption/EncryptedStorage.kt
@@ -9,7 +9,7 @@ import java.io.InputStream
 class EncryptedStorage constructor(
     private val contextHolder: TokenValidationContextHolder,
     private val delegate: GcpStorageWrapper,
-    private val encryptor: Encryptor
+    private val encryptor: Encryptor,
 ) : Storage<InputStream, ByteArray> {
 
     override fun put(directory: String, key: String, data: InputStream) {

diff --git a/src/main/kotlin/no/nav/familie/dokument/storage/encryption/EncryptedStorageConfiguration.kt b/src/main/kotlin/no/nav/familie/dokument/storage/encryption/EncryptedStorageConfiguration.kt
@@ -21,7 +21,7 @@ class EncryptedStorageConfiguration {
 
     @Bean
     internal fun secretKeyProvider(
-        @Value("\${FAMILIE_DOKUMENT_STORAGE_ENCRYPTION_PASSWORD}") passphrase: String
+        @Value("\${FAMILIE_DOKUMENT_STORAGE_ENCRYPTION_PASSWORD}") passphrase: String,
     ): SecretKeyProvider {
         return SecretKeyProvider(passphrase)
     }
@@ -30,7 +30,7 @@ class EncryptedStorageConfiguration {
     internal fun attachmentEncryptedStorage(
         @Autowired contextHolder: TokenValidationContextHolder,
         @Qualifier(ATTACHMENT_GCP_STORAGE) storage: GcpStorageWrapper,
-        encryptor: Encryptor
+        encryptor: Encryptor,
     ): EncryptedStorage {
         return EncryptedStorage(contextHolder, storage, encryptor)
     }
@@ -40,7 +40,7 @@ class EncryptedStorageConfiguration {
     internal fun stonadEncryptedStorage(
         @Autowired contextHolder: TokenValidationContextHolder,
         @Qualifier(STONAD_GCP_STORAGE) storage: GcpStorageWrapper,
-        encryptor: Encryptor
+        encryptor: Encryptor,
     ): EncryptedStorage {
         return EncryptedStorage(contextHolder, storage, encryptor)
     }

diff --git a/src/main/kotlin/no/nav/familie/dokument/storage/encryption/Hasher.kt b/src/main/kotlin/no/nav/familie/dokument/storage/encryption/Hasher.kt
@@ -8,7 +8,7 @@ import java.util.Base64
 @Component
 class Hasher(
     @Value("\${FAMILIE_DOKUMENT_FNR_SECRET_SALT}")
-    val hemmeligSalt: String
+    val hemmeligSalt: String,
 ) {
 
     fun lagFnrHash(fnr: String): String {

diff --git a/src/main/kotlin/no/nav/familie/dokument/storage/google/GcpStorageConfiguration.kt b/src/main/kotlin/no/nav/familie/dokument/storage/google/GcpStorageConfiguration.kt
@@ -14,6 +14,7 @@ import org.threeten.bp.Duration
 class GcpStorageConfiguration {
 
     val MAX_FILE_SIZE_FACTOR = 10 // Dersom vi slår sammen flere filer og lagrer ned må vi kunne lagre ned vesentlig større filer enn én og én
+
     @Bean
     fun retrySettings(@Value("\${storage_service.timeout.ms:3000}") timeoutMs: Long): RetrySettings? {
         return RetrySettings.newBuilder()
@@ -25,7 +26,7 @@ class GcpStorageConfiguration {
     fun gcpStorage(
         storage: Storage,
         @Value("\${gcp.storage.bucketname}") bucketName: String,
-        @Value("\${attachment.max.size.mb}") maxFileSizeMB: Int
+        @Value("\${attachment.max.size.mb}") maxFileSizeMB: Int,
     ): GcpStorage {
         return GcpStorage(bucketName, maxFileSizeMB * MAX_FILE_SIZE_FACTOR, storage)
     }

diff --git a/src/main/kotlin/no/nav/familie/dokument/storage/mellomlager/MellomLagerService.kt b/src/main/kotlin/no/nav/familie/dokument/storage/mellomlager/MellomLagerService.kt
@@ -10,7 +10,7 @@ import java.io.ByteArrayInputStream
 @Service
 class MellomLagerService internal constructor(
     @Qualifier(STONAD_ENCRYPTED_STORAGE)
-    private val delegate: EncryptedStorage
+    private val delegate: EncryptedStorage,
 ) : Storage<String, String> {
 
     override fun put(directory: String, key: String, data: String) {

diff --git a/src/main/kotlin/no/nav/familie/dokument/virusscan/ScanResult.kt b/src/main/kotlin/no/nav/familie/dokument/virusscan/ScanResult.kt
@@ -6,5 +6,5 @@ data class ScanResult(@JsonProperty("Result") val result: Result)
 
 enum class Result {
     FOUND,
-    OK
+    OK,
 }
diff --git a/src/main/kotlin/no/nav/familie/dokument/virusscan/VirusScanService.kt b/src/main/kotlin/no/nav/familie/dokument/virusscan/VirusScanService.kt
@@ -7,7 +7,7 @@ import org.springframework.stereotype.Service
 
 @Service
 class VirusScanService(
-    private val client: VirusScanClient
+    private val client: VirusScanClient,
 ) {
 
     private val logger = LoggerFactory.getLogger(VirusScanService::class.java)
@@ -23,7 +23,7 @@ class VirusScanService(
         if (Result.OK != scanResult.result) {
             throw BadRequestException(
                 BadRequestCode.VIRUS_FOUND,
-                "Fil ikke godkjent - virus detektert status=${scanResult.result} fil=$name"
+                "Fil ikke godkjent - virus detektert status=${scanResult.result} fil=$name",
             )
         }
     }

diff --git a/src/test/kotlin/no/nav/familie/dokument/ApiFeilIntegrationTest.kt b/src/test/kotlin/no/nav/familie/dokument/ApiFeilIntegrationTest.kt
@@ -124,7 +124,7 @@ class ApiFeilIntegrationTest {
         issuerId: String = "selvbetjening",
         clientId: String = UUID.randomUUID().toString(),
         audience: String = "aud-localhost",
-        claims: Map<String, Any> = mapOf("acr" to "Level4")
+        claims: Map<String, Any> = mapOf("acr" to "Level4"),
 
     ): String {
         return this.issueToken(
@@ -135,8 +135,8 @@ class ApiFeilIntegrationTest {
                 subject = subject,
                 audience = listOf(audience),
                 claims = claims,
-                expiry = 3600
-            )
+                expiry = 3600,
+            ),
         ).serialize()
     }
 }
diff --git a/src/test/kotlin/no/nav/familie/dokument/config/TestStorageConfiguration.kt b/src/test/kotlin/no/nav/familie/dokument/config/TestStorageConfiguration.kt
@@ -58,7 +58,7 @@ class TestStorageConfiguration {
     @Primary
     fun attachmentStorage(
         @Qualifier(ATTACHMENT_ENCRYPTED_STORAGE) encryptedStorage: EncryptedStorage,
-        storableFormatConverter: AttachmentToStorableFormatConverter
+        storableFormatConverter: AttachmentToStorableFormatConverter,
     ): AttachmentStorage {
         val storage: AttachmentStorage = mockk()
 

diff --git a/src/test/kotlin/no/nav/familie/dokument/pdf/PdfGenerartorTest.kt b/src/test/kotlin/no/nav/familie/dokument/pdf/PdfGenerartorTest.kt
@@ -32,7 +32,7 @@ class PdfGenerartorTest {
     private fun getDocument(fixtureName: String): String {
         return IOUtils.toString(
             this.javaClass.getResourceAsStream("/$PDF_RESOURSE_PATH/$fixtureName"),
-            StandardCharsets.UTF_8
+            StandardCharsets.UTF_8,
         )
     }
 
@@ -86,15 +86,15 @@ class PdfGenerartorTest {
             expectedPdfBytes,
             actualPdfBytes,
             resource,
-            false
+            false,
         )
 
         // Get a list of results.
         if (problems.isNotEmpty()) {
             System.err.println("Found problems with test case ($resource):")
             System.err.println(
                 problems.stream().map { p: PdfVisualTester.PdfCompareResult -> p.logMessage }
-                    .collect(Collectors.joining("\n    ", "[\n    ", "\n]"))
+                    .collect(Collectors.joining("\n    ", "[\n    ", "\n]")),
             )
             System.err.println("For test case ($resource) writing failure artifacts to '$TEST_OUTPUT_PATH'")
             File(TEST_OUTPUT_PATH, "$resource---actual.pdf").writeBytes(actualPdfBytes)