Skip to content

Commit 9c2b6a2

Browse files
qtipsqtips
committed
spring + wiremock migrering da det ikke lenger finner på spring cloud
1 parent 6ec243c commit 9c2b6a2

23 files changed

+66
-41
lines changed

‎build.gradle.kts‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ configurations {
2424
}
2525

2626
val confluentVersion = "8.1.0"
27-
val springCloudVersion = "4.3.0"
2827
val logstashLogbackEncoderVersion = "9.0"
2928
val tokenSupportVersion = "6.0.0"
3029
val retryVersion = "2.0.12"
@@ -44,6 +43,8 @@ val teamDokumenthåndteringAvroSchemaVersion = "1.1.6"
4443
val testContainersVersion = "1.21.3"
4544
val springdocVersion = "3.0.0"
4645

46+
extra["springCloudVersion"] = "2025.1.0"
47+
4748
repositories {
4849
mavenCentral()
4950

@@ -61,6 +62,13 @@ repositories {
6162
}
6263
}
6364
}
65+
66+
dependencyManagement {
67+
imports {
68+
mavenBom("org.springframework.cloud:spring-cloud-dependencies:${property("springCloudVersion")}")
69+
}
70+
}
71+
6472
dependencies {
6573

6674
implementation("org.yaml:snakeyaml:2.5") {
@@ -88,13 +96,18 @@ dependencies {
8896
implementation("org.springframework:spring-aspects")
8997
runtimeOnly("org.springframework.boot:spring-boot-properties-migrator")
9098
annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
91-
testImplementation("org.springframework.boot:spring-boot-starter-test") {
99+
testImplementation("org.springframework.boot:spring-boot-starter-test-classic") {
92100
exclude(module = "mockito-core")
93101
}
102+
testImplementation("org.springframework.boot:spring-boot-resttestclient")
94103

95104
// Spring Cloud
96105
// https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-starter-contract-stub-runner
97-
testImplementation("org.springframework.cloud:spring-cloud-starter-contract-stub-runner:$springCloudVersion")
106+
testImplementation("org.springframework.cloud:spring-cloud-starter-contract-stub-runner") // vurder å droppe
107+
testImplementation("org.wiremock.integrations:wiremock-spring-boot:3.10.0")
108+
testImplementation("org.wiremock:wiremock-jetty12:3.13.2")
109+
testImplementation("org.eclipse.jetty.ee10:jetty-ee10-bom:12.1.0")
110+
98111

99112
// Swagger (openapi 3)
100113
implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:$springdocVersion")
@@ -113,6 +126,7 @@ dependencies {
113126
testImplementation("org.testcontainers:postgresql:$testContainersVersion")
114127

115128
// Jackson
129+
implementation("org.springframework.boot:spring-boot-jackson2")
116130
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
117131

118132
//graphql

‎src/main/kotlin/no/nav/sifinnsynapi/SifInnsynApiApplication.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package no.nav.sifinnsynapi
22

33
import no.nav.sifinnsynapi.exception.SifInnsynApiUncaughtExceptionHandler
44
import org.springframework.boot.autoconfigure.SpringBootApplication
5-
import org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration
65
import org.springframework.boot.context.properties.ConfigurationPropertiesScan
76
import org.springframework.boot.context.properties.EnableConfigurationProperties
87
import org.springframework.boot.runApplication
8+
import org.springframework.boot.webmvc.autoconfigure.error.ErrorMvcAutoConfiguration
99
import org.springframework.kafka.annotation.EnableKafka
1010
import org.springframework.retry.annotation.EnableRetry
1111
import org.springframework.scheduling.annotation.EnableScheduling

‎src/main/kotlin/no/nav/sifinnsynapi/config/CustomHealthIndicator.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package no.nav.sifinnsynapi.config
22

33
import org.springframework.beans.factory.annotation.Qualifier
4-
import org.springframework.boot.actuate.health.Health
5-
import org.springframework.boot.actuate.health.ReactiveHealthIndicator
4+
import org.springframework.boot.health.contributor.Health
5+
import org.springframework.boot.health.contributor.ReactiveHealthIndicator
66
import org.springframework.http.HttpMethod
77
import org.springframework.stereotype.Component
88
import org.springframework.web.client.HttpServerErrorException
@@ -12,7 +12,8 @@ import org.springframework.web.util.UriComponentsBuilder
1212
import reactor.core.publisher.Mono
1313

1414
@Component
15-
class CustomHealthIndicator(@Qualifier("k9OppslagsKlient") private val oppslagsKlient: RestTemplate) : ReactiveHealthIndicator {
15+
class CustomHealthIndicator(@Qualifier("k9OppslagsKlient") private val oppslagsKlient: RestTemplate) :
16+
ReactiveHealthIndicator {
1617
companion object{
1718

1819
val healthUrl = UriComponentsBuilder

‎src/main/kotlin/no/nav/sifinnsynapi/config/WebMvcConfig.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import no.nav.sifinnsynapi.filter.LoggerInterceptor
77
import org.slf4j.Logger
88
import org.slf4j.LoggerFactory
99
import org.springframework.beans.factory.annotation.Value
10-
import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer
10+
import org.springframework.boot.jackson2.autoconfigure.Jackson2ObjectMapperBuilderCustomizer
1111
import org.springframework.context.annotation.Bean
1212
import org.springframework.context.annotation.Configuration
1313
import org.springframework.web.servlet.config.annotation.CorsRegistry
@@ -56,6 +56,5 @@ class WebMvcConfig(
5656

5757
override fun addInterceptors(registry: InterceptorRegistry) {
5858
registry.addInterceptor(loggerInterceptor)
59-
super.addInterceptors(registry)
6059
}
6160
}

‎src/main/kotlin/no/nav/sifinnsynapi/config/kafka/CommonKafkaConfig.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class CommonKafkaConfig {
113113
): ConcurrentKafkaListenerContainerFactory<String, String> {
114114
val factory = ConcurrentKafkaListenerContainerFactory<String, String>()
115115

116-
factory.consumerFactory = consumerFactory
116+
factory.setConsumerFactory(consumerFactory)
117117

118118
factory.setReplyTemplate(kafkaTemplate)
119119

‎src/main/kotlin/no/nav/sifinnsynapi/config/kafka/JoarkKafkaConfig.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ internal class JoarkKafkaConfig(
5757
@Bean
5858
fun joarkKafkaJsonListenerContainerFactor(joarkConsumerFactory: ConsumerFactory<Long, JournalfoeringHendelseRecord>) =
5959
ConcurrentKafkaListenerContainerFactory<Long, JournalfoeringHendelseRecord>().apply {
60-
consumerFactory = joarkConsumerFactory
60+
setConsumerFactory(joarkConsumerFactory)
6161

6262
// https://docs.spring.io/spring-kafka/reference/html/#listener-container
6363
containerProperties.setAuthExceptionRetryInterval(Duration.ofSeconds(10L))

‎src/main/kotlin/no/nav/sifinnsynapi/filter/MDCFilter.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class HeadersToMDCFilterRegistrationBean(headersFilter: MDCFilter) : FilterRegis
6363
}
6464

6565
init {
66-
filter = headersFilter
66+
setFilter(headersFilter)
6767
urlPatterns = FilterRegistrationUtil.always()
6868
logger.info("Registrert filter {}", this.javaClass.simpleName)
6969
}

‎src/main/kotlin/no/nav/sifinnsynapi/filter/ResponseDecoratorFilter.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ class ResponseDecoratorFilter : Filter {
5656
* @see UnavailableException
5757
*/
5858
override fun doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain) {
59-
val requestWrapper = ContentCachingRequestWrapper(request as HttpServletRequest)
60-
val responseWrapper = ContentCachingResponseWrapper(response as HttpServletResponse)
59+
val requestWrapper = ContentCachingRequestWrapper(request as HttpServletRequest, 0)
60+
val responseWrapper = ContentCachingResponseWrapper(response as HttpServletResponse,)
6161
chain.doFilter(requestWrapper, responseWrapper)
6262

6363
when (response.status) {

‎src/main/kotlin/no/nav/sifinnsynapi/k8s/LeaderClientConfig.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package no.nav.sifinnsynapi.k8s
22

33
import org.slf4j.LoggerFactory
44
import org.springframework.beans.factory.annotation.Value
5-
import org.springframework.boot.web.client.RestTemplateBuilder
5+
import org.springframework.boot.restclient.RestTemplateBuilder
66
import org.springframework.context.annotation.Bean
77
import org.springframework.context.annotation.Configuration
88
import org.springframework.web.client.RestTemplate

‎src/main/kotlin/no/nav/sifinnsynapi/k9sakinnsynapi/K9SakInnsynApiClientConfig.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import no.nav.security.token.support.client.spring.ClientConfigurationProperties
55
import no.nav.sifinnsynapi.filter.MDCValuesPropagatingClienHttpRequesInterceptor
66
import org.slf4j.LoggerFactory
77
import org.springframework.beans.factory.annotation.Value
8-
import org.springframework.boot.web.client.RestTemplateBuilder
8+
import org.springframework.boot.restclient.RestTemplateBuilder
99
import org.springframework.context.annotation.Bean
1010
import org.springframework.context.annotation.Configuration
1111
import org.springframework.http.HttpHeaders

0 commit comments

Comments
 (0)