Skip to content

Commit d5ce599

Browse files
geiralundgeiralund
authored
Merge pull request #108 from navikt/task/oppdatere-ktlint
Oppdaterer klint til 0.37.2 og oppdaterte kildekode med nye regler. Oppdaterte i tillegge kotlin til 1.3.72 ( navikt/dagpenger#541 )
2 parents fc6b98b + 66d7dd7 commit d5ce599

File tree

50 files changed

+386
-298
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+386
-298
lines changed

‎build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ allprojects {
4545
spotless {
4646
kotlin {
4747
targetExclude("**/generated/**") // ignore generated gRpc stuff
48-
ktlint()
48+
ktlint(Ktlint.version)
4949
}
5050
kotlinGradle {
5151
target("*.gradle.kts", "buildSrc/**/*.kt*")
52-
ktlint()
52+
ktlint(Ktlint.version)
5353
}
5454
}
5555

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ object Dagpenger {
3636

3737
object Client {
3838
const val metrics = "com.github.navikt.dp-biblioteker:ktor-client-metrics:$version"
39+
const val authBearer = "com.github.navikt.dp-biblioteker:ktor-client-auth-bearer:$version"
3940
}
4041
}
4142

@@ -120,11 +121,11 @@ object Konfig {
120121
}
121122

122123
object Kotlin {
123-
const val version = "1.3.71"
124+
const val version = "1.3.72"
124125
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib:$version"
125126

126127
object Coroutines {
127-
const val version = "1.3.5"
128+
const val version = "1.3.7"
128129
fun module(name: String) = "org.jetbrains.kotlinx:kotlinx-coroutines-$name:$version"
129130
}
130131

@@ -226,9 +227,13 @@ object Slf4j {
226227
const val api = "org.slf4j:slf4j-api:$version"
227228
}
228229

230+
object Ktlint {
231+
const val version = "0.37.2"
232+
}
233+
229234
object Spotless {
230-
const val version = "3.28.0"
231-
const val spotless = "com.diffplug.gradle.spotless"
235+
const val version = "5.1.0"
236+
const val spotless = "com.diffplug.spotless"
232237
}
233238

234239
object Shadow {

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

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ import io.ktor.server.engine.embeddedServer
55
import io.ktor.server.engine.stop
66
import io.ktor.server.netty.Netty
77
import io.prometheus.client.hotspot.DefaultExports
8-
import java.net.URL
9-
import java.util.concurrent.TimeUnit
10-
import kotlin.concurrent.fixedRateTimer
118
import kotlinx.coroutines.launch
129
import kotlinx.coroutines.runBlocking
1310
import mu.KotlinLogging
@@ -21,6 +18,9 @@ import no.nav.dagpenger.inntekt.subsumsjonbrukt.KafkaSubsumsjonBruktDataConsumer
2118
import no.nav.dagpenger.inntekt.subsumsjonbrukt.Vaktmester
2219
import no.nav.dagpenger.ktor.auth.ApiKeyVerifier
2320
import no.nav.dagpenger.oidc.StsOidcClient
21+
import java.net.URL
22+
import java.util.concurrent.TimeUnit
23+
import kotlin.concurrent.fixedRateTimer
2424

2525
private val LOGGER = KotlinLogging.logger {}
2626
private val config = Configuration()
@@ -57,9 +57,11 @@ fun main() {
5757
KafkaSubsumsjonBruktDataConsumer(config, postgresInntektStore).apply {
5858
listen()
5959
}.also {
60-
Runtime.getRuntime().addShutdownHook(Thread {
61-
it.stop()
62-
})
60+
Runtime.getRuntime().addShutdownHook(
61+
Thread {
62+
it.stop()
63+
}
64+
)
6365
}
6466

6567
// Provides a gRPC server for getting inntekt
@@ -89,9 +91,11 @@ fun main() {
8991
)
9092
)
9193
}.start().also {
92-
Runtime.getRuntime().addShutdownHook(Thread {
93-
it.stop(5, 60, TimeUnit.SECONDS)
94-
})
94+
Runtime.getRuntime().addShutdownHook(
95+
Thread {
96+
it.stop(5, 60, TimeUnit.SECONDS)
97+
}
98+
)
9599
}
96100

97101
// Cleans up unused inntekt on a regular interbal
@@ -104,7 +108,8 @@ fun main() {
104108
LOGGER.info { "Vaktmesteren rydder.. SLÅTT AVV" }
105109
// it.rydd()
106110
LOGGER.info { "Vaktmesteren er ferdig.. for denne gang" }
107-
})
111+
}
112+
)
108113
}
109114
}
110115
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ import io.micrometer.core.instrument.Clock
2929
import io.micrometer.prometheus.PrometheusConfig
3030
import io.micrometer.prometheus.PrometheusMeterRegistry
3131
import io.prometheus.client.CollectorRegistry
32-
import java.net.URI
33-
import java.util.concurrent.atomic.AtomicLong
3432
import mu.KotlinLogging
3533
import no.nav.dagpenger.inntekt.db.IllegalInntektIdException
3634
import no.nav.dagpenger.inntekt.db.InntektNotFoundException
@@ -46,6 +44,8 @@ import no.nav.dagpenger.ktor.auth.ApiKeyVerifier
4644
import no.nav.dagpenger.ktor.auth.ApiPrincipal
4745
import no.nav.dagpenger.ktor.auth.apiKeyAuth
4846
import org.slf4j.event.Level
47+
import java.net.URI
48+
import java.util.concurrent.atomic.AtomicLong
4949

