diff --git a/kalkulator/pom.xml b/kalkulator/pom.xml index 1e278bc7..08bd5ecc 100644 --- a/kalkulator/pom.xml +++ b/kalkulator/pom.xml @@ -35,11 +35,6 @@ fpsak-tidsserie - - org.glassfish - jakarta.el - provided - org.slf4j slf4j-api diff --git a/kontrakt/pom.xml b/kontrakt/pom.xml index 798e5cfb..9eaf9e8c 100644 --- a/kontrakt/pom.xml +++ b/kontrakt/pom.xml @@ -42,16 +42,6 @@ jakarta.validation jakarta.validation-api - - org.hibernate.validator - hibernate-validator - test - - - org.glassfish - jakarta.el - test - diff --git a/kontrakt/src/test/java/no/nav/folketrygdloven/kalkulus/mappers/JsonMapperUtil.java b/kontrakt/src/test/java/no/nav/folketrygdloven/kalkulus/mappers/JsonMapperUtil.java index 2eda1837..c87eee34 100644 --- a/kontrakt/src/test/java/no/nav/folketrygdloven/kalkulus/mappers/JsonMapperUtil.java +++ b/kontrakt/src/test/java/no/nav/folketrygdloven/kalkulus/mappers/JsonMapperUtil.java @@ -1,11 +1,5 @@ package no.nav.folketrygdloven.kalkulus.mappers; -import static org.assertj.core.api.Assertions.assertThat; - -import jakarta.validation.Validation; - -import org.assertj.core.api.Assertions; - import com.fasterxml.jackson.databind.ObjectReader; import com.fasterxml.jackson.databind.ObjectWriter; @@ -13,13 +7,4 @@ public class JsonMapperUtil { public static final ObjectWriter WRITER_JSON = JsonMapper.getMapper().writerWithDefaultPrettyPrinter(); public static final ObjectReader READER_JSON = JsonMapper.getMapper().reader(); - - public static void validateResult(Object roundTripped) { - Assertions.assertThat(roundTripped).isNotNull(); - try (var factory = Validation.buildDefaultValidatorFactory()) { - var validator = factory.getValidator(); - var violations = validator.validate(roundTripped); - assertThat(violations).isEmpty(); - } - } } diff --git a/kontrakt/src/test/java/no/nav/folketrygdloven/kalkulus/mappers/KalkulatorMapperTest.java b/kontrakt/src/test/java/no/nav/folketrygdloven/kalkulus/mappers/KalkulatorMapperTest.java index 04723d6d..66b645e1 100644 --- a/kontrakt/src/test/java/no/nav/folketrygdloven/kalkulus/mappers/KalkulatorMapperTest.java +++ b/kontrakt/src/test/java/no/nav/folketrygdloven/kalkulus/mappers/KalkulatorMapperTest.java @@ -3,7 +3,6 @@ import static no.nav.folketrygdloven.kalkulus.mappers.JsonMapperUtil.READER_JSON; import static no.nav.folketrygdloven.kalkulus.mappers.JsonMapperUtil.WRITER_JSON; -import static no.nav.folketrygdloven.kalkulus.mappers.JsonMapperUtil.validateResult; import static org.assertj.core.api.Assertions.assertThat; import java.math.BigDecimal; @@ -74,7 +73,6 @@ void skal_generere_og_validere_roundtrip_kalkulator_input_json() throws Exceptio assertThat(roundTripped).isNotNull(); assertThat(roundTripped.getIayGrunnlag()).isNotNull(); - validateResult(roundTripped); } @@ -99,7 +97,6 @@ void skal_generere_og_validere_roundtrip_av_start_beregning_request() throws Exc assertThat(roundTripped.getAktør()).isEqualTo(dummy); assertThat(roundTripped.getSaksnummer()).isEqualTo(saksnummer); assertThat(roundTripped.getBeregnForListe().getFirst().getEksternReferanse()).isEqualTo(enUuid); - validateResult(roundTripped); } private KalkulatorInputDto byggKalkulatorInput() { diff --git a/pom.xml b/pom.xml index be6178b0..885a6d2a 100644 --- a/pom.xml +++ b/pom.xml @@ -80,16 +80,6 @@ jakarta.validation-api 3.0.2 - - org.hibernate.validator - hibernate-validator - 8.0.1.Final - - - org.glassfish - jakarta.el - 4.0.2 - org.slf4j slf4j-api