bump and refactor

Author: Battlestad

build.gradle.kts

@@ -1,7 +1,13 @@
+import org.gradle.authentication.http.BasicAuthentication
 import org.springframework.boot.gradle.plugin.SpringBootPlugin
 
+object Versions {
+    const val KOTLIN = "2.2.21"
+    const val FINT_MODEL = "3.21.10"
+}
+
 plugins {
-    id("org.springframework.boot") version "3.5.7" apply false
+    id("org.springframework.boot") version "3.5.8" apply false
     id("io.spring.dependency-management") version "1.1.7"
     id("maven-publish")
     id("com.github.ben-manes.versions") version "0.53.0"
@@ -10,18 +16,17 @@ plugins {
     kotlin("plugin.spring") version "2.2.21"
 }
 
-private val kotlinVersion = "2.2.21"
-extra["kotlin.version"] = kotlinVersion
-
 group = "no.novari"
 version = findProperty("version") ?: "1.0-SNAPSHOT"
 
-var fintModelVersion = "3.21.10"
+extra["kotlin.version"] = Versions.KOTLIN
+
+private val fintLabsRepo = uri("https://repo.fintlabs.no/releases")
 
 repositories {
     mavenLocal()
     maven {
-        url = uri("https://repo.fintlabs.no/releases")
+        url = fintLabsRepo
     }
     mavenCentral()
 }
@@ -41,12 +46,13 @@ dependencies {
     implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
     implementation("com.fasterxml.jackson.module:jackson-module-parameter-names")
+    implementation("org.apache.httpcomponents.client5:httpclient5")
 
-    implementation("no.fint:fint-arkiv-resource-model-java:$fintModelVersion")
-    implementation("no.novari:flyt-web-resource-server:2.0.0-rc-2")
-    implementation("no.novari:flyt-cache:2.0.0-rc-2")
-    implementation("no.novari:kafka:5.0.0-rc-20")
-    implementation("no.novari:flyt-kafka:4.0.0-rc-8")
+    implementation("no.fint:fint-arkiv-resource-model-java:${Versions.FINT_MODEL}")
+    implementation("no.novari:flyt-web-resource-server:2.0.0-rc-4")
+    implementation("no.novari:flyt-cache:2.0.1")
+    implementation("no.novari:kafka:5.0.0")
+    implementation("no.novari:flyt-kafka:4.0.0")
 
     testImplementation(kotlin("test"))
     testImplementation("org.springframework.boot:spring-boot-starter-test")
@@ -55,7 +61,7 @@ dependencies {
     testImplementation("org.mockito.kotlin:mockito-kotlin:6.1.0")
 }
 
-tasks.test {
+tasks.withType<Test>().configureEach {
     useJUnitPlatform()
 }
 
@@ -78,7 +84,7 @@ tasks.named("check") {
 publishing {
     repositories {
         maven {
-            url = uri("https://repo.fintlabs.no/releases")
+            url = fintLabsRepo
             credentials {
                 username = System.getenv("REPOSILITE_USERNAME")
                 password = System.getenv("REPOSILITE_PASSWORD")

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -115,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -173,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -206,15 +203,14 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew

@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -1,5 +1,9 @@
 package no.novari.gateway.instance.config
 
+import org.apache.hc.client5.http.config.ConnectionConfig
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder
+import org.apache.hc.core5.util.Timeout
 import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.autoconfigure.AutoConfiguration
@@ -15,17 +19,27 @@ import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService
 import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository
 import org.springframework.web.client.RestClient
 import java.net.URI
-import java.time.Duration
 
 @AutoConfiguration
 @EnableRetry
 class RestClientConfiguration {
     @Bean("fileClientHttpRequestFactory")
     fun fileClientHttpRequestFactory(): ClientHttpRequestFactory =
-        HttpComponentsClientHttpRequestFactory().apply {
-            setConnectTimeout(Duration.ofSeconds(300))
-            setReadTimeout(Duration.ofSeconds(300))
-        }
+        HttpComponentsClientHttpRequestFactory(
+            HttpClientBuilder
+                .create()
+                .setConnectionManager(
+                    PoolingHttpClientConnectionManagerBuilder
+                        .create()
+                        .setDefaultConnectionConfig(
+                            ConnectionConfig
+                                .custom()
+                                .setConnectTimeout(Timeout.ofSeconds(300))
+                                .setSocketTimeout(Timeout.ofSeconds(300))
+                                .build(),
+                        ).build(),
+                ).build(),
+        )
 
     @Bean("fileAuthorizedClientManager")
     fun fileAuthorizedClientManager(

src/main/kotlin/no/novari/gateway/instance/config/RestClientConfiguration.kt

@@ -4,26 +4,16 @@ import no.novari.flyt.kafka.instanceflow.headers.InstanceFlowHeaders
 import no.novari.flyt.kafka.instanceflow.producing.InstanceFlowProducerRecord
 import no.novari.flyt.kafka.instanceflow.producing.InstanceFlowTemplateFactory
 import no.novari.gateway.instance.model.instance.InstanceObject
-import no.novari.kafka.topic.EventTopicService
-import no.novari.kafka.topic.configuration.EventCleanupFrequency
-import no.novari.kafka.topic.configuration.EventTopicConfiguration
 import no.novari.kafka.topic.name.EventTopicNameParameters
 import no.novari.kafka.topic.name.TopicNamePrefixParameters
 import org.springframework.stereotype.Service
-import java.time.Duration
 
 @Service
 class ReceivedInstanceEventProducerService(
     instanceFlowTemplateFactory: InstanceFlowTemplateFactory,
-    eventTopicService: EventTopicService,
 ) {
     companion object {
         private const val EVENT_NAME = "instance-received"
-
-        // TODO: Correct retention time?
-        private val RETENTION_TIME = Duration.ZERO
-        private val CLEANUP_FREQUENCY = EventCleanupFrequency.NORMAL
-        private const val PARTITIONS = 1
     }
 
     private val instanceReceivedTopicNameParameters =
@@ -40,18 +30,6 @@ class ReceivedInstanceEventProducerService(
 
     private val template = instanceFlowTemplateFactory.createTemplate(InstanceObject::class.java)
 
-    init {
-        eventTopicService.createOrModifyTopic(
-            instanceReceivedTopicNameParameters,
-            EventTopicConfiguration
-                .stepBuilder()
-                .partitions(PARTITIONS)
-                .retentionTime(RETENTION_TIME)
-                .cleanupFrequency(CLEANUP_FREQUENCY)
-                .build(),
-        )
-    }
-
     fun publish(
         instanceFlowHeaders: InstanceFlowHeaders,
         instance: InstanceObject,

src/main/kotlin/no/novari/gateway/instance/kafka/ReceivedInstanceEventProducerService.kt

@@ -1,6 +1,9 @@
-package no.novari.gateway.instance
+package no.novari.flyt.gateway.instance
 
 import no.novari.flyt.resourceserver.security.client.sourceapplication.SourceApplicationAuthorizationService
+import no.novari.gateway.instance.FileClient
+import no.novari.gateway.instance.InstanceMapper
+import no.novari.gateway.instance.InstanceProcessor
 import no.novari.gateway.instance.exception.FileUploadException
 import no.novari.gateway.instance.kafka.InstanceReceivalErrorEventProducerService
 import no.novari.gateway.instance.kafka.IntegrationRequestProducerService

…ateway/instance/InstanceProcessorTest.kt …ateway/instance/InstanceProcessorTest.ktsrc/test/kotlin/no/novari/gateway/instance/InstanceProcessorTest.kt renamed to src/test/kotlin/no/novari/flyt/gateway/instance/InstanceProcessorTest.kt src/test/kotlin/no/novari/gateway/instance/InstanceProcessorTest.kt renamed to src/test/kotlin/no/novari/flyt/gateway/instance/InstanceProcessorTest.kt

@@ -1,8 +1,9 @@
-package no.novari.gateway.instance.validation.constraints
+package no.novari.flyt.gateway.instance.validation.constraints
 
 import io.mockk.MockKAnnotations
 import io.mockk.impl.annotations.MockK
 import jakarta.validation.ConstraintValidatorContext
+import no.novari.gateway.instance.validation.constraints.Base64Validator
 import org.junit.jupiter.api.Assertions.assertFalse
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.BeforeEach
@@ -76,7 +77,7 @@ class Base64ValidatorTest {
                 "AA\tA",
                 // newline inside
                 "AA\nA",
-                // hyphen not allowed in standard base64
+                // hyphen isn't allowed in standard base64
                 "AA-A",
                 // three padding characters
                 "A===",