Skip to content

Commit 1ded0e5

Browse files
committed
Ktlinting
1 parent dc36588 commit 1ded0e5

File tree

4 files changed

+15
-14
lines changed

4 files changed

+15
-14
lines changed

oauth2-klient/src/main/kotlin/no/nav/dagpenger/oauth2/LoadingCacheBuilder.kt

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package no.nav.dagpenger.oauth2
33
import com.github.benmanes.caffeine.cache.AsyncLoadingCache
44
import com.github.benmanes.caffeine.cache.Caffeine
55
import com.github.benmanes.caffeine.cache.Expiry
6-
import com.github.benmanes.caffeine.cache.LoadingCache
76
import kotlinx.coroutines.runBlocking
87
import no.nav.security.token.support.client.core.oauth2.OAuth2AccessTokenResponse
98
import java.util.concurrent.TimeUnit

oauth2-klient/src/main/kotlin/no/nav/dagpenger/oauth2/OAuth2Client.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ class OAuth2Client(
2727
return httpClient.submitForm(
2828
url = tokenEndpointUrl,
2929
formParameters =
30-
Parameters.build {
31-
grantRequest.formParams.forEach {
32-
this.append(it.key, it.value)
33-
}
34-
},
30+
Parameters.build {
31+
grantRequest.formParams.forEach {
32+
this.append(it.key, it.value)
33+
}
34+
},
3535
).body()
3636
}
3737
}

oauth2-klient/src/test/kotlin/no/nav/dagpenger/client/ClientTest.kt

+9-7
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ class ClientTest {
7373
}
7474
}
7575

76+
// @Disabled("Manual test")
7677
@Test
77-
// @Disabled("Manual test")
7878
fun clientCredentialsTest() {
7979
val config =
8080
OAuth2Config.AzureAd(
@@ -115,12 +115,14 @@ class ClientTest {
115115
CachedOauth2Client(tokenEndpointUrl = config.tokenEndpointUrl, authType = config.privateKey())
116116

117117
runBlocking {
118-
val t1 = async {
119-
cachedOauth2Client.clientCredentials("api://dev-gcp.nom.skjermede-personer-pip/.default")
120-
}
121-
val t2 = async {
122-
cachedOauth2Client.clientCredentials("api://dev-fss.pdl.pdl-api/.default")
123-
}
118+
val t1 =
119+
async {
120+
cachedOauth2Client.clientCredentials("api://dev-gcp.nom.skjermede-personer-pip/.default")
121+
}
122+
val t2 =
123+
async {
124+
cachedOauth2Client.clientCredentials("api://dev-fss.pdl.pdl-api/.default")
125+
}
124126

125127
println("t1 = ${t1.await().accessToken} t2 = ${t2.await().accessToken}")
126128
}

pdl-klient/src/test/java/no/nav/dagpenger/client/pdl/JavaClientTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
public class JavaClientTest {
2020

2121
@Test
22-
@Disabled
22+
// @Disabled
2323
public void test() {
2424
final Map<String, String> env = Stream.of(new String[][]{
2525
{"AZURE_APP_CLIENT_ID", ""},

0 commit comments

Comments
 (0)