From 541f13b09fd92af7e81bffa49cda69f042278ca7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 15:52:45 +0100 Subject: [PATCH] Bump the all-dependencies group across 1 directory with 12 updates (#557) * Bump the all-dependencies group across 1 directory with 12 updates Bumps the all-dependencies group with 12 updates in the / directory: | Package | From | To | | --- | --- | --- | | [org.springframework.boot:spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) | `3.3.4` | `3.3.5` | | [no.nav.familie.kontrakter:felles](https://github.com/navikt/familie-kontrakter) | `3.0_20241018104853_fa92410` | `3.0_20241102131210_d65efd1` | | [no.nav.familie.kontrakter:enslig-forsorger](https://github.com/navikt/familie-kontrakter) | `3.0_20241018104853_fa92410` | `3.0_20241102131210_d65efd1` | | [com.expediagroup:graphql-kotlin-spring-client](https://github.com/ExpediaGroup/graphql-kotlin) | `8.2.0` | `8.2.1` | | [no.nav.security:token-client-core](https://github.com/navikt/token-support) | `5.0.5` | `5.0.10` | | [no.nav.security:token-client-spring](https://github.com/navikt/token-support) | `5.0.5` | `5.0.10` | | [no.nav.security:token-validation-spring-test](https://github.com/navikt/token-support) | `5.0.5` | `5.0.10` | | org.flywaydb:flyway-database-postgresql | `10.20.0` | `10.21.0` | | [org.testcontainers:postgresql](https://github.com/testcontainers/testcontainers-java) | `1.20.2` | `1.20.3` | | [com.pinterest.ktlint:ktlint-cli](https://github.com/pinterest/ktlint) | `1.3.1` | `1.4.1` | | [com.expediagroup:graphql-kotlin-maven-plugin](https://github.com/ExpediaGroup/graphql-kotlin) | `8.2.0` | `8.2.1` | | [org.codehaus.mojo:exec-maven-plugin](https://github.com/mojohaus/exec-maven-plugin) | `3.4.1` | `3.5.0` | Updates `org.springframework.boot:spring-boot-starter-parent` from 3.3.4 to 3.3.5 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.4...v3.3.5) Updates `no.nav.familie.kontrakter:felles` from 3.0_20241018104853_fa92410 to 3.0_20241102131210_d65efd1 - [Commits](https://github.com/navikt/familie-kontrakter/commits) Updates `no.nav.familie.kontrakter:enslig-forsorger` from 3.0_20241018104853_fa92410 to 3.0_20241102131210_d65efd1 - [Commits](https://github.com/navikt/familie-kontrakter/commits) Updates `no.nav.familie.kontrakter:enslig-forsorger` from 3.0_20241018104853_fa92410 to 3.0_20241102131210_d65efd1 - [Commits](https://github.com/navikt/familie-kontrakter/commits) Updates `com.expediagroup:graphql-kotlin-spring-client` from 8.2.0 to 8.2.1 - [Release notes](https://github.com/ExpediaGroup/graphql-kotlin/releases) - [Commits](https://github.com/ExpediaGroup/graphql-kotlin/compare/8.2.0...8.2.1) Updates `no.nav.security:token-client-core` from 5.0.5 to 5.0.10 - [Release notes](https://github.com/navikt/token-support/releases) - [Commits](https://github.com/navikt/token-support/compare/5.0.5...5.0.10) Updates `no.nav.security:token-client-spring` from 5.0.5 to 5.0.10 - [Release notes](https://github.com/navikt/token-support/releases) - [Commits](https://github.com/navikt/token-support/compare/5.0.5...5.0.10) Updates `no.nav.security:token-validation-spring-test` from 5.0.5 to 5.0.10 - [Release notes](https://github.com/navikt/token-support/releases) - [Commits](https://github.com/navikt/token-support/compare/5.0.5...5.0.10) Updates `no.nav.security:token-client-spring` from 5.0.5 to 5.0.10 - [Release notes](https://github.com/navikt/token-support/releases) - [Commits](https://github.com/navikt/token-support/compare/5.0.5...5.0.10) Updates `org.flywaydb:flyway-database-postgresql` from 10.20.0 to 10.21.0 Updates `no.nav.security:token-validation-spring-test` from 5.0.5 to 5.0.10 - [Release notes](https://github.com/navikt/token-support/releases) - [Commits](https://github.com/navikt/token-support/compare/5.0.5...5.0.10) Updates `org.testcontainers:postgresql` from 1.20.2 to 1.20.3 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.20.2...1.20.3) Updates `com.pinterest.ktlint:ktlint-cli` from 1.3.1 to 1.4.1 - [Release notes](https://github.com/pinterest/ktlint/releases) - [Changelog](https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md) - [Commits](https://github.com/pinterest/ktlint/compare/1.3.1...1.4.1) Updates `com.expediagroup:graphql-kotlin-maven-plugin` from 8.2.0 to 8.2.1 - [Release notes](https://github.com/ExpediaGroup/graphql-kotlin/releases) - [Commits](https://github.com/ExpediaGroup/graphql-kotlin/compare/8.2.0...8.2.1) Updates `org.codehaus.mojo:exec-maven-plugin` from 3.4.1 to 3.5.0 - [Release notes](https://github.com/mojohaus/exec-maven-plugin/releases) - [Commits](https://github.com/mojohaus/exec-maven-plugin/compare/3.4.1...3.5.0) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-parent dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: no.nav.familie.kontrakter:felles dependency-type: direct:production dependency-group: all-dependencies - dependency-name: no.nav.familie.kontrakter:enslig-forsorger dependency-type: direct:production dependency-group: all-dependencies - dependency-name: no.nav.familie.kontrakter:enslig-forsorger dependency-type: direct:production dependency-group: all-dependencies - dependency-name: com.expediagroup:graphql-kotlin-spring-client dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: no.nav.security:token-client-core dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: no.nav.security:token-client-spring dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: no.nav.security:token-validation-spring-test dependency-type: direct:development update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: no.nav.security:token-client-spring dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: org.flywaydb:flyway-database-postgresql dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-dependencies - dependency-name: no.nav.security:token-validation-spring-test dependency-type: direct:development update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: org.testcontainers:postgresql dependency-type: direct:development update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: com.pinterest.ktlint:ktlint-cli dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-dependencies - dependency-name: com.expediagroup:graphql-kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: org.codehaus.mojo:exec-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-dependencies ... Signed-off-by: dependabot[bot] * Linterendringer --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ole Christian Kvernberg --- pom.xml | 18 +++++++++--------- .../handler/PersonhendelseHandler.kt | 3 +-- .../handler/PersonhendelseService.kt | 9 +++------ .../inntekt/InntektsendringerService.kt | 3 +-- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index a7476845..4bb7ddcd 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.4 + 3.3.5 no.nav.familie.ef @@ -31,18 +31,18 @@ 2.0.21 7.7.1 1.12.0 - 8.2.0 - 8.2.0 + 8.2.1 + 8.2.1 3.5.0 - 3.4.1 - 3.0_20241018104853_fa92410 + 3.5.0 + 3.0_20241102131210_d65efd1 2.0_20240806120744_a042aa1 3.20240913110742_adb42f8 - 5.0.5 + 5.0.10 4.9.1 2.35.2 1.13.13 - 1.20.2 + 1.20.3 no.nav.familie.ef.personhendelse.Application @@ -159,7 +159,7 @@ org.flywaydb flyway-database-postgresql - 10.20.0 + 10.21.0 runtime @@ -374,7 +374,7 @@ com.pinterest.ktlint ktlint-cli - 1.3.1 + 1.4.1 diff --git a/src/main/kotlin/no/nav/familie/ef/personhendelse/handler/PersonhendelseHandler.kt b/src/main/kotlin/no/nav/familie/ef/personhendelse/handler/PersonhendelseHandler.kt index b8ebfd6e..75d8e679 100644 --- a/src/main/kotlin/no/nav/familie/ef/personhendelse/handler/PersonhendelseHandler.kt +++ b/src/main/kotlin/no/nav/familie/ef/personhendelse/handler/PersonhendelseHandler.kt @@ -25,6 +25,5 @@ interface PersonhendelseHandler { * Eks når vi får en sivilstandshendelse returneres [["a1", "a2"]] * Mens når vi skal håndtere dødsfall returneres identer til personen og eventuellt forelder, [[f1], [f2], [b1]] */ - fun personidenterPerPersonSomSkalKontrolleres(personhendelse: Personhendelse): List> = - listOf(personhendelse.identerUtenAktørId()) + fun personidenterPerPersonSomSkalKontrolleres(personhendelse: Personhendelse): List> = listOf(personhendelse.identerUtenAktørId()) } diff --git a/src/main/kotlin/no/nav/familie/ef/personhendelse/handler/PersonhendelseService.kt b/src/main/kotlin/no/nav/familie/ef/personhendelse/handler/PersonhendelseService.kt index 33df624f..458a8e76 100644 --- a/src/main/kotlin/no/nav/familie/ef/personhendelse/handler/PersonhendelseService.kt +++ b/src/main/kotlin/no/nav/familie/ef/personhendelse/handler/PersonhendelseService.kt @@ -240,8 +240,7 @@ class PersonhendelseService( ) } -private fun Personhendelse.ferdigstiltBeskrivelse(personhendelseType: PersonhendelseType) = - "En hendelse av typen ${this.endringstype.name} har oppstått for en ferdigstilt oppgave med hendelsestype ${personhendelseType.name}" +private fun Personhendelse.ferdigstiltBeskrivelse(personhendelseType: PersonhendelseType) = "En hendelse av typen ${this.endringstype.name} har oppstått for en ferdigstilt oppgave med hendelsestype ${personhendelseType.name}" private fun Personhendelse.finnesIngenHendelseBeskrivelse() = "Det har oppstått en personhendelse som det ikke finnes noen tidligere hendelse eller oppgave for. " + @@ -253,8 +252,6 @@ private fun Oppgave.opphørtEllerAnnullertBeskrivelse() = "\n\nDenne oppgaven ha private fun Oppgave.korrigertBeskrivelse() = "\n\nDenne oppgaven har blitt korrigert." -private fun Personhendelse.skalOpphøreEllerKorrigeres() = - listOf(Endringstype.ANNULLERT, Endringstype.KORRIGERT, Endringstype.OPPHOERT).contains(this.endringstype) +private fun Personhendelse.skalOpphøreEllerKorrigeres() = listOf(Endringstype.ANNULLERT, Endringstype.KORRIGERT, Endringstype.OPPHOERT).contains(this.endringstype) -private fun Personhendelse.erIkkeOpphørAvSivilstand() = - !(this.opplysningstype == PersonhendelseType.SIVILSTAND.hendelsetype && this.endringstype == Endringstype.OPPHOERT) +private fun Personhendelse.erIkkeOpphørAvSivilstand() = !(this.opplysningstype == PersonhendelseType.SIVILSTAND.hendelsetype && this.endringstype == Endringstype.OPPHOERT) diff --git a/src/main/kotlin/no/nav/familie/ef/personhendelse/inntekt/InntektsendringerService.kt b/src/main/kotlin/no/nav/familie/ef/personhendelse/inntekt/InntektsendringerService.kt index 33861f34..0488b4ee 100644 --- a/src/main/kotlin/no/nav/familie/ef/personhendelse/inntekt/InntektsendringerService.kt +++ b/src/main/kotlin/no/nav/familie/ef/personhendelse/inntekt/InntektsendringerService.kt @@ -119,8 +119,7 @@ data class Inntektsendring( val toMånederTilbake: BeregningResultat, val forrigeMåned: BeregningResultat, ) { - fun harEndretInntekt() = - treMånederTilbake.prosent >= 10 && toMånederTilbake.prosent >= 10 && forrigeMåned.prosent >= 10 + fun harEndretInntekt() = treMånederTilbake.prosent >= 10 && toMånederTilbake.prosent >= 10 && forrigeMåned.prosent >= 10 } data class BeregningResultat(