From 9b2ffeb23a1f12153fb148d03f04d8c6646ab904 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20N=C3=A6rland?= Date: Mon, 27 Nov 2023 16:01:40 +0100 Subject: [PATCH] =?UTF-8?q?Oppgradert=20rammeverk=20til=20spring=20boot=20?= =?UTF-8?q?3=20og=20gjort=20n=C3=B8dvendige=20tilpasninger=20for=20at=20ko?= =?UTF-8?q?den=20skal=20kompilere=20og=20kj=C3=B8re=20uten=20feil?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 17 +- .../ba/infotrygd/config/ValidateConfig.kt | 2 +- .../model/converters/AbstractCharConverter.kt | 4 +- .../AbstractNavLocalDateConverter.kt | 2 +- .../model/converters/FoedselNrConverter.kt | 2 +- .../model/converters/KodeConverter.kt | 4 +- .../model/converters/NavCharDateConverter.kt | 4 +- .../model/converters/NavLocalDateConverter.kt | 2 +- .../NavReversedLocalDateConverter.kt | 2 +- .../converters/ReversedFoedselNrConverter.kt | 2 +- .../ReversedLongFoedselNrConverter.kt | 2 +- .../model/converters/StatusLopenrConverter.kt | 2 +- .../ba/infotrygd/model/db2/Beslutning.kt | 2 +- .../ba/infotrygd/model/db2/Delytelse.kt | 10 +- .../ba/infotrygd/model/db2/DelytelseId.kt | 4 +- .../familie/ba/infotrygd/model/db2/Endring.kt | 2 +- .../infotrygd/model/db2/L\303\270peNrFnr.kt" | 8 +- .../infotrygd/model/db2/St\303\270nadDb2.kt" | 2 +- .../model/db2/St\303\270nadsklasse.kt" | 2 +- .../ba/infotrygd/model/db2/Utbetaling.kt | 2 +- .../familie/ba/infotrygd/model/db2/Vedtak.kt | 2 +- .../familie/ba/infotrygd/model/dl1/Barn.kt | 2 +- .../ba/infotrygd/model/dl1/Hendelse.kt | 10 +- .../familie/ba/infotrygd/model/dl1/Person.kt | 2 +- .../nav/familie/ba/infotrygd/model/dl1/Sak.kt | 2 +- .../familie/ba/infotrygd/model/dl1/Status.kt | 2 +- .../ba/infotrygd/model/dl1/St\303\270nad.kt" | 10 +- .../rest/controller/TableController.kt | 2 +- .../infotrygd/rest/filter/AccessLogFilter.kt | 12 +- src/main/resources/schema-h2.sql | 242 +++++++++--------- .../no/nav/familie/ba/infotrygd/MainTest.kt | 2 +- .../controller/BarnetrygdControllerTest.kt | 6 +- .../familie/ba/infotrygd/testutil/DemoData.kt | 2 +- src/test/resources/application-test.yml | 10 +- 34 files changed, 193 insertions(+), 190 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 0413d0d0..458c1b80 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,22 +7,22 @@ val mockkVersion = "1.13.8" val wireMockVersion = "2.19.0" val filformatVersion = "1.2019.06.26-14.50-746e7610cb12" val micrometerRegistryVersion = "1.1.2" -val tokenValidationVersion = "2.1.7" +val tokenValidationVersion = "3.0.4" val jacksonVersion = "2.9.9" -val springdocVersion = "1.6.15" +val springdocVersion = "2.2.0" val navFoedselsnummerVersion = "1.0-SNAPSHOT.6" val skattKontraktVersjon = "2.0_20230214104704_706e9c0" -val fellesVersjon = "1.20230116145510_2afcc20" -val kontrakterVersjon = "2.0_20230313140330_0086324" +val fellesVersjon = "2.20231023162434_fa320ce" +val kontrakterVersjon = "3.0_20231109091547_fd2cae7" val coroutinesVersion = "1.6.4" -val okhttp3Version = "4.9.3" +val okhttp3Version = "5.0.0-alpha.11" val mainClass = "no.nav.familie.ba.infotrygd.Main" plugins { val kotlinVersion = "1.8.21" - val springBootVersion = "2.6.6" + val springBootVersion = "3.0.5" id("org.springframework.boot") version springBootVersion id("io.spring.dependency-management") version "1.1.0" kotlin("jvm") version kotlinVersion @@ -43,6 +43,7 @@ configurations { repositories { mavenCentral() + mavenLocal() maven { name = "Github" url = uri("https://maven.pkg.github.com/navikt/nav-foedselsnummer") @@ -86,8 +87,8 @@ dependencies { implementation("javax.inject:javax.inject:1") implementation("org.jetbrains.kotlin:kotlin-reflect") implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") - implementation("org.springdoc:springdoc-openapi-ui:$springdocVersion") - implementation("org.springdoc:springdoc-openapi-kotlin:$springdocVersion") + implementation("org.springdoc:springdoc-openapi-starter-common:$springdocVersion") + implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:$springdocVersion") implementation("net.logstash.logback:logstash-logback-encoder:7.3") implementation("no.nav.familie.eksterne.kontrakter:skatteetaten:$skattKontraktVersjon") implementation("org.springframework.boot:spring-boot-starter-jdbc") diff --git a/src/main/kotlin/no/nav/familie/ba/infotrygd/config/ValidateConfig.kt b/src/main/kotlin/no/nav/familie/ba/infotrygd/config/ValidateConfig.kt index 8e40de93..7e51bc48 100644 --- a/src/main/kotlin/no/nav/familie/ba/infotrygd/config/ValidateConfig.kt +++ b/src/main/kotlin/no/nav/familie/ba/infotrygd/config/ValidateConfig.kt @@ -3,7 +3,7 @@ package no.nav.familie.ba.infotrygd.config import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.stereotype.Component import org.springframework.validation.annotation.Validated -import javax.validation.constraints.NotEmpty +import jakarta.validation.constraints.NotEmpty @Validated @Component diff --git a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/AbstractCharConverter.kt b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/AbstractCharConverter.kt index a87d67b4..a1e9be01 100644 --- a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/AbstractCharConverter.kt +++ b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/AbstractCharConverter.kt @@ -1,7 +1,7 @@ package no.nav.familie.ba.infotrygd.model.converters -import javax.persistence.AttributeConverter -import javax.persistence.Converter +import jakarta.persistence.AttributeConverter +import jakarta.persistence.Converter abstract class AbstractCharConverter(private val size: Int) : AttributeConverter { override fun convertToDatabaseColumn(attribute: String?): String? { diff --git a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/AbstractNavLocalDateConverter.kt b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/AbstractNavLocalDateConverter.kt index bac5742b..d16bec75 100644 --- a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/AbstractNavLocalDateConverter.kt +++ b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/AbstractNavLocalDateConverter.kt @@ -3,7 +3,7 @@ package no.nav.familie.ba.infotrygd.model.converters import org.slf4j.LoggerFactory import java.time.LocalDate import java.time.format.DateTimeFormatter -import javax.persistence.AttributeConverter +import jakarta.persistence.AttributeConverter open class AbstractNavLocalDateConverter(datePattern: String) : AttributeConverter { private val logger = LoggerFactory.getLogger(javaClass) diff --git a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/FoedselNrConverter.kt b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/FoedselNrConverter.kt index 252b3c65..44714e45 100644 --- a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/FoedselNrConverter.kt +++ b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/FoedselNrConverter.kt @@ -1,7 +1,7 @@ package no.nav.familie.ba.infotrygd.model.converters import no.nav.commons.foedselsnummer.FoedselsNr -import javax.persistence.AttributeConverter +import jakarta.persistence.AttributeConverter class FoedselNrConverter : AttributeConverter { override fun convertToDatabaseColumn(attribute: FoedselsNr?): String? { diff --git a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/KodeConverter.kt b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/KodeConverter.kt index 9d37c496..40831166 100644 --- a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/KodeConverter.kt +++ b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/KodeConverter.kt @@ -3,8 +3,8 @@ package no.nav.familie.ba.infotrygd.model.converters import no.nav.familie.ba.infotrygd.exception.UkjentDatabaseverdiException import no.nav.familie.ba.infotrygd.model.kodeverk.Kode import no.nav.familie.ba.infotrygd.model.kodeverk.SakStatus -import javax.persistence.AttributeConverter -import javax.persistence.Converter +import jakarta.persistence.AttributeConverter +import jakarta.persistence.Converter abstract class KodeConverter(private val koder: List, val fieldSize: Int = 0, val padChar: Char = ' ') : AttributeConverter { diff --git a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/NavCharDateConverter.kt b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/NavCharDateConverter.kt index c9a08fb7..33f4fd46 100644 --- a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/NavCharDateConverter.kt +++ b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/NavCharDateConverter.kt @@ -1,8 +1,8 @@ package no.nav.familie.ba.infotrygd.model.converters import java.time.LocalDate -import javax.persistence.AttributeConverter -import javax.persistence.Converter +import jakarta.persistence.AttributeConverter +import jakarta.persistence.Converter @Converter class NavCharDateConverter : AttributeConverter { diff --git a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/NavLocalDateConverter.kt b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/NavLocalDateConverter.kt index 97691f6e..f32da656 100644 --- a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/NavLocalDateConverter.kt +++ b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/NavLocalDateConverter.kt @@ -1,6 +1,6 @@ package no.nav.familie.ba.infotrygd.model.converters -import javax.persistence.Converter +import jakarta.persistence.Converter @Converter class NavLocalDateConverter : AbstractNavLocalDateConverter("yyyyMMdd") \ No newline at end of file diff --git a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/NavReversedLocalDateConverter.kt b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/NavReversedLocalDateConverter.kt index 1986215f..f8aec688 100644 --- a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/NavReversedLocalDateConverter.kt +++ b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/NavReversedLocalDateConverter.kt @@ -1,6 +1,6 @@ package no.nav.familie.ba.infotrygd.model.converters -import javax.persistence.Converter +import jakarta.persistence.Converter @Converter class NavReversedLocalDateConverter : AbstractNavLocalDateConverter("ddMMyyyy") \ No newline at end of file diff --git a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/ReversedFoedselNrConverter.kt b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/ReversedFoedselNrConverter.kt index 10e447a3..fb408689 100644 --- a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/ReversedFoedselNrConverter.kt +++ b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/ReversedFoedselNrConverter.kt @@ -3,7 +3,7 @@ package no.nav.familie.ba.infotrygd.model.converters import no.nav.commons.foedselsnummer.FoedselsNr import no.nav.familie.ba.infotrygd.utils.fraReversert import no.nav.familie.ba.infotrygd.utils.reversert -import javax.persistence.AttributeConverter +import jakarta.persistence.AttributeConverter class ReversedFoedselNrConverter : AttributeConverter { override fun convertToDatabaseColumn(attribute: FoedselsNr?): String? { diff --git a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/ReversedLongFoedselNrConverter.kt b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/ReversedLongFoedselNrConverter.kt index 2090eec7..ca9cb27b 100644 --- a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/ReversedLongFoedselNrConverter.kt +++ b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/ReversedLongFoedselNrConverter.kt @@ -1,7 +1,7 @@ package no.nav.familie.ba.infotrygd.model.converters import no.nav.commons.foedselsnummer.FoedselsNr -import javax.persistence.AttributeConverter +import jakarta.persistence.AttributeConverter class ReversedLongFoedselNrConverter : AttributeConverter { private val converter = ReversedFoedselNrConverter() diff --git a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/StatusLopenrConverter.kt b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/StatusLopenrConverter.kt index 9689ac8d..c7a120f8 100644 --- a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/StatusLopenrConverter.kt +++ b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/converters/StatusLopenrConverter.kt @@ -1,6 +1,6 @@ package no.nav.familie.ba.infotrygd.model.converters -import javax.persistence.AttributeConverter +import jakarta.persistence.AttributeConverter class StatusLopenrConverter : AttributeConverter { override fun convertToDatabaseColumn(attribute: Long?): String? { diff --git a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/Beslutning.kt b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/Beslutning.kt index 7ce45df7..4e928964 100644 --- a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/Beslutning.kt +++ b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/Beslutning.kt @@ -1,6 +1,6 @@ package no.nav.familie.ba.infotrygd.model.db2 -import javax.persistence.* +import jakarta.persistence.* @Entity @Table(name = "T_BESLUT") diff --git a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/Delytelse.kt b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/Delytelse.kt index 0f3c0f59..85d0dea6 100644 --- a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/Delytelse.kt +++ b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/Delytelse.kt @@ -4,11 +4,11 @@ package no.nav.familie.ba.infotrygd.model.db2 import no.nav.familie.ba.infotrygd.model.converters.Char2Converter import no.nav.familie.ba.infotrygd.model.converters.CharConverter import java.time.LocalDate -import javax.persistence.Column -import javax.persistence.Convert -import javax.persistence.EmbeddedId -import javax.persistence.Entity -import javax.persistence.Table +import jakarta.persistence.Column +import jakarta.persistence.Convert +import jakarta.persistence.EmbeddedId +import jakarta.persistence.Entity +import jakarta.persistence.Table import no.nav.familie.kontrakter.ba.infotrygd.Delytelse as DelytelseDto diff --git a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/DelytelseId.kt b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/DelytelseId.kt index ffd4624c..ff953e42 100644 --- a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/DelytelseId.kt +++ b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/DelytelseId.kt @@ -1,8 +1,8 @@ package no.nav.familie.ba.infotrygd.model.db2 import java.io.Serializable -import javax.persistence.Column -import javax.persistence.Embeddable +import jakarta.persistence.Column +import jakarta.persistence.Embeddable @Embeddable data class DelytelseId( diff --git a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/Endring.kt b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/Endring.kt index 0dfd7922..fe5a5146 100644 --- a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/Endring.kt +++ b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/Endring.kt @@ -1,6 +1,6 @@ package no.nav.familie.ba.infotrygd.model.db2 -import javax.persistence.* +import jakarta.persistence.* @Entity @Table(name = "T_ENDRING") diff --git "a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/L\303\270peNrFnr.kt" "b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/L\303\270peNrFnr.kt" index 7c27f130..9d0336b5 100644 --- "a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/L\303\270peNrFnr.kt" +++ "b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/L\303\270peNrFnr.kt" @@ -1,10 +1,10 @@ package no.nav.familie.ba.infotrygd.model.db2 import java.io.Serializable -import javax.persistence.Column -import javax.persistence.Entity -import javax.persistence.Id -import javax.persistence.Table +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.Table @Entity diff --git "a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/St\303\270nadDb2.kt" "b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/St\303\270nadDb2.kt" index 30173030..cc57857c 100644 --- "a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/St\303\270nadDb2.kt" +++ "b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/St\303\270nadDb2.kt" @@ -1,7 +1,7 @@ package no.nav.familie.ba.infotrygd.model.db2 import no.nav.familie.ba.infotrygd.model.converters.Char2Converter -import javax.persistence.* +import jakarta.persistence.* @Entity @Table(name = "T_STONAD") diff --git "a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/St\303\270nadsklasse.kt" "b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/St\303\270nadsklasse.kt" index cc4acf9e..ac18b558 100644 --- "a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/St\303\270nadsklasse.kt" +++ "b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/St\303\270nadsklasse.kt" @@ -1,7 +1,7 @@ package no.nav.familie.ba.infotrygd.model.db2 import java.io.Serializable -import javax.persistence.* +import jakarta.persistence.* @Entity @Table(name = "T_STONADSKLASSE") diff --git a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/Utbetaling.kt b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/Utbetaling.kt index 413eaeb3..7a9ea1d6 100644 --- a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/Utbetaling.kt +++ b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/Utbetaling.kt @@ -7,7 +7,7 @@ import no.nav.familie.ba.infotrygd.model.converters.ReversedFoedselNrConverter import no.nav.familie.ba.infotrygd.utils.DatoUtils.seqDatoTilYearMonth import no.nav.familie.ba.infotrygd.utils.DatoUtils.stringDatoMMyyyyTilYearMonth import java.time.YearMonth -import javax.persistence.* +import jakarta.persistence.* @Entity diff --git a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/Vedtak.kt b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/Vedtak.kt index f4bd436c..63fe12e0 100644 --- a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/Vedtak.kt +++ b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/db2/Vedtak.kt @@ -5,7 +5,7 @@ import no.nav.familie.ba.infotrygd.model.converters.Char2Converter import no.nav.familie.ba.infotrygd.model.converters.CharConverter import org.hibernate.annotations.Cascade import org.hibernate.annotations.CascadeType -import javax.persistence.* +import jakarta.persistence.* @Entity diff --git a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/Barn.kt b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/Barn.kt index c18ddd35..d91ee30a 100644 --- a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/Barn.kt +++ b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/Barn.kt @@ -6,7 +6,7 @@ import no.nav.familie.ba.infotrygd.model.converters.ReversedFoedselNrConverter import no.nav.familie.ba.infotrygd.model.converters.ReversedLongFoedselNrConverter import no.nav.familie.ba.infotrygd.utils.DatoUtils import java.time.YearMonth -import javax.persistence.* +import jakarta.persistence.* import no.nav.familie.kontrakter.ba.infotrygd.Barn as BarnDto @Entity diff --git a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/Hendelse.kt b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/Hendelse.kt index c103c332..c1d3ad6f 100644 --- a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/Hendelse.kt +++ b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/Hendelse.kt @@ -2,11 +2,11 @@ package no.nav.familie.ba.infotrygd.model.dl1 import no.nav.commons.foedselsnummer.FoedselsNr import no.nav.familie.ba.infotrygd.model.converters.ReversedFoedselNrConverter -import javax.persistence.Column -import javax.persistence.Convert -import javax.persistence.Entity -import javax.persistence.Id -import javax.persistence.Table +import jakarta.persistence.Column +import jakarta.persistence.Convert +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.Table @Entity @Table(name = "SA_HENDELSE_20") diff --git a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/Person.kt b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/Person.kt index 4d907062..2883e567 100644 --- a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/Person.kt +++ b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/Person.kt @@ -2,7 +2,7 @@ package no.nav.familie.ba.infotrygd.model.dl1 import no.nav.commons.foedselsnummer.FoedselsNr import no.nav.familie.ba.infotrygd.model.converters.ReversedFoedselNrConverter -import javax.persistence.* +import jakarta.persistence.* import java.io.Serializable @Entity diff --git a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/Sak.kt b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/Sak.kt index 4c64bb91..2080c045 100644 --- a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/Sak.kt +++ b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/Sak.kt @@ -4,7 +4,7 @@ import no.nav.commons.foedselsnummer.FoedselsNr import no.nav.familie.ba.infotrygd.model.converters.* import java.io.Serializable import java.time.LocalDate -import javax.persistence.* +import jakarta.persistence.* @Entity @Table(name = "SA_SAK_10") diff --git a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/Status.kt b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/Status.kt index 7dafd990..132644ff 100644 --- a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/Status.kt +++ b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/Status.kt @@ -3,7 +3,7 @@ package no.nav.familie.ba.infotrygd.model.dl1 import no.nav.familie.ba.infotrygd.model.converters.SakStatusConverter import no.nav.familie.ba.infotrygd.model.converters.StatusLopenrConverter import no.nav.familie.ba.infotrygd.model.kodeverk.SakStatus -import javax.persistence.* +import jakarta.persistence.* @Entity @Table(name = "SA_STATUS_15") diff --git "a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/St\303\270nad.kt" "b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/St\303\270nad.kt" index f01cf875..bab10db3 100644 --- "a/src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/St\303\270nad.kt" +++ "b/src/main/kotlin/no/nav/familie/ba/infotrygd/model/dl1/St\303\270nad.kt" @@ -4,11 +4,11 @@ import no.nav.commons.foedselsnummer.FoedselsNr import no.nav.familie.ba.infotrygd.model.converters.CharConverter import no.nav.familie.ba.infotrygd.model.converters.ReversedFoedselNrConverter import java.io.Serializable -import javax.persistence.Column -import javax.persistence.Convert -import javax.persistence.Entity -import javax.persistence.Id -import javax.persistence.Table +import jakarta.persistence.Column +import jakarta.persistence.Convert +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.Table @Entity @Table(name = "BA_STOENAD_20") diff --git a/src/main/kotlin/no/nav/familie/ba/infotrygd/rest/controller/TableController.kt b/src/main/kotlin/no/nav/familie/ba/infotrygd/rest/controller/TableController.kt index 5adad114..5e98d7bd 100644 --- a/src/main/kotlin/no/nav/familie/ba/infotrygd/rest/controller/TableController.kt +++ b/src/main/kotlin/no/nav/familie/ba/infotrygd/rest/controller/TableController.kt @@ -4,7 +4,7 @@ import no.nav.familie.ba.infotrygd.integration.TableIntegrator import no.nav.security.token.support.core.api.Unprotected import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.RestController -import javax.transaction.Transactional +import jakarta.transaction.Transactional @RestController @Unprotected diff --git a/src/main/kotlin/no/nav/familie/ba/infotrygd/rest/filter/AccessLogFilter.kt b/src/main/kotlin/no/nav/familie/ba/infotrygd/rest/filter/AccessLogFilter.kt index 6db46710..a72bf56d 100644 --- a/src/main/kotlin/no/nav/familie/ba/infotrygd/rest/filter/AccessLogFilter.kt +++ b/src/main/kotlin/no/nav/familie/ba/infotrygd/rest/filter/AccessLogFilter.kt @@ -1,12 +1,12 @@ package no.nav.familie.ba.infotrygd.rest.filter import org.slf4j.LoggerFactory -import javax.servlet.FilterChain -import javax.servlet.ServletRequest -import javax.servlet.ServletResponse -import javax.servlet.http.HttpFilter -import javax.servlet.http.HttpServletRequest -import javax.servlet.http.HttpServletResponse +import jakarta.servlet.FilterChain +import jakarta.servlet.ServletRequest +import jakarta.servlet.ServletResponse +import jakarta.servlet.http.HttpFilter +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse class AccessLogFilter(private val applicationName: String) : HttpFilter() { diff --git a/src/main/resources/schema-h2.sql b/src/main/resources/schema-h2.sql index 7af5db48..6679ac0b 100644 --- a/src/main/resources/schema-h2.sql +++ b/src/main/resources/schema-h2.sql @@ -265,8 +265,8 @@ Create table INFOTRYGD_Q0.T_STONAD ( -------------------------------------------------- create table INFOTRYGD_Q0.T_STONADSKLASSE ( VEDTAK_ID NUMBER NOT NULL, - KODE_NIVAA VARCHAR2(2 char) NOT NULL, - KODE_KLASSE VARCHAR2(2 char) NOT NULL, + KODE_NIVAA VARCHAR2(2) NOT NULL, + KODE_KLASSE VARCHAR2(2) NOT NULL, OPPRETTET TIMESTAMP(6) DEFAULT current_timestamp); -------------------------------------------------- @@ -489,67 +489,67 @@ Create table INFOTRYGD_Q0.SA_STATUS_15 ( ); CREATE TABLE INFOTRYGD_Q0.IP_PERSONKORT_90( - IP01_PERSNKEY VARCHAR2(7 CHAR) NOT NULL, + IP01_PERSNKEY VARCHAR2(7) NOT NULL, IP90_DATO_SEQ NUMBER(8) NOT NULL, IP90_KONTONR NUMBER(7) NOT NULL, IP90_DATO NUMBER(8) NOT NULL, IP90_BEVILGET_BELOEP NUMBER(9,2), -- NOT NULL IP90_FOM NUMBER(8) NOT NULL, IP90_TOM NUMBER(8) NOT NULL, - IP90_TEKST VARCHAR2(30 CHAR) NOT NULL, + IP90_TEKST VARCHAR2(30) NOT NULL, IP90_BEV_PROS NUMBER(5,2), -- NOT NULL IP90_BETALT_BELOEP NUMBER(9,2), -- NOT NULL - IP90_GRUPPE CHAR(1 CHAR), -- NOT NULL - IP90_EIENDOM CHAR(1 CHAR), -- NOT NULL - IP90_EIENDOM_KODE VARCHAR2(2 CHAR), -- NOT NULL - IP90_OPPDAT_KODE CHAR(1 CHAR), -- NOT NULL + IP90_GRUPPE CHAR(1), -- NOT NULL + IP90_EIENDOM CHAR(1), -- NOT NULL + IP90_EIENDOM_KODE VARCHAR2(2), -- NOT NULL + IP90_OPPDAT_KODE CHAR(1), -- NOT NULL OPPRETTET TIMESTAMP(6), -- NOT NULL ENDRET_I_KILDE TIMESTAMP(6), -- NOT NULL - KILDE_IS VARCHAR2(12 CHAR), -- NOT NULL - REGION CHAR(1 CHAR), -- NOT NULL + KILDE_IS VARCHAR2(12), -- NOT NULL + REGION CHAR(1), -- NOT NULL ID_PERSK NUMBER, -- NOT NULL OPPDATERT TIMESTAMP(6) ); CREATE TABLE INFOTRYGD_Q0.IP_PERSON_01( - IP01_PERSNKEY VARCHAR2(7 CHAR) NOT NULL, + IP01_PERSNKEY VARCHAR2(7) NOT NULL, IP01_PERSONKEY NUMBER(15) , -- NOT NULL, - IP01_TKAVD CHAR(1 CHAR) , -- NOT NULL, + IP01_TKAVD CHAR(1) , -- NOT NULL, IP01_DOEDSDATO NUMBER(8) , -- NOT NULL, - IP01_PENS_STAT CHAR(1 CHAR) , -- NOT NULL, - IP01_SAK_STATUS CHAR(1 CHAR) , -- NOT NULL, - IP01_STATBORGER CHAR(1 CHAR) , -- NOT NULL, - IP01_EKTEF_PENSJ CHAR(1 CHAR) , -- NOT NULL, - IP01_BARNE_PENSJ CHAR(1 CHAR) , -- NOT NULL, - IP01_SP_STAT CHAR(1 CHAR) , -- NOT NULL, - IP01_AL_STAT CHAR(1 CHAR) , -- NOT NULL, - IP01_AF_STAT CHAR(1 CHAR) , -- NOT NULL, - IP01_IN_STAT CHAR(1 CHAR) , -- NOT NULL, - IP01_FORSIKR_STAT CHAR(1 CHAR) , -- NOT NULL, - IP01_MAALFORM CHAR(1 CHAR) , -- NOT NULL, - IP01_AVG_STAT CHAR(1 CHAR) , -- NOT NULL, - IP01_BI_STAT CHAR(1 CHAR) , -- NOT NULL, - IP01_DIV_STAT CHAR(1 CHAR) , -- NOT NULL, - IP01_PERS_STATUS CHAR(1 CHAR) , -- NOT NULL, - IP01_REG_KILDE CHAR(1 CHAR) , -- NOT NULL, + IP01_PENS_STAT CHAR(1) , -- NOT NULL, + IP01_SAK_STATUS CHAR(1) , -- NOT NULL, + IP01_STATBORGER CHAR(1) , -- NOT NULL, + IP01_EKTEF_PENSJ CHAR(1) , -- NOT NULL, + IP01_BARNE_PENSJ CHAR(1) , -- NOT NULL, + IP01_SP_STAT CHAR(1) , -- NOT NULL, + IP01_AL_STAT CHAR(1) , -- NOT NULL, + IP01_AF_STAT CHAR(1) , -- NOT NULL, + IP01_IN_STAT CHAR(1) , -- NOT NULL, + IP01_FORSIKR_STAT CHAR(1) , -- NOT NULL, + IP01_MAALFORM CHAR(1) , -- NOT NULL, + IP01_AVG_STAT CHAR(1) , -- NOT NULL, + IP01_BI_STAT CHAR(1) , -- NOT NULL, + IP01_DIV_STAT CHAR(1) , -- NOT NULL, + IP01_PERS_STATUS CHAR(1) , -- NOT NULL, + IP01_REG_KILDE CHAR(1) , -- NOT NULL, IP01_FORS_DIFF NUMBER(7) , -- NOT NULL, - IP01_YTELSE VARCHAR2(2 CHAR) , -- NOT NULL, + IP01_YTELSE VARCHAR2(2) , -- NOT NULL, IP01_POBA_GIRO NUMBER(11) , -- NOT NULL, IP01_SAK_TELLER NUMBER(3) , -- NOT NULL, - IP01_LEVEATTEST_UTGAATT CHAR(1 CHAR) , -- NOT NULL, - IP01_AKT_STAT VARCHAR2(3 CHAR) , -- NOT NULL, - IP01_KJOENN CHAR(1 CHAR) , -- NOT NULL, - IP01_SYSTAVD CHAR(1 CHAR) , -- NOT NULL, - IP01_FNR_ENDRET CHAR(1 CHAR) , -- NOT NULL, - IP01_BS_STAT CHAR(1 CHAR) , -- NOT NULL, - IP01_FA_STAT CHAR(1 CHAR) , -- NOT NULL, - IP01_RP_STAT CHAR(1 CHAR) , -- NOT NULL, + IP01_LEVEATTEST_UTGAATT CHAR(1) , -- NOT NULL, + IP01_AKT_STAT VARCHAR2(3) , -- NOT NULL, + IP01_KJOENN CHAR(1) , -- NOT NULL, + IP01_SYSTAVD CHAR(1) , -- NOT NULL, + IP01_FNR_ENDRET CHAR(1) , -- NOT NULL, + IP01_BS_STAT CHAR(1) , -- NOT NULL, + IP01_FA_STAT CHAR(1) , -- NOT NULL, + IP01_RP_STAT CHAR(1) , -- NOT NULL, TK_NR VARCHAR2(4) , -- NOT NULL, F_NR VARCHAR2(11) NOT NULL, OPPRETTET TIMESTAMP(6) , -- NOT NULL, ENDRET_I_KILDE TIMESTAMP(6) , -- NOT NULL, - KILDE_IS VARCHAR2(12 CHAR) , -- NOT NULL, - REGION CHAR(1 CHAR) , -- NOT NULL, + KILDE_IS VARCHAR2(12) , -- NOT NULL, + REGION CHAR(1) , -- NOT NULL, ID_IPERS NUMBER NOT NULL, OPPDATERT TIMESTAMP(6) ); @@ -559,55 +559,55 @@ CREATE TABLE INFOTRYGD_Q0.IP_PERSON_01( CREATE TABLE INFOTRYGD_Q0.BA_PERSON_01 ( B01_PERSONKEY NUMBER(15, 0) NOT NULL -, B01_BT_STATUS CHAR(1 CHAR) -- NOT NULL -, B01_MOTTAKER_KODE VARCHAR2(3 CHAR) -- NOT NULL +, B01_BT_STATUS CHAR(1) -- NOT NULL +, B01_MOTTAKER_KODE VARCHAR2(3) -- NOT NULL , B01_MOTTAKER_NR NUMBER(11, 0) -- NOT NULL , B01_AKONTO_BELOP NUMBER(7, 0) -- NOT NULL -, B01_PENSJONSTRYGDET CHAR(1 CHAR) -- NOT NULL -, TK_NR VARCHAR2(4 BYTE) NOT NULL -, F_NR VARCHAR2(11 BYTE) NOT NULL +, B01_PENSJONSTRYGDET CHAR(1) -- NOT NULL +, TK_NR VARCHAR2(4) NOT NULL +, F_NR VARCHAR2(11) NOT NULL , OPPRETTET TIMESTAMP(6) DEFAULT current_timestamp NOT NULL , ENDRET_I_KILDE TIMESTAMP(6) DEFAULT current_timestamp NOT NULL -, KILDE_IS VARCHAR2(12 CHAR) DEFAULT ' ' NOT NULL -, REGION CHAR(1 CHAR) DEFAULT ' ' NOT NULL -, ID_BA_PERS NUMBER GENERATED ALWAYS AS IDENTITY NOT NULL +, KILDE_IS VARCHAR2(12) DEFAULT ' ' NOT NULL +, REGION CHAR(1) DEFAULT ' ' NOT NULL +, ID_BA_PERS NUMBER(15,0) DEFAULT NOT NULL , OPPDATERT TIMESTAMP(6) DEFAULT current_timestamp NOT NULL ); CREATE TABLE INFOTRYGD_Q0.BA_STOENAD_20 ( B01_PERSONKEY NUMBER(15, 0) NOT NULL -, B20_IVERFOM_SEQ VARCHAR2(6 CHAR) /*NOT NULL*/ -, B20_VIRKFOM_SEQ VARCHAR2(6 CHAR) -- NOT NULL -, B20_GRUPPE VARCHAR2(2 CHAR) -- NOT NULL -, B20_BRUKERID VARCHAR2(7 CHAR) -- NOT NULL -, B20_TKNR VARCHAR2(4 CHAR) -- NOT NULL +, B20_IVERFOM_SEQ VARCHAR2(6) /*NOT NULL*/ +, B20_VIRKFOM_SEQ VARCHAR2(6) -- NOT NULL +, B20_GRUPPE VARCHAR2(2) -- NOT NULL +, B20_BRUKERID VARCHAR2(7) -- NOT NULL +, B20_TKNR VARCHAR2(4) -- NOT NULL , B20_REG_DATO NUMBER(8, 0) -- NOT NULL , B20_SOK_DATO NUMBER(8, 0) -- NOT NULL -, B20_BLOKK CHAR(1 CHAR) -- NOT NULL -, B20_SAK_NR VARCHAR2(2 CHAR) -- NOT NULL -, B20_STATUS VARCHAR2(2 CHAR) -- NOT NULL -, B20_TEKSTKODE VARCHAR2(2 CHAR) -- NOT NULL -, B20_EBET_FOM VARCHAR2(6 CHAR) -- NOT NULL -, B20_EBET_TOM VARCHAR2(6 CHAR) -- NOT NULL -, B20_OPPHOERT_IVER VARCHAR2(6 CHAR) -- NOT NULL -, B20_OPPHORSGRUNN CHAR(1 CHAR) -- NOT NULL +, B20_BLOKK CHAR(1) -- NOT NULL +, B20_SAK_NR VARCHAR2(2) -- NOT NULL +, B20_STATUS VARCHAR2(2) -- NOT NULL +, B20_TEKSTKODE VARCHAR2(2) -- NOT NULL +, B20_EBET_FOM VARCHAR2(6) -- NOT NULL +, B20_EBET_TOM VARCHAR2(6) -- NOT NULL +, B20_OPPHOERT_IVER VARCHAR2(6) -- NOT NULL +, B20_OPPHORSGRUNN CHAR(1) -- NOT NULL , B20_ANT_BARN NUMBER(2, 0) -- NOT NULL -, B20_OMREGN CHAR(1 CHAR) -- NOT NULL -, B20_EOS CHAR(1 CHAR) -- NOT NULL -, B20_EKSTRA_SMAB CHAR(1 CHAR) -- NOT NULL -, B20_SVALBARD CHAR(1 CHAR) -- NOT NULL -, B20_SAMBOERTYPE CHAR(1 CHAR) -- NOT NULL -, B20_OPPHOERT_VFOM VARCHAR2(6 CHAR) NOT NULL +, B20_OMREGN CHAR(1) -- NOT NULL +, B20_EOS CHAR(1) -- NOT NULL +, B20_EKSTRA_SMAB CHAR(1) -- NOT NULL +, B20_SVALBARD CHAR(1) -- NOT NULL +, B20_SAMBOERTYPE CHAR(1) -- NOT NULL +, B20_OPPHOERT_VFOM VARCHAR2(6) NOT NULL , B20_ANT_SMAABARN NUMBER(2, 0) -- NOT NULL -, B20_DELT_OMS_PROS VARCHAR2(2 CHAR) -- NOT NULL -, TK_NR VARCHAR2(4 BYTE) NOT NULL -, F_NR VARCHAR2(11 BYTE) NOT NULL +, B20_DELT_OMS_PROS VARCHAR2(2) -- NOT NULL +, TK_NR VARCHAR2(4) NOT NULL +, F_NR VARCHAR2(11) NOT NULL , OPPRETTET TIMESTAMP(6) DEFAULT current_timestamp NOT NULL , ENDRET_I_KILDE TIMESTAMP(6) DEFAULT current_timestamp NOT NULL -, KILDE_IS VARCHAR2(12 CHAR) DEFAULT ' ' NOT NULL -, REGION CHAR(1 CHAR) DEFAULT ' ' NOT NULL -, ID_BA_STOENAD NUMBER GENERATED ALWAYS AS IDENTITY NOT NULL +, KILDE_IS VARCHAR2(12) DEFAULT ' ' NOT NULL +, REGION CHAR(1) DEFAULT ' ' NOT NULL +, ID_BA_STOENAD NUMBER DEFAULT NOT NULL , OPPDATERT TIMESTAMP(6) DEFAULT current_timestamp NOT NULL ); @@ -615,70 +615,70 @@ CREATE TABLE INFOTRYGD_Q0.BA_BARN_10 ( B01_PERSONKEY NUMBER(15, 0) NOT NULL , B10_BARN_FNR NUMBER(11, 0) NOT NULL -, B10_BA_IVER VARCHAR2(6 CHAR) -- NOT NULL -, B10_BA_VFOM VARCHAR2(6 CHAR) -- NOT NULL -, B10_BA_TOM VARCHAR2(6 CHAR) NOT NULL -, B10_STONADS_TYPE VARCHAR2(2 CHAR) -- NOT NULL -, TK_NR VARCHAR2(4 BYTE) NOT NULL -, F_NR VARCHAR2(11 BYTE) NOT NULL +, B10_BA_IVER VARCHAR2(6) -- NOT NULL +, B10_BA_VFOM VARCHAR2(6) -- NOT NULL +, B10_BA_TOM VARCHAR2(6) NOT NULL +, B10_STONADS_TYPE VARCHAR2(2) -- NOT NULL +, TK_NR VARCHAR2(4) NOT NULL +, F_NR VARCHAR2(11) NOT NULL , OPPRETTET TIMESTAMP(6) DEFAULT current_timestamp NOT NULL , ENDRET_I_KILDE TIMESTAMP(6) DEFAULT current_timestamp NOT NULL -, KILDE_IS VARCHAR2(12 CHAR) DEFAULT ' ' NOT NULL -, REGION CHAR(1 CHAR) DEFAULT ' ' NOT NULL -, ID_BA_BARN NUMBER GENERATED ALWAYS AS IDENTITY NOT NULL +, KILDE_IS VARCHAR2(12) DEFAULT ' ' NOT NULL +, REGION CHAR(1) DEFAULT ' ' NOT NULL +, ID_BA_BARN NUMBER DEFAULT NOT NULL , OPPDATERT TIMESTAMP(6) DEFAULT current_timestamp NOT NULL ); CREATE TABLE INFOTRYGD_Q0.BA_UTBETALING_30 ( B01_PERSONKEY NUMBER(15, 0) NOT NULL -, B30_START_UTBET_MND_SEQ VARCHAR2(6 CHAR) NOT NULL -, B30_VFOM_SEQ VARCHAR2(6 CHAR) NOT NULL -, B30_KONTONR VARCHAR2(8 CHAR) NOT NULL -, B30_UTBET_TYPE CHAR(1 CHAR) NOT NULL -, B30_GRUPPE VARCHAR2(2 CHAR) -- NOT NULL -, B30_BRUKERID VARCHAR2(7 CHAR) -- NOT NULL -, B30_UTBET_FOM VARCHAR2(6 CHAR) -- NOT NULL -, B30_UTBET_TOM VARCHAR2(6 CHAR) -- NOT NULL -, B30_UTBETALT CHAR(1 CHAR) -- NOT NULL +, B30_START_UTBET_MND_SEQ VARCHAR2(6) NOT NULL +, B30_VFOM_SEQ VARCHAR2(6) NOT NULL +, B30_KONTONR VARCHAR2(8) NOT NULL +, B30_UTBET_TYPE CHAR(1) NOT NULL +, B30_GRUPPE VARCHAR2(2) -- NOT NULL +, B30_BRUKERID VARCHAR2(7) -- NOT NULL +, B30_UTBET_FOM VARCHAR2(6) -- NOT NULL +, B30_UTBET_TOM VARCHAR2(6) -- NOT NULL +, B30_UTBETALT CHAR(1) -- NOT NULL , B30_BELOP NUMBER(7, 0) NOT NULL , B30_UTBET_DATO NUMBER(8, 0) -- NOT NULL -, B30_KODE CHAR(1 CHAR) -- NOT NULL -, TK_NR VARCHAR2(4 BYTE) -- NOT NULL -, F_NR VARCHAR2(11 BYTE) NOT NULL +, B30_KODE CHAR(1) -- NOT NULL +, TK_NR VARCHAR2(4) -- NOT NULL +, F_NR VARCHAR2(11) NOT NULL , OPPRETTET TIMESTAMP(6) DEFAULT current_timestamp -- NOT NULL , ENDRET_I_KILDE TIMESTAMP(6) DEFAULT current_timestamp -- NOT NULL -, KILDE_IS VARCHAR2(12 CHAR) DEFAULT ' ' -- NOT NULL -, REGION CHAR(1 CHAR) DEFAULT ' ' NOT NULL -, ID_BA_UTBET NUMBER GENERATED ALWAYS AS IDENTITY NOT NULL +, KILDE_IS VARCHAR2(12) DEFAULT ' ' -- NOT NULL +, REGION CHAR(1) DEFAULT ' ' NOT NULL +, ID_BA_UTBET NUMBER DEFAULT NOT NULL , OPPDATERT TIMESTAMP(6) DEFAULT current_timestamp -- NOT NULL ); CREATE TABLE INFOTRYGD_Q0.BA_UTBET_HIST_40 ( B01_PERSONKEY NUMBER(15, 0) NOT NULL -, B40_UTBET_DATO_SEQ VARCHAR2(8 CHAR) NOT NULL +, B40_UTBET_DATO_SEQ VARCHAR2(8) NOT NULL , B40_NETTO_UTBET NUMBER(7, 0) NOT NULL -, B40_KORT_FRA VARCHAR2(10 CHAR) NOT NULL -, B40_KORT_TIL VARCHAR2(10 CHAR) NOT NULL -, B40_MOTTAKER_KODE VARCHAR2(3 CHAR) NOT NULL +, B40_KORT_FRA VARCHAR2(10) NOT NULL +, B40_KORT_TIL VARCHAR2(10) NOT NULL +, B40_MOTTAKER_KODE VARCHAR2(3) NOT NULL , B40_MOTTAKER_NR NUMBER(11, 0) NOT NULL -, B40_GIRONR VARCHAR2(11 CHAR) NOT NULL -, B40_UTBET_KODE VARCHAR2(1 CHAR) NOT NULL -, TK_NR VARCHAR2(4 BYTE) NOT NULL -, F_NR VARCHAR2(11 BYTE) NOT NULL +, B40_GIRONR VARCHAR2(11) NOT NULL +, B40_UTBET_KODE VARCHAR2(1) NOT NULL +, TK_NR VARCHAR2(4) NOT NULL +, F_NR VARCHAR2(11) NOT NULL , OPPRETTET TIMESTAMP(6) DEFAULT current_timestamp NOT NULL , ENDRET_I_KILDE TIMESTAMP(6) DEFAULT current_timestamp NOT NULL -, KILDE_IS VARCHAR2(12 CHAR) DEFAULT ' ' NOT NULL -, REGION CHAR(1 CHAR) DEFAULT ' ' NOT NULL -, ID_BA_UTHIST NUMBER GENERATED ALWAYS AS IDENTITY NOT NULL +, KILDE_IS VARCHAR2(12) DEFAULT ' ' NOT NULL +, REGION CHAR(1) DEFAULT ' ' NOT NULL +, ID_BA_UTHIST NUMBERDEFAULT NOT NULL , OPPDATERT TIMESTAMP(6) DEFAULT current_timestamp NOT NULL ); CREATE TABLE INFOTRYGD_Q0.T_ENDRING ( VEDTAK_ID NUMBER NOT NULL -, KODE VARCHAR2(2 CHAR) NOT NULL +, KODE VARCHAR2(2) NOT NULL , OPPRETTET TIMESTAMP(6) DEFAULT current_timestamp , OPPDATERT TIMESTAMP(6) DEFAULT current_timestamp --ID_ENDR NUMBER GENERATED ALWAYS AS IDENTITY MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 START WITH 1 CACHE 200 NOORDER NOCYCLE NOT NULL, @@ -688,19 +688,19 @@ CREATE TABLE INFOTRYGD_Q0.T_ENDRING CREATE TABLE INFOTRYGD_Q0.T_ROLLE ( VEDTAK_ID NUMBER(*, 0) NOT NULL -, TYPE VARCHAR2(2 CHAR) NOT NULL +, TYPE VARCHAR2(2) NOT NULL , TIDSPUNKT_REG TIMESTAMP(6) NOT NULL , FOM DATE NOT NULL , TOM DATE , PERSON_LOPENR_R NUMBER(*, 0) NOT NULL -, BRUKERID VARCHAR2(8 CHAR) NOT NULL -, BARN_TYPE VARCHAR2(2 CHAR) +, BRUKERID VARCHAR2(8) NOT NULL +, BARN_TYPE VARCHAR2(2) , BOR_SAMMEN_MED NUMBER(1, 0) , TRYGDETID_FAKTISK NUMBER(4, 0) , TRYGDETID_ANVENDT NUMBER(4, 0) -, TRYGDETID_UNNTAK CHAR(1 CHAR) +, TRYGDETID_UNNTAK CHAR(1) , TRYGD_MEDLEM_SIDEN NUMBER(4, 0) -, UTENLANDSOPPHOLD CHAR(1 CHAR) +, UTENLANDSOPPHOLD CHAR(1) , BT_1_SUM NUMBER(5, 0) , BT_1_ANTALL NUMBER(2, 0) , BT_2_SUM NUMBER(5, 0) @@ -717,17 +717,17 @@ CREATE TABLE INFOTRYGD_Q0.T_BESLUT ( BESLUTNING_ID NUMBER NOT NULL , VEDTAK_ID NUMBER NOT NULL -, SAKSBEHANDLER1 VARCHAR2(8 CHAR) --NOT NULL -, GODKJENT1 CHAR(1 CHAR) --NOT NULL -, ENHET1 VARCHAR2(4 CHAR) --NOT NULL +, SAKSBEHANDLER1 VARCHAR2(8) --NOT NULL +, GODKJENT1 CHAR(1) --NOT NULL +, ENHET1 VARCHAR2(4) --NOT NULL , TIDSPUNKT_REG1 TIMESTAMP(6) --NOT NULL -, SAKSBEHANDLER2 VARCHAR2(8 CHAR) -, GODKJENT2 CHAR(1 CHAR) -, ENHET2 VARCHAR2(4 CHAR) +, SAKSBEHANDLER2 VARCHAR2(8) +, GODKJENT2 CHAR(1) +, ENHET2 VARCHAR2(4) , TIDSPUNKT_REG2 TIMESTAMP(6) , SENDT_TIL_OS TIMESTAMP(6) , MOTTATT_FRA_OS TIMESTAMP(6) -, GODKJENT_AV_OS CHAR(1 CHAR) +, GODKJENT_AV_OS CHAR(1) , OPPRETTET TIMESTAMP(6) DEFAULT current_timestamp , OPPDATERT TIMESTAMP(6) DEFAULT current_timestamp --ID_BESLUT NUMBER GENERATED ALWAYS AS IDENTITY MINVALUE 1 MAXVALUE 9999999999999999999999999999 INCREMENT BY 1 START WITH 1 CACHE 200 NOORDER NOCYCLE NOT NULL, @@ -738,7 +738,7 @@ CREATE TABLE INFOTRYGD_Q0.T_TEKSTU ( BESLUTNING_ID NUMBER(*, 0) NOT NULL , TEKSTLINJE NUMBER(*, 0) -, TEKST VARCHAR2(80 CHAR) +, TEKST VARCHAR2(80) , AARSAK_KODE NUMBER(2, 0) , OPPRETTET TIMESTAMP(6) DEFAULT current_timestamp , OPPDATERT TIMESTAMP(6) DEFAULT current_timestamp diff --git a/src/test/kotlin/no/nav/familie/ba/infotrygd/MainTest.kt b/src/test/kotlin/no/nav/familie/ba/infotrygd/MainTest.kt index f762bad0..589ef297 100644 --- a/src/test/kotlin/no/nav/familie/ba/infotrygd/MainTest.kt +++ b/src/test/kotlin/no/nav/familie/ba/infotrygd/MainTest.kt @@ -6,7 +6,7 @@ import org.junit.Test import org.junit.runner.RunWith import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.web.server.LocalServerPort +import org.springframework.boot.test.web.server.LocalServerPort import org.springframework.http.HttpStatus import org.springframework.http.ResponseEntity import org.springframework.test.context.ActiveProfiles diff --git a/src/test/kotlin/no/nav/familie/ba/infotrygd/rest/controller/BarnetrygdControllerTest.kt b/src/test/kotlin/no/nav/familie/ba/infotrygd/rest/controller/BarnetrygdControllerTest.kt index aca777f7..b8457786 100644 --- a/src/test/kotlin/no/nav/familie/ba/infotrygd/rest/controller/BarnetrygdControllerTest.kt +++ b/src/test/kotlin/no/nav/familie/ba/infotrygd/rest/controller/BarnetrygdControllerTest.kt @@ -33,7 +33,7 @@ import org.junit.jupiter.api.assertThrows import org.junit.runner.RunWith import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.web.server.LocalServerPort +import org.springframework.boot.test.web.server.LocalServerPort import org.springframework.http.HttpStatus import org.springframework.test.context.ActiveProfiles import org.springframework.test.context.junit4.SpringRunner @@ -222,7 +222,7 @@ class BarnetrygdControllerTest { val response = assertThrows { get("/infotrygd/barnetrygd/stonad/666", Any::class.java) } - assertThat(response.status).isEqualTo(HttpStatus.NOT_FOUND) + assertThat(response.statusCode).isEqualTo(HttpStatus.NOT_FOUND) } @Test @@ -232,7 +232,7 @@ class BarnetrygdControllerTest { val result = assertThrows { post(uri = it, restTemplate = restTemplate, responseType = InfotrygdSøkResponse::class.java) } - assertThat(result.status).isEqualTo(HttpStatus.UNAUTHORIZED) + assertThat(result.statusCode).isEqualTo(HttpStatus.UNAUTHORIZED) } } diff --git a/src/test/kotlin/no/nav/familie/ba/infotrygd/testutil/DemoData.kt b/src/test/kotlin/no/nav/familie/ba/infotrygd/testutil/DemoData.kt index d60cf421..d29c9e4c 100644 --- a/src/test/kotlin/no/nav/familie/ba/infotrygd/testutil/DemoData.kt +++ b/src/test/kotlin/no/nav/familie/ba/infotrygd/testutil/DemoData.kt @@ -20,7 +20,7 @@ import org.springframework.stereotype.Component import java.time.LocalDate import java.time.YearMonth import java.time.format.DateTimeFormatter -import javax.annotation.PostConstruct +import jakarta.annotation.PostConstruct @Component @Profile("demoData") diff --git a/src/test/resources/application-test.yml b/src/test/resources/application-test.yml index 6aad3689..292aed45 100644 --- a/src/test/resources/application-test.yml +++ b/src/test/resources/application-test.yml @@ -2,7 +2,7 @@ spring: jpa: database-platform: org.hibernate.dialect.Oracle10gDialect hibernate: - ddl-auto: validate + ddl-auto: none properties: hibernate: default_schema: INFOTRYGD_Q0 @@ -11,9 +11,11 @@ spring: username: sa password: pwd driver-class-name: org.h2.Driver - initialization-mode: always - platform: h2 - continue-on-error: true + sql: + init: + platform: h2 + mode: always + continue-on-error: true no.nav.security.jwt: expirythreshold: 60 #threshold in minutes until token expires