Skip to content

Commit 78e7af3

Browse files
runskarunska
committed
🚨 Kjører spotlessApply med ny versjon.
1 parent 8175df6 commit 78e7af3

File tree

31 files changed

+364
-328
lines changed

31 files changed

+364
-328
lines changed

‎http-client/main/no/nav/tilleggsstonader/libs/http/client/AbstractRestClient.kt

+9-8
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ import java.net.URI
1717
/**
1818
* Abstract klasse for å kalle rest-tjenester med metrics og utpakking av ev. body.
1919
*/
20-
abstract class AbstractRestClient(val restTemplate: RestTemplate) {
21-
20+
abstract class AbstractRestClient(
21+
val restTemplate: RestTemplate,
22+
) {
2223
protected val log: Logger = LoggerFactory.getLogger(javaClass)
2324

2425
inline fun <reified T : Any> getForEntity(
@@ -74,10 +75,9 @@ abstract class AbstractRestClient(val restTemplate: RestTemplate) {
7475
method: HttpMethod,
7576
entity: HttpEntity<*>,
7677
uriVariables: Map<String, *> = emptyMap<String, String>(),
77-
): T {
78-
return executeNullable<T>(urlTemplate, method, entity, uriVariables)
78+
): T =
79+
executeNullable<T>(urlTemplate, method, entity, uriVariables)
7980
?: error("Mangler body")
80-
}
8181

8282
inline fun <reified T : Any> executeNullable(
8383
urlTemplate: String,
@@ -98,9 +98,10 @@ abstract class AbstractRestClient(val restTemplate: RestTemplate) {
9898
}
9999
}
100100

101-
fun expand(urlTemplate: String, uriVariables: Map<String, *>): URI {
102-
return restTemplate.uriTemplateHandler.expand(urlTemplate, uriVariables)
103-
}
101+
fun expand(
102+
urlTemplate: String,
103+
uriVariables: Map<String, *>,
104+
): URI = restTemplate.uriTemplateHandler.expand(urlTemplate, uriVariables)
104105

105106
fun readProblemDetail(e: RestClientResponseException): ProblemDetail? {
106107
val responseBody = e.responseBodyAsString

‎http-client/main/no/nav/tilleggsstonader/libs/http/client/MultipartBuilder.kt

+18-16
Original file line numberDiff line numberDiff line change
@@ -8,37 +8,39 @@ import org.springframework.util.LinkedMultiValueMap
88
import org.springframework.util.MultiValueMap
99

1010
class MultipartBuilder {
11-
1211
private val multipartRequest: MultiValueMap<String, Any> = LinkedMultiValueMap()
1312

14-
fun withJson(name: String, any: Any): MultipartBuilder {
13+
fun withJson(
14+
name: String,
15+
any: Any,
16+
): MultipartBuilder {
1517
val headers = HttpHeaders()
1618
headers.set(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
1719
multipartRequest.add(name, HttpEntity(any, headers))
1820
return this
1921
}
2022

21-
fun withByteArray(name: String, filename: String, bytes: ByteArray): MultipartBuilder {
22-
val request = object : ByteArrayResource(bytes) {
23-
override fun getFilename(): String? {
24-
return filename
23+
fun withByteArray(
24+
name: String,
25+
filename: String,
26+
bytes: ByteArray,
27+
): MultipartBuilder {
28+
val request =
29+
object : ByteArrayResource(bytes) {
30+
override fun getFilename(): String? = filename
2531
}
26-
}
2732
multipartRequest.add(name, request)
2833
return this
2934
}
3035

31-
fun build(): MultiValueMap<String, Any> {
32-
return multipartRequest
33-
}
36+
fun build(): MultiValueMap<String, Any> = multipartRequest
3437

35-
fun asEntity(): HttpEntity<MultiValueMap<String, Any>> {
36-
return HttpEntity(multipartRequest, MULTIPART_HEADERS)
37-
}
38+
fun asEntity(): HttpEntity<MultiValueMap<String, Any>> = HttpEntity(multipartRequest, MULTIPART_HEADERS)
3839

3940
companion object {
40-
val MULTIPART_HEADERS: HttpHeaders = HttpHeaders().apply {
41-
this.set(HttpHeaders.CONTENT_TYPE, MediaType.MULTIPART_FORM_DATA_VALUE)
42-
}
41+
val MULTIPART_HEADERS: HttpHeaders =
42+
HttpHeaders().apply {
43+
this.set(HttpHeaders.CONTENT_TYPE, MediaType.MULTIPART_FORM_DATA_VALUE)
44+
}
4345
}
4446
}

‎http-client/main/no/nav/tilleggsstonader/libs/http/client/RetryOAuth2HttpClient.kt

+8-10
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ class RetryOAuth2HttpClient(
1515
restClient: RestClient,
1616
private val maxRetries: Int = 2,
1717
) : DefaultOAuth2HttpClient(restClient) {
18-
1918
private val logger = LoggerFactory.getLogger(javaClass)
2019
private val secureLogger = LoggerFactory.getLogger("secureLogger")
2120

2221
// ServiceUnavailable håndteres av apache http-client
23-
private val retryExceptions = setOf(
24-
SocketException::class,
25-
SocketTimeoutException::class,
26-
HttpServerErrorException.GatewayTimeout::class,
27-
NoHttpResponseException::class,
28-
)
22+
private val retryExceptions =
23+
setOf(
24+
SocketException::class,
25+
SocketTimeoutException::class,
26+
HttpServerErrorException.GatewayTimeout::class,
27+
NoHttpResponseException::class,
28+
)
2929

3030
override fun post(req: OAuth2HttpRequest): OAuth2AccessTokenResponse {
3131
var retries = 0
@@ -57,7 +57,5 @@ class RetryOAuth2HttpClient(
5757
}
5858
}
5959

60-
private fun shouldRetry(e: Exception): Boolean {
61-
return retryExceptions.contains(e.cause?.let { it::class })
62-
}
60+
private fun shouldRetry(e: Exception): Boolean = retryExceptions.contains(e.cause?.let { it::class })
6361
}

‎http-client/main/no/nav/tilleggsstonader/libs/http/config/RestTemplateConfiguration.kt

+28-31
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,23 @@ class RestTemplateConfiguration(
3333
private val consumerIdClientInterceptor: ConsumerIdClientInterceptor,
3434
private val mdcValuesPropagatingClientInterceptor: MdcValuesPropagatingClientInterceptor,
3535
) {
36-
3736
@Primary
3837
@Bean
3938
fun oAuth2HttpClient(
4039
restClientBuilder: RestClient.Builder,
4140
consumerIdClientInterceptor: ConsumerIdClientInterceptor,
4241
mdcValuesPropagatingClientInterceptor: MdcValuesPropagatingClientInterceptor,
4342
): RetryOAuth2HttpClient {
44-
val clientHttpRequestFactorySettings = ClientHttpRequestFactorySettings.DEFAULTS
45-
.withConnectTimeout(Duration.of(1, ChronoUnit.SECONDS))
46-
.withReadTimeout(Duration.of(1, ChronoUnit.SECONDS))
47-
val restClient = restClientBuilder
48-
.requestFactory(ClientHttpRequestFactories.get(clientHttpRequestFactorySettings))
49-
.requestInterceptor(consumerIdClientInterceptor)
50-
.requestInterceptor(mdcValuesPropagatingClientInterceptor)
51-
.build()
43+
val clientHttpRequestFactorySettings =
44+
ClientHttpRequestFactorySettings.DEFAULTS
45+
.withConnectTimeout(Duration.of(1, ChronoUnit.SECONDS))
46+
.withReadTimeout(Duration.of(1, ChronoUnit.SECONDS))
47+
val restClient =
48+
restClientBuilder
49+
.requestFactory(ClientHttpRequestFactories.get(clientHttpRequestFactorySettings))
50+
.requestInterceptor(consumerIdClientInterceptor)
51+
.requestInterceptor(mdcValuesPropagatingClientInterceptor)
52+
.build()
5253
return RetryOAuth2HttpClient(restClient)
5354
}
5455

@@ -57,61 +58,57 @@ class RestTemplateConfiguration(
5758
restTemplateBuilder: RestTemplateBuilder,
5859
consumerIdClientInterceptor: ConsumerIdClientInterceptor,
5960
mdcValuesPropagatingClientInterceptor: MdcValuesPropagatingClientInterceptor,
60-
): RestTemplate {
61-
return restTemplateBuilder
61+
): RestTemplate =
62+
restTemplateBuilder
6263
.defaultBuilderConfig()
6364
.build()
64-
}
6565

6666
@Bean("tokenExchange")
6767
fun restTemplate(
6868
restTemplateBuilder: RestTemplateBuilder,
6969
bearerTokenExchangeClientInterceptor: BearerTokenExchangeClientInterceptor,
70-
): RestTemplate {
71-
return restTemplateBuilder
70+
): RestTemplate =
71+
restTemplateBuilder
7272
.defaultBuilderConfig()
7373
.interceptors(bearerTokenExchangeClientInterceptor)
7474
.build()
75-
}
7675

7776
@Bean("azure")
7877
fun restTemplateJwtBearer(
7978
restTemplateBuilder: RestTemplateBuilder,
8079
bearerTokenClientInterceptor: BearerTokenClientInterceptor,
81-
): RestTemplate {
82-
return restTemplateBuilder
80+
): RestTemplate =
81+
restTemplateBuilder
8382
.defaultBuilderConfig()
8483
.additionalInterceptors(bearerTokenClientInterceptor)
8584
.build()
86-
}
8785

8886
@Bean("azureClientCredential")
8987
fun restTemplateClientCredentialBearer(
9088
restTemplateBuilder: RestTemplateBuilder,
9189
bearerTokenClientInterceptor: BearerTokenClientCredentialsClientInterceptor,
92-
): RestTemplate {
93-
return restTemplateBuilder
90+
): RestTemplate =
91+
restTemplateBuilder
9492
.defaultBuilderConfig()
9593
.additionalInterceptors(bearerTokenClientInterceptor)
9694
.build()
97-
}
9895

9996
@Bean("azureOnBehalfOf")
10097
fun restTemplateOnBehalfOfBearer(
10198
restTemplateBuilder: RestTemplateBuilder,
10299
bearerTokenClientInterceptor: BearerTokenOnBehalfOfClientInterceptor,
103-
): RestTemplate {
104-
return restTemplateBuilder
100+
): RestTemplate =
101+
restTemplateBuilder
105102
.defaultBuilderConfig()
106103
.additionalInterceptors(bearerTokenClientInterceptor)
107104
.build()
108-
}
109105

110-
private fun RestTemplateBuilder.defaultBuilderConfig() = this
111-
.setConnectTimeout(Duration.of(2, ChronoUnit.SECONDS))
112-
.setReadTimeout(Duration.of(25, ChronoUnit.SECONDS))
113-
.additionalInterceptors(
114-
consumerIdClientInterceptor,
115-
mdcValuesPropagatingClientInterceptor,
116-
)
106+
private fun RestTemplateBuilder.defaultBuilderConfig() =
107+
this
108+
.setConnectTimeout(Duration.of(2, ChronoUnit.SECONDS))
109+
.setReadTimeout(Duration.of(25, ChronoUnit.SECONDS))
110+
.additionalInterceptors(
111+
consumerIdClientInterceptor,
112+
mdcValuesPropagatingClientInterceptor,
113+
)
117114
}

‎http-client/main/no/nav/tilleggsstonader/libs/http/interceptor/BearerTokenClientInterceptor.kt

+12-17
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ class BearerTokenClientInterceptor(
1818
private val oAuth2AccessTokenService: OAuth2AccessTokenService,
1919
private val clientConfigurationProperties: ClientConfigurationProperties,
2020
) : ClientHttpRequestInterceptor {
21-
2221
override fun intercept(
2322
request: HttpRequest,
2423
body: ByteArray,
@@ -40,7 +39,6 @@ class BearerTokenClientCredentialsClientInterceptor(
4039
private val oAuth2AccessTokenService: OAuth2AccessTokenService,
4140
private val clientConfigurationProperties: ClientConfigurationProperties,
4241
) : ClientHttpRequestInterceptor {
43-
4442
override fun intercept(
4543
request: HttpRequest,
4644
body: ByteArray,
@@ -63,7 +61,6 @@ class BearerTokenExchangeClientInterceptor(
6361
private val oAuth2AccessTokenService: OAuth2AccessTokenService,
6462
private val clientConfigurationProperties: ClientConfigurationProperties,
6563
) : ClientHttpRequestInterceptor {
66-
6764
override fun intercept(
6865
request: HttpRequest,
6966
body: ByteArray,
@@ -86,7 +83,6 @@ class BearerTokenOnBehalfOfClientInterceptor(
8683
private val oAuth2AccessTokenService: OAuth2AccessTokenService,
8784
private val clientConfigurationProperties: ClientConfigurationProperties,
8885
) : ClientHttpRequestInterceptor {
89-
9086
override fun intercept(
9187
request: HttpRequest,
9288
body: ByteArray,
@@ -110,11 +106,12 @@ private fun genererAccessToken(
110106
oAuth2AccessTokenService: OAuth2AccessTokenService,
111107
grantType: GrantType? = null,
112108
): String {
113-
val clientProperties = clientPropertiesFor(
114-
request.uri,
115-
clientConfigurationProperties,
116-
grantType,
117-
)
109+
val clientProperties =
110+
clientPropertiesFor(
111+
request.uri,
112+
clientConfigurationProperties,
113+
grantType,
114+
)
118115
return oAuth2AccessTokenService.getAccessToken(clientProperties).access_token
119116
?: throw JwtTokenMissingException()
120117
}
@@ -155,20 +152,18 @@ private fun clientPropertiesForGrantType(
155152
values: List<ClientProperties>,
156153
grantType: GrantType,
157154
uri: URI,
158-
): ClientProperties {
159-
return values.firstOrNull { grantType == it.grantType }
155+
): ClientProperties =
156+
values.firstOrNull { grantType == it.grantType }
160157
?: error("could not find oauth2 client config for uri=$uri and grant type=$grantType")
161-
}
162158

163-
private fun clientCredentialOrJwtBearer() =
164-
if (erSystembruker()) GrantType.CLIENT_CREDENTIALS else GrantType.JWT_BEARER
159+
private fun clientCredentialOrJwtBearer() = if (erSystembruker()) GrantType.CLIENT_CREDENTIALS else GrantType.JWT_BEARER
165160

166161
private fun erSystembruker(): Boolean {
167162
return try {
168163
val tokenValidationContext = SpringTokenValidationContextHolder().getTokenValidationContext()
169-
val preferred_username = tokenValidationContext.getClaims("azuread").get("preferred_username")
170-
return preferred_username == null
171-
} catch (e: Throwable) {
164+
val preferredUsername = tokenValidationContext.getClaims("azuread").get("preferred_username")
165+
return preferredUsername == null
166+
} catch (_: Throwable) {
172167
// Ingen request context. Skjer ved kall som har opphav i kjørende applikasjon. Ping etc.
173168
true
174169
}

‎http-client/main/no/nav/tilleggsstonader/libs/http/interceptor/ConsumerIdClientInterceptor.kt

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import org.springframework.stereotype.Component
1212
class ConsumerIdClientInterceptor(
1313
@Value("\${application.name}") private val appName: String,
1414
) : ClientHttpRequestInterceptor {
15-
1615
override fun intercept(
1716
request: HttpRequest,
1817
body: ByteArray,

‎http-client/main/no/nav/tilleggsstonader/libs/http/interceptor/MdcValuesPropagatingClientInterceptor.kt

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import org.springframework.stereotype.Component
1212

1313
@Component
1414
class MdcValuesPropagatingClientInterceptor : ClientHttpRequestInterceptor {
15-
1615
override fun intercept(
1716
request: HttpRequest,
1817
body: ByteArray,

0 commit comments

Comments
 (0)