jakarta ee9

navikt · Aug 23, 2023 · a13c742 · a13c742
1 parent 3511900
commit a13c742
Show file tree

Hide file tree

Showing 164 changed files with 595 additions and 608 deletions.
diff --git a/domene/pom.xml b/domene/pom.xml
@@ -14,11 +14,11 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-micrometer</artifactId>
         </dependency>
         <dependency>

diff --git a/...ain/java/no/nav/foreldrepenger/los/admin/SynkroniseringHendelseTaskOppretterTjeneste.java b/...ain/java/no/nav/foreldrepenger/los/admin/SynkroniseringHendelseTaskOppretterTjeneste.java
@@ -5,8 +5,8 @@
 import java.util.List;
 import java.util.UUID;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/domene/src/main/java/no/nav/foreldrepenger/los/admin/driftsmelding/Driftsmelding.java b/domene/src/main/java/no/nav/foreldrepenger/los/admin/driftsmelding/Driftsmelding.java
@@ -3,14 +3,14 @@
 import java.time.LocalDateTime;
 import java.util.Objects;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.Table;
 
 import no.nav.foreldrepenger.los.felles.BaseEntitet;
 

diff --git a/.../src/main/java/no/nav/foreldrepenger/los/admin/driftsmelding/DriftsmeldingRepository.java b/.../src/main/java/no/nav/foreldrepenger/los/admin/driftsmelding/DriftsmeldingRepository.java
@@ -3,9 +3,9 @@
 import java.time.LocalDateTime;
 import java.util.List;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
 
 @ApplicationScoped
 public class DriftsmeldingRepository {

diff --git a/...ne/src/main/java/no/nav/foreldrepenger/los/admin/driftsmelding/DriftsmeldingTjeneste.java b/...ne/src/main/java/no/nav/foreldrepenger/los/admin/driftsmelding/DriftsmeldingTjeneste.java
@@ -1,7 +1,7 @@
 package no.nav.foreldrepenger.los.admin.driftsmelding;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import java.util.List;
 

diff --git a/...in/java/no/nav/foreldrepenger/los/avdelingsleder/AvdelingslederSaksbehandlerTjeneste.java b/...in/java/no/nav/foreldrepenger/los/avdelingsleder/AvdelingslederSaksbehandlerTjeneste.java
@@ -3,8 +3,8 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import no.nav.foreldrepenger.los.oppgave.OppgaveRepository;
 import no.nav.foreldrepenger.los.organisasjon.Avdeling;

diff --git a/domene/src/main/java/no/nav/foreldrepenger/los/avdelingsleder/AvdelingslederTjeneste.java b/domene/src/main/java/no/nav/foreldrepenger/los/avdelingsleder/AvdelingslederTjeneste.java
@@ -4,8 +4,8 @@
 import java.util.List;
 import java.util.Optional;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/domene/src/main/java/no/nav/foreldrepenger/los/domene/typer/BehandlingId.java b/domene/src/main/java/no/nav/foreldrepenger/los/domene/typer/BehandlingId.java
@@ -3,8 +3,8 @@
 import java.util.Objects;
 import java.util.UUID;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 
 @Embeddable
 public class BehandlingId implements Comparable<UUID> {

diff --git a/domene/src/main/java/no/nav/foreldrepenger/los/domene/typer/aktør/AktørId.java b/domene/src/main/java/no/nav/foreldrepenger/los/domene/typer/aktør/AktørId.java
@@ -5,9 +5,9 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.regex.Pattern;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.validation.constraints.NotNull;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 
@@ -25,7 +25,7 @@ public class AktørId implements Serializable, Comparable<AktørId> {
 
     @JsonValue
     @NotNull
-    @javax.validation.constraints.Pattern(regexp = VALID_REGEXP, message = "aktørId ${validatedValue} har ikke gyldig verdi (pattern '{regexp}')")
+    @jakarta.validation.constraints.Pattern(regexp = VALID_REGEXP, message = "aktørId ${validatedValue} har ikke gyldig verdi (pattern '{regexp}')")
     @Column(name = "AKTOR_ID", updatable = false, length = 50)
     private String aktørId;  // NOSONAR
 

diff --git a/domene/src/main/java/no/nav/foreldrepenger/los/felles/BaseEntitet.java b/domene/src/main/java/no/nav/foreldrepenger/los/felles/BaseEntitet.java
@@ -4,11 +4,11 @@
 import java.time.LocalDateTime;
 import java.util.Optional;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.PrePersist;
+import jakarta.persistence.PreUpdate;
 
 import no.nav.vedtak.sikkerhet.kontekst.Kontekst;
 import no.nav.vedtak.sikkerhet.kontekst.KontekstHolder;

diff --git a/...c/main/java/no/nav/foreldrepenger/los/felles/prosesstask/RekjørFeiledeTasksBatchTask.java b/...c/main/java/no/nav/foreldrepenger/los/felles/prosesstask/RekjørFeiledeTasksBatchTask.java
@@ -1,7 +1,7 @@
 package no.nav.foreldrepenger.los.felles.prosesstask;
 
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/.../src/main/java/no/nav/foreldrepenger/los/felles/prosesstask/SlettGamleTasksBatchTask.java b/.../src/main/java/no/nav/foreldrepenger/los/felles/prosesstask/SlettGamleTasksBatchTask.java
@@ -1,7 +1,7 @@
 package no.nav.foreldrepenger.los.felles.prosesstask;
 
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...ne/src/main/java/no/nav/foreldrepenger/los/felles/util/validering/KodeverdiValidator.java b/...ne/src/main/java/no/nav/foreldrepenger/los/felles/util/validering/KodeverdiValidator.java
@@ -3,7 +3,7 @@
 
 import java.util.Objects;
 
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidatorContext;
 
 import no.nav.foreldrepenger.los.felles.Kodeverdi;
 

diff --git a/domene/src/main/java/no/nav/foreldrepenger/los/felles/util/validering/KodeverkValidator.java b/domene/src/main/java/no/nav/foreldrepenger/los/felles/util/validering/KodeverkValidator.java
@@ -3,7 +3,7 @@
 import java.util.Objects;
 import java.util.regex.Pattern;
 
-import javax.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidator;
 
 import no.nav.vedtak.util.InputValideringRegex;
 

diff --git a/domene/src/main/java/no/nav/foreldrepenger/los/felles/util/validering/ValidKodeverk.java b/domene/src/main/java/no/nav/foreldrepenger/los/felles/util/validering/ValidKodeverk.java
@@ -6,8 +6,8 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 @Target({ElementType.TYPE_USE, ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE})
 @Retention(RetentionPolicy.RUNTIME)

diff --git a/...e/src/main/java/no/nav/foreldrepenger/los/hendelse/behandlinghendelse/AktørPipKlient.java b/...e/src/main/java/no/nav/foreldrepenger/los/hendelse/behandlinghendelse/AktørPipKlient.java
@@ -2,8 +2,8 @@
 
 import java.util.List;
 
-import javax.enterprise.context.Dependent;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.enterprise.context.Dependent;
+import jakarta.ws.rs.core.UriBuilder;
 
 import no.nav.foreldrepenger.los.domene.typer.Saksnummer;
 import no.nav.vedtak.felles.integrasjon.rest.FpApplication;

diff --git a/...ava/no/nav/foreldrepenger/los/hendelse/behandlinghendelse/BehandlingHendelseConsumer.java b/...ava/no/nav/foreldrepenger/los/hendelse/behandlinghendelse/BehandlingHendelseConsumer.java
@@ -4,8 +4,8 @@
 
 import java.time.Duration;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.apache.kafka.streams.KafkaStreams;
 import org.apache.kafka.streams.StreamsBuilder;

diff --git a/...va/no/nav/foreldrepenger/los/hendelse/behandlinghendelse/BehandlingHendelseHåndterer.java b/...va/no/nav/foreldrepenger/los/hendelse/behandlinghendelse/BehandlingHendelseHåndterer.java
@@ -3,10 +3,10 @@
 import java.time.Instant;
 import java.util.Set;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.control.ActivateRequestContext;
-import javax.inject.Inject;
-import javax.transaction.Transactional;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.control.ActivateRequestContext;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...in/java/no/nav/foreldrepenger/los/hendelse/behandlinghendelse/BehandlingHendelseTask.java b/...in/java/no/nav/foreldrepenger/los/hendelse/behandlinghendelse/BehandlingHendelseTask.java
@@ -2,8 +2,8 @@
 
 import java.util.UUID;
 
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...ain/java/no/nav/foreldrepenger/los/hendelse/behandlinghendelse/FpsakBehandlingKlient.java b/...ain/java/no/nav/foreldrepenger/los/hendelse/behandlinghendelse/FpsakBehandlingKlient.java
@@ -3,8 +3,8 @@
 import java.net.URI;
 import java.util.UUID;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.ws.rs.core.UriBuilder;
 
 import no.nav.foreldrepenger.los.domene.typer.Saksnummer;
 import no.nav.vedtak.felles.integrasjon.rest.FpApplication;

diff --git a/...java/no/nav/foreldrepenger/los/hendelse/behandlinghendelse/FptilbakeBehandlingKlient.java b/...java/no/nav/foreldrepenger/los/hendelse/behandlinghendelse/FptilbakeBehandlingKlient.java
@@ -3,8 +3,8 @@
 import java.net.URI;
 import java.util.UUID;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.ws.rs.core.UriBuilder;
 
 import no.nav.vedtak.felles.integrasjon.rest.FpApplication;
 import no.nav.vedtak.felles.integrasjon.rest.RestClient;

diff --git a/.../src/main/java/no/nav/foreldrepenger/los/hendelse/behandlinghendelse/MottattHendelse.java b/.../src/main/java/no/nav/foreldrepenger/los/hendelse/behandlinghendelse/MottattHendelse.java
@@ -1,21 +1,25 @@
 package no.nav.foreldrepenger.los.hendelse.behandlinghendelse;
 
-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;
 
+import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.annotations.NaturalId;
 
 import no.nav.foreldrepenger.los.felles.BaseEntitet;
 
+import java.sql.Types;
+
 
 @Entity(name = "MottattHendelse")
 @Table(name = "MOTTATT_HENDELSE")
 public class MottattHendelse extends BaseEntitet {
 
     @Id
     @NaturalId
+    @JdbcTypeCode(Types.VARCHAR)
     @Column(name = "hendelse_uid")
     private String hendelseUid;
 

diff --git a/...java/no/nav/foreldrepenger/los/hendelse/behandlinghendelse/MottattHendelseRepository.java b/...java/no/nav/foreldrepenger/los/hendelse/behandlinghendelse/MottattHendelseRepository.java
@@ -2,11 +2,11 @@
 
 import java.time.LocalDateTime;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
+import org.hibernate.jpa.HibernateHints;
 
-import org.hibernate.jpa.QueryHints;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
 
 @ApplicationScoped
 public class MottattHendelseRepository {
@@ -23,9 +23,9 @@ public MottattHendelseRepository(EntityManager entityManager) {
     }
 
     public boolean hendelseErNy(String hendelseUid) {
-        var query = entityManager.createQuery("from MottattHendelse where hendelse_uid=:hendelse_uid", MottattHendelse.class)
+        var query = entityManager.createQuery("from MottattHendelse where hendelseUid=:hendelse_uid", MottattHendelse.class)
             .setParameter("hendelse_uid", hendelseUid)
-            .setHint(QueryHints.HINT_READONLY, "true");
+            .setHint(HibernateHints.HINT_READ_ONLY, "true");
         return query.getResultList().isEmpty();
     }
 

diff --git a/...src/main/java/no/nav/foreldrepenger/los/hendelse/hendelsehåndterer/Beskyttelsesbehov.java b/...src/main/java/no/nav/foreldrepenger/los/hendelse/hendelsehåndterer/Beskyttelsesbehov.java
@@ -2,8 +2,8 @@
 
 import java.util.Set;
 
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
 
 import no.nav.foreldrepenger.los.domene.typer.Saksnummer;
 import no.nav.foreldrepenger.los.hendelse.behandlinghendelse.AktørPipKlient;

diff --git a/...n/java/no/nav/foreldrepenger/los/hendelse/hendelsehåndterer/OppgaveEgenskapHåndterer.java b/...n/java/no/nav/foreldrepenger/los/hendelse/hendelsehåndterer/OppgaveEgenskapHåndterer.java
@@ -5,9 +5,9 @@
 import java.util.List;
 import java.util.Optional;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.transaction.Transactional;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...av/foreldrepenger/los/hendelse/hendelsehåndterer/fpsak/FpsakOppgaveHendelseHåndterer.java b/...av/foreldrepenger/los/hendelse/hendelsehåndterer/fpsak/FpsakOppgaveHendelseHåndterer.java
@@ -4,10 +4,10 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/.../hendelsehåndterer/fpsak/håndterere/GenerellOpprettOppgaveOppgavetransisjonHåndterer.java b/.../hendelsehåndterer/fpsak/håndterere/GenerellOpprettOppgaveOppgavetransisjonHåndterer.java
@@ -1,7 +1,7 @@
 package no.nav.foreldrepenger.los.hendelse.hendelsehåndterer.fpsak.håndterere;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...endelse/hendelsehåndterer/fpsak/håndterere/GjenåpneOppgaveOppgavetransisjonHåndterer.java b/...endelse/hendelsehåndterer/fpsak/håndterere/GjenåpneOppgaveOppgavetransisjonHåndterer.java
@@ -5,8 +5,8 @@
 import java.util.Comparator;
 import java.util.List;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/.../hendelsehåndterer/fpsak/håndterere/IkkeRelevantForOppgaveOppgavetransisjonHåndterer.java b/.../hendelsehåndterer/fpsak/håndterere/IkkeRelevantForOppgaveOppgavetransisjonHåndterer.java
@@ -1,6 +1,6 @@
 package no.nav.foreldrepenger.los.hendelse.hendelsehåndterer.fpsak.håndterere;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...os/hendelse/hendelsehåndterer/fpsak/håndterere/LukkOppgaveOppgavetransisjonHåndterer.java b/...os/hendelse/hendelsehåndterer/fpsak/håndterere/LukkOppgaveOppgavetransisjonHåndterer.java
@@ -1,7 +1,7 @@
 package no.nav.foreldrepenger.los.hendelse.hendelsehåndterer.fpsak.håndterere;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;