Skip to content

Commit 38f421d

Browse files
geiralundgeiralund
authored
Oppdatere 3.parts biblioteker (#110)
* Oppdatere 3.parts biblioteker
1 parent 4352387 commit 38f421d

File tree

16 files changed

+64
-57
lines changed

16 files changed

+64
-57
lines changed

‎buildSrc/src/main/kotlin/Constants.kt‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ object Cucumber {
2424
object Dagpenger {
2525

2626
object Biblioteker {
27-
const val version = "2020.07.30-12.21.8857eb1469bf"
27+
const val version = "2020.11.24-08.15.86482b2eead8"
2828
const val stsKlient = "com.github.navikt.dp-biblioteker:sts-klient:$version"
2929
const val grunnbeløp = "com.github.navikt.dp-biblioteker:grunnbelop:$version"
3030
const val ktorUtils = "com.github.navikt.dp-biblioteker:ktor-utils:$version"
@@ -45,8 +45,8 @@ object Dagpenger {
4545
}
4646
}
4747

48-
const val Streams = "com.github.navikt:dagpenger-streams:2020.05.15-23.03.e0ab571caee4"
49-
const val Events = "com.github.navikt:dagpenger-events:2020.05.15-21.57.e4685fc2a371"
48+
const val Streams = "com.github.navikt:dagpenger-streams:2020.08.19-13.32.0fd360f3ef11"
49+
const val Events = "com.github.navikt:dagpenger-events:2020.08.19-10.57.d2fe892352eb"
5050
}
5151

5252
object Database {
@@ -69,18 +69,19 @@ object GradleWrapper {
6969
}
7070

7171
object Jackson {
72-
const val version = "2.10.3"
72+
const val version = "2.12.1"
7373
const val core = "com.fasterxml.jackson.core:jackson-core:$version"
7474
const val kotlin = "com.fasterxml.jackson.module:jackson-module-kotlin:$version"
7575
const val jsr310 = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$version"
7676
}
7777

7878
object Junit5 {
79-
const val version = "5.6.1"
79+
const val version = "5.7.1"
8080
const val api = "org.junit.jupiter:junit-jupiter-api:$version"
8181
const val params = "org.junit.jupiter:junit-jupiter-params:$version"
8282
const val engine = "org.junit.jupiter:junit-jupiter-engine:$version"
8383
const val vintageEngine = "org.junit.vintage:junit-vintage-engine:$version"
84+
const val kotlinRunner = "io.kotlintest:kotlintest-runner-junit5:3.4.2"
8485
fun library(name: String) = "org.junit.jupiter:junit-jupiter-$name:$version"
8586
}
8687

@@ -121,22 +122,22 @@ object Konfig {
121122
}
122123

123124
object Kotlin {
124-
const val version = "1.3.72"
125+
const val version = "1.4.30"
125126
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib:$version"
126127

127128
object Coroutines {
128-
const val version = "1.3.7"
129+
const val version = "1.4.2"
129130
fun module(name: String) = "org.jetbrains.kotlinx:kotlinx-coroutines-$name:$version"
130131
}
131132

132133
object Logging {
133-
const val version = "1.7.9"
134+
const val version = "2.0.4"
134135
const val kotlinLogging = "io.github.microutils:kotlin-logging:$version"
135136
}
136137
}
137138

138139
object KoTest {
139-
const val version = "4.0.3"
140+
const val version = "4.4.1"
140141

141142
// for kotest framework
142143
const val runner = "io.kotest:kotest-runner-junit5-jvm:$version"
@@ -156,7 +157,7 @@ object Kotlinx {
156157
}
157158

158159
object Ktor {
159-
const val version = "1.3.2"
160+
const val version = "1.5.1"
160161
const val server = "io.ktor:ktor-server:$version"
161162
const val serverNetty = "io.ktor:ktor-server-netty:$version"
162163
const val auth = "io.ktor:ktor-auth:$version"
@@ -168,15 +169,15 @@ object Ktor {
168169
}
169170

170171
object Log4j2 {
171-
const val version = "2.13.1"
172+
const val version = "2.14.0"
172173
const val api = "org.apache.logging.log4j:log4j-api:$version"
173174
const val core = "org.apache.logging.log4j:log4j-core:$version"
174175
const val slf4j = "org.apache.logging.log4j:log4j-slf4j-impl:$version"
175176

176177
fun library(name: String) = "org.apache.logging.log4j:log4j-$name:$version"
177178

178179
object Logstash {
179-
private const val version = "1.0.2"
180+
private const val version = "1.0.5"
180181
const val logstashLayout = "com.vlkan.log4j2:log4j2-logstash-layout:$version"
181182
}
182183
}
@@ -198,7 +199,7 @@ object Moshi {
198199
}
199200

200201
object Mockk {
201-
const val version = "1.10.0"
202+
const val version = "1.10.6"
202203
const val mockk = "io.mockk:mockk:$version"
203204
}
204205

@@ -220,19 +221,19 @@ object Prometheus {
220221
}
221222
}
222223

223-
const val RapidAndRivers = "com.github.navikt:rapids-and-rivers:1.74ae9cb"
224+
const val RapidAndRivers = "com.github.navikt:rapids-and-rivers:1.6d6256d"
224225

225226
object Slf4j {
226227
const val version = "1.7.25"
227228
const val api = "org.slf4j:slf4j-api:$version"
228229
}
229230

230231
object Ktlint {
231-
const val version = "0.37.2"
232+
const val version = "0.38.1"
232233
}
233234

234235
object Spotless {
235-
const val version = "5.1.0"
236+
const val version = "5.10.1"
236237
const val spotless = "com.diffplug.spotless"
237238
}
238239

@@ -242,7 +243,7 @@ object Shadow {
242243
}
243244

244245
object TestContainers {
245-
const val version = "1.15.0-rc2"
246+
const val version = "1.15.1"
246247
const val postgresql = "org.testcontainers:postgresql:$version"
247248
const val kafka = "org.testcontainers:kafka:$version"
248249
}
@@ -257,12 +258,12 @@ object Vault {
257258
}
258259

259260
object Wiremock {
260-
const val version = "2.21.0"
261+
const val version = "2.27.2"
261262
const val standalone = "com.github.tomakehurst:wiremock-standalone:$version"
262263
}
263264

264265
object Graphql {
265-
const val version = "3.1.1"
266+
const val version = "4.0.0-alpha.12"
266267
const val graphql = "com.expediagroup.graphql"
267268
val client = library("client")
268269
fun library(name: String) = "com.expediagroup:graphql-kotlin-$name:$version"

‎dp-inntekt-api/build.gradle.kts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ buildscript {
1212
}
1313

1414
repositories {
15+
mavenCentral()
1516
maven("https://packages.confluent.io/maven/")
1617
}
1718

@@ -20,7 +21,7 @@ application {
2021
mainClassName = "no.nav.dagpenger.inntekt.ApplicationKt"
2122
}
2223

23-
val grpcVersion = "1.29.0"
24+
val grpcVersion = "1.35.0"
2425

2526
dependencies {
2627
implementation(project(":dp-inntekt-grpc"))
@@ -36,6 +37,7 @@ dependencies {
3637
implementation(Micrometer.prometheusRegistry)
3738

3839
implementation(Graphql.client)
40+
implementation(Graphql.library("ktor-client"))
3941
implementation(Ktor.library("client-logging-jvm"))
4042
implementation(Ktor.library("client-apache"))
4143

@@ -90,10 +92,10 @@ dependencies {
9092

9193
testImplementation(kotlin("test"))
9294
testImplementation(Ktor.ktorTest)
95+
testImplementation(Ktor.library("client-mock"))
9396
testImplementation(Junit5.api)
9497
testImplementation(Junit5.params)
9598
testRuntimeOnly(Junit5.engine)
96-
testRuntimeOnly(Junit5.vintageEngine)
9799
testImplementation(Wiremock.standalone)
98100
testImplementation(KoTest.assertions)
99101
testImplementation(KoTest.runner)

‎dp-inntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/Application.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fun main() {
5050
val pdlPersonOppslag = PdlGraphQLRepository(
5151
client = PdlGraphQLClientFactory(
5252
url = config.pdl.url,
53-
oidcProvider = { stsOidcClient.oidcToken().access_token }
53+
oidcProvider = { runBlocking { stsOidcClient.oidcToken().access_token } }
5454
)
5555
)
5656
val enhetsregisterClient = EnhetsregisterClient(

‎dp-inntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/db/PostgresInntektStore.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ internal class PostgresInntektStore(private val dataSource: DataSource) : Inntek
100100
return using(sessionOf(dataSource)) { session ->
101101
session.run(
102102
queryOf(
103-
statement, mapOf("inntektId" to inntektId.id)
103+
statement,
104+
mapOf("inntektId" to inntektId.id)
104105
).map { row ->
105106
row.localDateOrNull("beregningsdato")
106107
}.asSingle

‎dp-inntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/oppslag/enhetsregister/EnhetsregisterClient.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class EnhetsregisterClient(
2323
suspend fun hentEnhet(orgnummer: String): String {
2424
return withContext(Dispatchers.IO) {
2525
try {
26-
httpClient.get<String>("$baseUrl/api/enheter/$orgnummer")
26+
httpClient.get("$baseUrl/api/enheter/$orgnummer")
2727
} catch (e: ClientRequestException) {
2828
when (e.response.status.value) {
2929
404 -> httpClient.get<String>("$baseUrl/api/underenheter/$orgnummer")

‎dp-inntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/oppslag/pdl/PdlGraphQLRepository.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package no.nav.dagpenger.inntekt.oppslag.pdl
22

33
import com.expediagroup.graphql.client.GraphQLClient
4+
import com.expediagroup.graphql.client.ktor.GraphQLKtorClient
45
import com.expediagroup.graphql.types.GraphQLResponse
56
import io.ktor.client.features.defaultRequest
67
import io.ktor.client.features.logging.LogLevel
@@ -21,7 +22,7 @@ private val sikkerlogg = KotlinLogging.logger("tjenestekall")
2122

2223
@KtorExperimentalAPI
2324
class PdlGraphQLRepository constructor(
24-
client: GraphQLClient<*>
25+
client: GraphQLClient
2526
) : PersonOppslag {
2627

2728
private val query = HentPerson(client)
@@ -56,7 +57,7 @@ class PdlGraphQLRepository constructor(
5657
fun PdlGraphQLClientFactory(
5758
url: String,
5859
oidcProvider: () -> String
59-
) = GraphQLClient(url = URL(url)) {
60+
) = GraphQLKtorClient(url = URL(url)) {
6061
install(Logging) {
6162
logger = object : Logger {
6263
override fun log(message: String) = sikkerlogg.info { message }

‎dp-inntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/v1/EnhetsregistrerRoute.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ fun Route.enhetsregisteret(client: EnhetsregisterClient) {
2525
call.respondText(result, ContentType.Application.Json)
2626
} catch (e: Exception) {
2727
when (e) {
28-
is ClientRequestException -> when (e.response.status.value) {
29-
in 400..499 -> call.response.status(e.response.status)
28+
is ClientRequestException -> when (e.response?.status?.value) {
29+
in 400..499 -> call.response.status(e.response!!.status)
3030
} else -> call.response.status(HttpStatusCode.BadGateway)
3131
}
3232
}

‎dp-inntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/v1/UklassifisertInntektRoute.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ fun Route.uklassifisertInntekt(
6969
?.let {
7070
inntektStore.getInntekt(it)
7171
}?.let {
72-
val person = personOppslag.hentPerson(this.aktørId)
73-
val inntektsmottaker = Inntektsmottaker(person?.fødselsnummer, person?.sammensattNavn())
74-
mapToGUIInntekt(it, Opptjeningsperiode(this.beregningsDato), inntektsmottaker)
75-
}?.let {
76-
call.respond(HttpStatusCode.OK, it)
77-
} ?: throw InntektNotFoundException("Inntekt with for $this not found.")
72+
val person = personOppslag.hentPerson(this.aktørId)
73+
val inntektsmottaker = Inntektsmottaker(person?.fødselsnummer, person?.sammensattNavn())
74+
mapToGUIInntekt(it, Opptjeningsperiode(this.beregningsDato), inntektsmottaker)
75+
}?.let {
76+
call.respond(HttpStatusCode.OK, it)
77+
} ?: throw InntektNotFoundException("Inntekt with for $this not found.")
7878
}
7979
}
8080
post {

‎dp-inntekt-api/src/test/kotlin/no/nav/dagpenger/inntekt/DummyConfigs.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ private val mockedConfigs = listOf(
1313
"jwks.issuer"
1414
)
1515

16-
val dummyConfigs = mockedConfigs.associate { it to "test" }
16+
val dummyConfigs = mockedConfigs.associateWith { "test" }
1717

1818
fun withProps(props: Map<String, String>, test: () -> Unit) {
1919
for ((k, v) in props) {

‎dp-inntekt-api/src/test/kotlin/no/nav/dagpenger/inntekt/db/PostgresTest.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import io.kotest.matchers.shouldBe
66
import io.kotest.matchers.shouldNotBe
77
import io.kotest.property.Arb
88
import io.kotest.property.arbitrary.arb
9-
import io.kotest.property.arbitrary.localDate
9+
import io.kotest.property.arbitrary.localDateTime
1010
import io.kotest.property.arbitrary.next
1111
import io.kotest.property.arbitrary.string
1212
import io.kotest.property.checkAll
@@ -23,6 +23,7 @@ import org.junit.jupiter.api.Test
2323
import java.time.LocalDate
2424
import kotlin.test.assertEquals
2525
import kotlin.test.assertFalse
26+
import kotlin.test.assertNotEquals
2627
import kotlin.test.assertNotNull
2728
import kotlin.test.assertNull
2829
import kotlin.test.assertTrue
@@ -130,7 +131,7 @@ internal class PostgresInntektStoreTest {
130131
assertSoftly {
131132
getInntektId(aktør1) shouldNotBe null
132133
getInntektId(aktør2) shouldNotBe null
133-
getInntektId(aktør2) shouldNotBe getInntektId(aktør1)
134+
assertNotEquals(getInntektId(aktør2), getInntektId(aktør1))
134135
getInntektId(Inntektparametre(aktørId = aktørId2, vedtakId = "464664", beregningsdato = LocalDate.now())) shouldBe null
135136
getInntektId(Inntektparametre(aktørId = "3535535335", vedtakId = "1234", beregningsdato = LocalDate.now())) shouldBe null
136137
}
@@ -362,7 +363,7 @@ internal class InntektsStorePropertyTest : StringSpec() {
362363
aktørId = stringArb.next(it),
363364
vedtakId = stringArb.next(it),
364365
fødselnummer = stringArb.next(it),
365-
beregningsdato = Arb.localDate(minYear = 2010, maxYear = LocalDate.now().year).next(it)
366+
beregningsdato = Arb.localDateTime(minYear = 2010, maxYear = LocalDate.now().year).next(it).toLocalDate()
366367
),
367368
inntekt = InntektkomponentResponse(
368369
arbeidsInntektMaaned = emptyList(),

0 commit comments

Comments
 (0)