Handle large files.

New Gradle wrapper.

Author: flexable777

build.gradle.kts

@@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 val gcsVersion = "2.36.1"
 val logstashVersion = "7.4"
 val tokenValidationVersion = "4.1.4"
+val googleCloudVersion = "5.3.0"
 
 repositories {
     mavenCentral()
@@ -13,30 +14,26 @@ plugins {
     kotlin("jvm") version kotlinVersion
     kotlin("plugin.spring") version kotlinVersion
     id("org.springframework.boot") version "3.2.4"
+    id("io.spring.dependency-management") version "1.1.5"
     idea
 }
 
-apply(plugin = "io.spring.dependency-management")
-
 dependencies {
     implementation(kotlin("stdlib"))
 
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.boot:spring-boot-starter-actuator")
     implementation("org.springframework.boot:spring-boot-starter-webflux")
     implementation("org.springframework.boot:spring-boot-starter-validation")
+    implementation("org.springframework.boot:spring-boot-starter-validation")
+    implementation("com.google.cloud:spring-cloud-gcp-starter-storage:$googleCloudVersion")
     implementation("org.projectreactor:reactor-spring:1.0.1.RELEASE")
 
-    implementation("io.micrometer:micrometer-registry-prometheus")
-    implementation("io.micrometer:micrometer-tracing-bridge-brave")
-
     implementation("ch.qos.logback:logback-classic")
     implementation("net.logstash.logback:logstash-logback-encoder:$logstashVersion")
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
     implementation("no.nav.security:token-validation-spring:$tokenValidationVersion")
 
-    implementation("com.google.cloud:google-cloud-storage:$gcsVersion")
-
     testImplementation("org.springframework.boot:spring-boot-starter-test") {
         exclude(group = "org.junit.vintage", module = "org.junit.vintage")
     }

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

gradlew.bat

@@ -1,18 +1,16 @@
 package no.nav.klage.controller
 
 
+import jakarta.servlet.http.HttpServletResponse
 import no.nav.klage.getLogger
 import no.nav.klage.service.DocumentService
 import no.nav.security.token.support.core.api.ProtectedWithClaims
-import org.springframework.core.io.FileSystemResource
-import org.springframework.core.io.Resource
+import org.springframework.http.HttpHeaders
 import org.springframework.http.HttpStatus
 import org.springframework.http.MediaType
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
 import org.springframework.web.multipart.MultipartFile
-import java.io.FileNotFoundException
-import java.nio.file.Path
 
 @RestController
 @ProtectedWithClaims(issuer = "azuread")
@@ -25,19 +23,16 @@ class KabalController(private val documentService: DocumentService) {
     }
 
     @GetMapping("{id}")
-    fun getDocument(@PathVariable("id") id: String): ResponseEntity<Resource> {
+    fun getDocument(
+        @PathVariable("id") id: String,
+        response: HttpServletResponse,
+    ) {
         logger.debug("Get document requested with id {}", id)
-        var path: Path? = null
-        return try {
-            path = documentService.getDocumentAsPath(id)
-            ResponseEntity.ok()
-                .contentType(MediaType.APPLICATION_OCTET_STREAM)
-                .body(FileSystemResource(path))
-        } catch (fnfe: FileNotFoundException) {
-            ResponseEntity.notFound().build()
-        } finally {
-            path?.toFile()?.delete()
-        }
+
+        response.addHeader(HttpHeaders.CONTENT_DISPOSITION, "inline; filename=file.pdf")
+        response.contentType = MediaType.APPLICATION_PDF_VALUE
+
+        documentService.getDocumentAsBlob(id).downloadTo(response.outputStream)
     }
 
     @PostMapping

src/main/kotlin/no/nav/klage/controller/DocumentController.kt

@@ -1,5 +1,6 @@
 package no.nav.klage.service
 
+import com.google.cloud.storage.Blob
 import com.google.cloud.storage.BlobId
 import com.google.cloud.storage.BlobInfo
 import com.google.cloud.storage.StorageOptions
@@ -8,8 +9,6 @@ import org.springframework.beans.factory.annotation.Value
 import org.springframework.stereotype.Service
 import org.springframework.web.multipart.MultipartFile
 import java.io.FileNotFoundException
-import java.nio.file.Files
-import java.nio.file.Path
 import java.util.*
 
 @Service
@@ -23,20 +22,17 @@ class DocumentService {
     @Value("\${GCS_BUCKET}")
     private lateinit var bucket: String
 
-    fun getDocumentAsPath(id: String): Path {
+    fun getDocumentAsBlob(id: String): Blob {
         logger.debug("Getting document with id {}", id)
 
         val blob = getGcsStorage().get(bucket, id.toPath())
+
         if (blob == null || !blob.exists()) {
             logger.warn("Document not found: {}", id)
             throw FileNotFoundException()
         }
 
-        val pathToTmpFile = Files.createTempFile(null, null)
-
-        blob.downloadTo(pathToTmpFile)
-
-        return pathToTmpFile
+        return blob
     }
 
     fun deleteDocument(id: String): Boolean {