5050
private val LOGGER = KotlinLogging.logger {}
5151
private val sikkerLogg = KotlinLogging.logger("tjenestekall")
@@ -126,7 +126,7 @@ fun Application.inntektApi(
126126
exception<InntektskomponentenHttpClientException> { cause ->
127127
val statusCode =
128128
if (HttpStatusCode.fromValue(cause.status)
129-
.isSuccess()
129+
.isSuccess()
130130
) HttpStatusCode.InternalServerError else HttpStatusCode.fromValue(
131131
cause.status
132132
)

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ import com.squareup.moshi.ToJson
1010
import com.squareup.moshi.Types
1111
import com.squareup.moshi.adapters.EnumJsonAdapter
1212
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
13+
import no.nav.dagpenger.inntekt.inntektskomponenten.v1.SpesielleInntjeningsforhold
1314
import java.math.BigDecimal
1415
import java.net.URI
1516
import java.time.LocalDate
1617
import java.time.LocalDateTime
1718
import java.time.YearMonth
1819
import java.time.format.DateTimeFormatter
19-
import no.nav.dagpenger.inntekt.inntektskomponenten.v1.SpesielleInntjeningsforhold
2020

2121
val moshiInstance: Moshi = Moshi.Builder()
2222
.add(YearMonthJsonAdapter())
@@ -25,15 +25,18 @@ val moshiInstance: Moshi = Moshi.Builder()
2525
.add(KotlinJsonAdapterFactory())
2626
.add(BigDecimalJsonAdapter())
2727
.add(URIJsonAdapter())
28-
.add(SpesielleInntjeningsforhold::class.java,
29-
EnumJsonAdapter.create(SpesielleInntjeningsforhold::class.java).withUnknownFallback(SpesielleInntjeningsforhold.UNKNOWN).nullSafe())
28+
.add(
29+
SpesielleInntjeningsforhold::class.java,
30+
EnumJsonAdapter.create(SpesielleInntjeningsforhold::class.java).withUnknownFallback(SpesielleInntjeningsforhold.UNKNOWN).nullSafe()
31+
)
3032
.build()!!
3133

3234
val inntektKlassifiseringsKoderJsonAdapter: JsonAdapter<Set<String>> = moshiInstance.adapter<Set<String>>(
3335
Types.newParameterizedType(
3436
Set::class.java,
3537
String::class.java
36-
)).nullSafe()
38+
)
39+
).nullSafe()
3740

