diff --git a/src/main/kotlin/no/nav/sosialhjelp/innsyn/client/fiks/KommuneInfoClientConfig.kt b/src/main/kotlin/no/nav/sosialhjelp/innsyn/client/fiks/KommuneInfoClientConfig.kt index 780a96153..2e09b5d78 100644 --- a/src/main/kotlin/no/nav/sosialhjelp/innsyn/client/fiks/KommuneInfoClientConfig.kt +++ b/src/main/kotlin/no/nav/sosialhjelp/innsyn/client/fiks/KommuneInfoClientConfig.kt @@ -12,14 +12,14 @@ import org.springframework.web.reactive.function.client.WebClient @Profile("!mock") @Configuration class KommuneInfoClientConfig( - private val proxiedWebClient: WebClient, + private val proxiedWebClientBuilder: WebClient.Builder, private val clientProperties: ClientProperties ) { @Bean fun kommuneInfoClient(): KommuneInfoClient { return KommuneInfoClientImpl( - proxiedWebClient, + proxiedWebClientBuilder.build(), fiksProperties() ) } diff --git a/src/main/kotlin/no/nav/sosialhjelp/innsyn/client/idporten/IdPortenClientConfig.kt b/src/main/kotlin/no/nav/sosialhjelp/innsyn/client/idporten/IdPortenClientConfig.kt index 3242d552f..07b7093bc 100644 --- a/src/main/kotlin/no/nav/sosialhjelp/innsyn/client/idporten/IdPortenClientConfig.kt +++ b/src/main/kotlin/no/nav/sosialhjelp/innsyn/client/idporten/IdPortenClientConfig.kt @@ -12,7 +12,7 @@ import org.springframework.web.reactive.function.client.WebClient @Profile("!mock") @Configuration class IdPortenClientConfig( - private val proxiedWebClient: WebClient, + private val proxiedWebClientBuilder: WebClient.Builder, @Value("\${no.nav.sosialhjelp.idporten.token_url}") private val tokenUrl: String, @Value("\${no.nav.sosialhjelp.idporten.client_id}") private val clientId: String, @Value("\${no.nav.sosialhjelp.idporten.scope}") private val scope: String, @@ -24,7 +24,7 @@ class IdPortenClientConfig( @Bean fun idPortenClient(): IdPortenClient { return IdPortenClient( - webClient = proxiedWebClient, + webClient = proxiedWebClientBuilder.build(), idPortenProperties = idPortenProperties() ) } diff --git a/src/main/kotlin/no/nav/sosialhjelp/innsyn/config/ProxiedWebClientConfig.kt b/src/main/kotlin/no/nav/sosialhjelp/innsyn/config/ProxiedWebClientConfig.kt index f613e1ddd..ae647c846 100644 --- a/src/main/kotlin/no/nav/sosialhjelp/innsyn/config/ProxiedWebClientConfig.kt +++ b/src/main/kotlin/no/nav/sosialhjelp/innsyn/config/ProxiedWebClientConfig.kt @@ -11,31 +11,25 @@ import reactor.netty.http.client.HttpClient @Profile("!(mock|mock-alt|local)") @Configuration -class ProxiedWebClientConfig( - private val webClientBuilder: WebClient.Builder -) { +class ProxiedWebClientConfig { @Value("\${HTTPS_PROXY}") private lateinit var proxyUrl: String @Bean - fun proxiedWebClient(): WebClient = - webClientBuilder + fun proxiedWebClientBuilder(): WebClient.Builder = + WebClient.builder() .clientConnector(getReactorClientHttpConnector(proxyUrl)) - .build() } @Profile("mock|mock-alt|local") @Configuration -class MockProxiedWebClientConfig( - private val webClientBuilder: WebClient.Builder -) { +class MockProxiedWebClientConfig { @Bean - fun proxiedWebClient(): WebClient = - webClientBuilder + fun proxiedWebClientBuilder(): WebClient.Builder = + WebClient.builder() .clientConnector(ReactorClientHttpConnector(HttpClient.newConnection())) - .build() } \ No newline at end of file diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index d8adfeca7..cd92cf4ae 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -24,6 +24,7 @@ + diff --git a/src/test/kotlin/no/nav/sosialhjelp/innsyn/ApplicationContextTest.kt b/src/test/kotlin/no/nav/sosialhjelp/innsyn/ApplicationContextTest.kt index 9fc56aad6..0adeb3340 100644 --- a/src/test/kotlin/no/nav/sosialhjelp/innsyn/ApplicationContextTest.kt +++ b/src/test/kotlin/no/nav/sosialhjelp/innsyn/ApplicationContextTest.kt @@ -16,8 +16,8 @@ class ApplicationContextTest { @MockkBean private lateinit var idPortenClient: IdPortenClient - @MockkBean(name = "proxiedWebClient") - private lateinit var proxiedWebClient: WebClient + @MockkBean(name = "proxiedWebClientBuilder", relaxed = true) + private lateinit var proxiedWebClientBuilder: WebClient.Builder @MockkBean private lateinit var proxiedWebClientConfig: ProxiedWebClientConfig