Skip to content

Commit 26de1d0

Browse files
authored
Bruk standard HTTPClient (#879)
* Fjerner custom HTTP client config Reverts: 3c0b551 Vi har litt custom HTTP-config her uten noen klar grunn. Det ser ut til å ha blitt satt ifbm et DNS-problem med spring boot 2, jf. commit-meldinga over, men forårsaker nå potensielt problemer. Vi har også brukt .newConnection(), som foretar en ny HTTP-connection med TCP og SSL-overhead for hver request. Denne PRen reverter til en litt mer standard HTTP-klient.
1 parent 0f7f9a0 commit 26de1d0

File tree

5 files changed

+3
-24
lines changed

5 files changed

+3
-24
lines changed

src/main/kotlin/no/nav/sosialhjelp/innsyn/app/config/HttpClientConfig.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ import reactor.netty.http.client.HttpClient
77
@Configuration
88
class HttpClientConfig {
99
@Bean
10-
fun unproxiedHttpClient(): HttpClient = HttpClientUtil.getHttpClient()
10+
fun unproxiedHttpClient(): HttpClient = HttpClient.create()
1111
}

src/main/kotlin/no/nav/sosialhjelp/innsyn/app/config/HttpClientUtil.kt

-17
This file was deleted.

src/main/kotlin/no/nav/sosialhjelp/innsyn/navenhet/NorgConfig.kt

-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package no.nav.sosialhjelp.innsyn.navenhet
22

33
import no.nav.sosialhjelp.innsyn.app.ClientProperties
44
import no.nav.sosialhjelp.innsyn.app.client.mdcExchangeFilter
5-
import no.nav.sosialhjelp.innsyn.app.config.HttpClientUtil.getReactorClientHttpConnector
65
import org.springframework.context.annotation.Bean
76
import org.springframework.context.annotation.Configuration
87
import org.springframework.web.reactive.function.client.WebClient
@@ -14,7 +13,6 @@ class NorgConfig(
1413
@Bean
1514
fun norgWebClient(webClientBuilder: WebClient.Builder): WebClient =
1615
webClientBuilder
17-
.clientConnector(getReactorClientHttpConnector())
1816
.baseUrl(clientProperties.norgUrl)
1917
.filter(mdcExchangeFilter)
2018
.build()

src/main/kotlin/no/nav/sosialhjelp/innsyn/tilgang/pdl/PdlConfig.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import io.netty.channel.ChannelOption
44
import io.netty.handler.timeout.ReadTimeoutHandler
55
import no.nav.sosialhjelp.innsyn.app.ClientProperties
66
import no.nav.sosialhjelp.innsyn.app.client.mdcExchangeFilter
7-
import no.nav.sosialhjelp.innsyn.app.config.HttpClientUtil.getHttpClient
87
import no.nav.sosialhjelp.innsyn.utils.IntegrationUtils
98
import org.springframework.context.annotation.Bean
109
import org.springframework.context.annotation.Configuration
1110
import org.springframework.http.client.reactive.ReactorClientHttpConnector
1211
import org.springframework.web.reactive.function.client.WebClient
12+
import reactor.netty.http.client.HttpClient
1313

1414
@Configuration
1515
class PdlConfig(
@@ -21,7 +21,7 @@ class PdlConfig(
2121
.baseUrl(clientProperties.pdlEndpointUrl)
2222
.clientConnector(
2323
ReactorClientHttpConnector(
24-
getHttpClient()
24+
HttpClient.create()
2525
.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 15000)
2626
.doOnConnected { it.addHandlerLast(ReadTimeoutHandler(30)) },
2727
),

src/main/kotlin/no/nav/sosialhjelp/innsyn/vedlegg/virusscan/VirusScanConfig.kt

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package no.nav.sosialhjelp.innsyn.vedlegg.virusscan
22

33
import no.nav.sosialhjelp.innsyn.app.client.mdcExchangeFilter
4-
import no.nav.sosialhjelp.innsyn.app.config.HttpClientUtil.getReactorClientHttpConnector
54
import org.springframework.beans.factory.annotation.Value
65
import org.springframework.context.annotation.Bean
76
import org.springframework.context.annotation.Configuration
@@ -15,7 +14,6 @@ class VirusScanConfig(
1514
fun virusScanWebClient(webClientBuilder: WebClient.Builder) =
1615
webClientBuilder
1716
.baseUrl(clamAvUrl)
18-
.clientConnector(getReactorClientHttpConnector())
1917
.filter(mdcExchangeFilter)
2018
.build()
2119
}

0 commit comments

Comments
 (0)