3841
class YearMonthJsonAdapter {
3942
@ToJson

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package no.nav.dagpenger.inntekt.db
22

33
import de.huxhorn.sulky.ulid.ULID
4+
import no.nav.dagpenger.events.inntekt.v1.SpesifisertInntekt
5+
import no.nav.dagpenger.inntekt.inntektskomponenten.v1.InntektkomponentResponse
6+
import no.nav.dagpenger.inntekt.opptjeningsperiode.Opptjeningsperiode
47
import java.time.LocalDate
58
import java.time.LocalDateTime
69
import java.time.ZoneOffset
710
import java.time.ZonedDateTime
8-
import no.nav.dagpenger.events.inntekt.v1.SpesifisertInntekt
9-
import no.nav.dagpenger.inntekt.inntektskomponenten.v1.InntektkomponentResponse
10-
import no.nav.dagpenger.inntekt.opptjeningsperiode.Opptjeningsperiode
1111

1212
interface InntektStore {
1313
fun getInntekt(inntektId: InntektId): StoredInntekt

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,28 @@ fun migrate(config: Configuration): Int {
2626
}
2727

2828
private fun hikariDataSourceWithVaultIntegration(config: Configuration, role: Role = Role.USER) =
29-
HikariCPVaultUtil.createHikariDataSourceWithVaultIntegration(
30-
hikariConfigFrom(config),
31-
config.vault.mountPath,
32-
"${config.database.name}-$role"
33-
)
29+
HikariCPVaultUtil.createHikariDataSourceWithVaultIntegration(
30+
hikariConfigFrom(config),
31+
config.vault.mountPath,
32+
"${config.database.name}-$role"
33+
)
3434

3535
fun dataSourceFrom(config: Configuration): HikariDataSource = when (config.application.profile) {
3636
Profile.LOCAL -> HikariDataSource(hikariConfigFrom(config))
3737
else -> hikariDataSourceWithVaultIntegration(config)
3838
}
3939

4040
fun hikariConfigFrom(config: Configuration) =
41-
HikariConfig().apply {
42-
jdbcUrl = "jdbc:postgresql://${config.database.host}:${config.database.port}/${config.database.name}"
43-
maximumPoolSize = 2
44-
minimumIdle = 0
45-
idleTimeout = 10001
46-
connectionTimeout = 1000
47-
maxLifetime = 30001
48-
config.database.user?.let { username = it }
49-
config.database.password?.let { password = it }
50-
}
41+
HikariConfig().apply {
42+
jdbcUrl = "jdbc:postgresql://${config.database.host}:${config.database.port}/${config.database.name}"
43+
maximumPoolSize = 2
44+
minimumIdle = 0
45+
idleTimeout = 10001
46+
connectionTimeout = 1000
47+
maxLifetime = 30001
48+
config.database.user?.let { username = it }
49+
config.database.password?.let { password = it }
50+
}
5151

5252
fun migrate(dataSource: HikariDataSource, initSql: String = "", locations: List<String> = listOf("db/migration")): Int =
5353
Flyway.configure().locations(*locations.toTypedArray()).dataSource(dataSource).initSql(initSql).load().migrate()

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

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ package no.nav.dagpenger.inntekt.db
33
import com.squareup.moshi.JsonAdapter
44
import de.huxhorn.sulky.ulid.ULID
55
import io.prometheus.client.Summary
6-
import java.time.LocalDate
7-
import java.time.ZonedDateTime
8-
import javax.sql.DataSource
96
import kotliquery.queryOf
107
import kotliquery.sessionOf
118
import kotliquery.using
@@ -20,6 +17,9 @@ import no.nav.dagpenger.inntekt.opptjeningsperiode.Opptjeningsperiode
2017
import org.intellij.lang.annotations.Language
2118
import org.postgresql.util.PGobject
2219
import org.postgresql.util.PSQLException
20+
import java.time.LocalDate
21+
import java.time.ZonedDateTime
22+
import javax.sql.DataSource
2323

2424
internal class PostgresInntektStore(private val dataSource: DataSource) : InntektStore, HealthCheck {
2525

@@ -36,7 +36,8 @@ internal class PostgresInntektStore(private val dataSource: DataSource) : Inntek
3636

3737
override fun getManueltRedigert(inntektId: InntektId): ManueltRedigert? {
3838
@Language("sql")
39-
val statement = """
39+
val statement =
40+
"""
4041
SELECT redigert_av
4142
FROM inntekt_V1_manuelt_redigert
4243
WHERE inntekt_id = ?
@@ -58,7 +59,8 @@ internal class PostgresInntektStore(private val dataSource: DataSource) : Inntek
5859
override fun getInntektId(inntektparametre: Inntektparametre): InntektId? {
5960
try {
6061
@Language("sql")
61-
val statement: String = """
62+
val statement: String =
63+
"""
6264
SELECT inntektId
6365
FROM inntekt_V1_person_mapping
6466
WHERE aktørId = ?
@@ -88,15 +90,17 @@ internal class PostgresInntektStore(private val dataSource: DataSource) : Inntek
8890

8991
override fun getBeregningsdato(inntektId: InntektId): LocalDate {
9092
@Language("sql")
91-
val statement = """SELECT coalesce(
93+
val statement =
94+
"""SELECT coalesce(
9295
(SELECT beregningsdato FROM inntekt_V1_person_mapping WHERE inntektId = :inntektId),
9396
(SELECT beregningsdato FROM temp_inntekt_V1_person_mapping WHERE inntektId = :inntektId)
9497
) as beregningsdato
9598
""".trimMargin()
9699

97100
return using(sessionOf(dataSource)) { session ->
98101
session.run(
99-
queryOf(statement, mapOf("inntektId" to inntektId.id)
102+
queryOf(
103+
statement, mapOf("inntektId" to inntektId.id)
100104
).map { row ->
101105
row.localDateOrNull("beregningsdato")
102106
}.asSingle
@@ -118,19 +122,21 @@ internal class PostgresInntektStore(private val dataSource: DataSource) : Inntek
118122
timestamp = row.zonedDateTime("timestamp").toLocalDateTime()
119123
)
120124
}
121-
.asSingle)
125+
.asSingle
126+
)
122127
?: throw InntektNotFoundException("Inntekt with id $inntektId not found.")
123128
}
124129
}
125130

126131
override fun getSpesifisertInntekt(inntektId: InntektId): SpesifisertInntekt {
127132
@Language("sql")
128-
val statement = """
133+
val statement =
134+
"""
129135
SELECT inntekt.id, inntekt.inntekt, inntekt.manuelt_redigert, inntekt.timestamp, mapping.beregningsdato
130136
from inntekt_V1 inntekt
131137
inner join inntekt_V1_person_mapping mapping on inntekt.id = mapping.inntektid
132138
where inntekt.id = ?"""
133-
.trimIndent()
139+
.trimIndent()
134140

135141
val stored = using(sessionOf(dataSource)) { session ->
136142
session.run(
@@ -145,7 +151,8 @@ internal class PostgresInntektStore(private val dataSource: DataSource) : Inntek
145151
timestamp = row.zonedDateTime("timestamp").toLocalDateTime()
146152
) to row.localDate("beregningsdato")
147153
}
148-
.asSingle)
154+
.asSingle
155+
)
149156
?: throw InntektNotFoundException("Inntekt with id $inntektId not found.")
150157
}
151158
return mapToSpesifisertInntekt(stored.first, Opptjeningsperiode(stored.second).sisteAvsluttendeKalenderMåned)
@@ -194,10 +201,11 @@ internal class PostgresInntektStore(private val dataSource: DataSource) : Inntek
194201
command.manueltRedigert?.let {
195202
tx.run(
196203
queryOf(
197-
"INSERT INTO inntekt_V1_manuelt_redigert VALUES(:id,:redigert)", mapOf(
198-
"id" to inntektId.id,
199-
"redigert" to it.redigertAv
200-
)
204+
"INSERT INTO inntekt_V1_manuelt_redigert VALUES(:id,:redigert)",
205+
mapOf(
206+
"id" to inntektId.id,
207+
"redigert" to it.redigertAv
208+
)
201209
).asUpdate
202210
)
203211
}

0 commit comments

Comments
 (0)