diff --git a/pom.xml b/pom.xml index 805da689b..6ad3e07be 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ UTF-8 2.0.10 2.2 - 2.7.7 + 3.0.0 4.2.3 29.0-jre 2.12.0 diff --git a/src/main/java/uk/gov/pay/adminusers/persistence/dao/ForgottenPasswordDao.java b/src/main/java/uk/gov/pay/adminusers/persistence/dao/ForgottenPasswordDao.java index e27058c7c..c3180d2b7 100644 --- a/src/main/java/uk/gov/pay/adminusers/persistence/dao/ForgottenPasswordDao.java +++ b/src/main/java/uk/gov/pay/adminusers/persistence/dao/ForgottenPasswordDao.java @@ -4,9 +4,9 @@ import com.google.inject.Provider; import com.google.inject.name.Named; import com.google.inject.persist.Transactional; +import jakarta.persistence.EntityManager; import uk.gov.pay.adminusers.persistence.entity.ForgottenPasswordEntity; -import javax.persistence.EntityManager; import java.time.ZoneId; import java.time.ZonedDateTime; import java.util.Optional; diff --git a/src/main/java/uk/gov/pay/adminusers/persistence/dao/GovUkPayAgreementDao.java b/src/main/java/uk/gov/pay/adminusers/persistence/dao/GovUkPayAgreementDao.java index dbf5a7899..a97d3edc9 100644 --- a/src/main/java/uk/gov/pay/adminusers/persistence/dao/GovUkPayAgreementDao.java +++ b/src/main/java/uk/gov/pay/adminusers/persistence/dao/GovUkPayAgreementDao.java @@ -2,10 +2,10 @@ import com.google.inject.Provider; import com.google.inject.persist.Transactional; +import jakarta.persistence.EntityManager; import uk.gov.pay.adminusers.persistence.entity.GovUkPayAgreementEntity; import javax.inject.Inject; -import javax.persistence.EntityManager; import java.util.Optional; @Transactional diff --git a/src/main/java/uk/gov/pay/adminusers/persistence/dao/InviteDao.java b/src/main/java/uk/gov/pay/adminusers/persistence/dao/InviteDao.java index bea88349a..76d67f4bf 100644 --- a/src/main/java/uk/gov/pay/adminusers/persistence/dao/InviteDao.java +++ b/src/main/java/uk/gov/pay/adminusers/persistence/dao/InviteDao.java @@ -3,9 +3,9 @@ import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.persist.Transactional; +import jakarta.persistence.EntityManager; import uk.gov.pay.adminusers.persistence.entity.InviteEntity; -import javax.persistence.EntityManager; import java.util.List; import java.util.Optional; diff --git a/src/main/java/uk/gov/pay/adminusers/persistence/dao/JpaDao.java b/src/main/java/uk/gov/pay/adminusers/persistence/dao/JpaDao.java index 181b7d430..fb311e35e 100644 --- a/src/main/java/uk/gov/pay/adminusers/persistence/dao/JpaDao.java +++ b/src/main/java/uk/gov/pay/adminusers/persistence/dao/JpaDao.java @@ -2,8 +2,8 @@ import com.google.inject.Provider; import com.google.inject.persist.Transactional; +import jakarta.persistence.EntityManager; -import javax.persistence.EntityManager; import java.util.Optional; @Transactional diff --git a/src/main/java/uk/gov/pay/adminusers/persistence/dao/RoleDao.java b/src/main/java/uk/gov/pay/adminusers/persistence/dao/RoleDao.java index 5920589ed..ff3158ade 100644 --- a/src/main/java/uk/gov/pay/adminusers/persistence/dao/RoleDao.java +++ b/src/main/java/uk/gov/pay/adminusers/persistence/dao/RoleDao.java @@ -3,9 +3,9 @@ import com.google.inject.Inject; import com.google.inject.Provider; +import jakarta.persistence.EntityManager; import uk.gov.pay.adminusers.persistence.entity.RoleEntity; -import javax.persistence.EntityManager; import java.util.Optional; /** diff --git a/src/main/java/uk/gov/pay/adminusers/persistence/dao/ServiceDao.java b/src/main/java/uk/gov/pay/adminusers/persistence/dao/ServiceDao.java index c4ad7806d..9c80c0361 100644 --- a/src/main/java/uk/gov/pay/adminusers/persistence/dao/ServiceDao.java +++ b/src/main/java/uk/gov/pay/adminusers/persistence/dao/ServiceDao.java @@ -2,11 +2,11 @@ import com.google.inject.Provider; import com.google.inject.persist.Transactional; +import jakarta.persistence.EntityManager; import uk.gov.pay.adminusers.persistence.entity.GatewayAccountIdEntity; import uk.gov.pay.adminusers.persistence.entity.ServiceEntity; import javax.inject.Inject; -import javax.persistence.EntityManager; import java.util.List; import java.util.Optional; diff --git a/src/main/java/uk/gov/pay/adminusers/persistence/dao/ServiceRoleDao.java b/src/main/java/uk/gov/pay/adminusers/persistence/dao/ServiceRoleDao.java index 6a4210dd0..cbc34ee8e 100644 --- a/src/main/java/uk/gov/pay/adminusers/persistence/dao/ServiceRoleDao.java +++ b/src/main/java/uk/gov/pay/adminusers/persistence/dao/ServiceRoleDao.java @@ -3,9 +3,9 @@ import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.persist.Transactional; +import jakarta.persistence.EntityManager; import uk.gov.pay.adminusers.persistence.entity.ServiceRoleEntity; -import javax.persistence.EntityManager; @Transactional public class ServiceRoleDao extends JpaDao { diff --git a/src/main/java/uk/gov/pay/adminusers/persistence/dao/StripeAgreementDao.java b/src/main/java/uk/gov/pay/adminusers/persistence/dao/StripeAgreementDao.java index ecf6be213..0c7bb5118 100644 --- a/src/main/java/uk/gov/pay/adminusers/persistence/dao/StripeAgreementDao.java +++ b/src/main/java/uk/gov/pay/adminusers/persistence/dao/StripeAgreementDao.java @@ -2,10 +2,10 @@ import com.google.inject.Provider; import com.google.inject.persist.Transactional; +import jakarta.persistence.EntityManager; import uk.gov.pay.adminusers.persistence.entity.StripeAgreementEntity; import javax.inject.Inject; -import javax.persistence.EntityManager; import java.util.Optional; @Transactional diff --git a/src/main/java/uk/gov/pay/adminusers/persistence/dao/UserDao.java b/src/main/java/uk/gov/pay/adminusers/persistence/dao/UserDao.java index a269a2dbe..71625ed88 100644 --- a/src/main/java/uk/gov/pay/adminusers/persistence/dao/UserDao.java +++ b/src/main/java/uk/gov/pay/adminusers/persistence/dao/UserDao.java @@ -2,11 +2,11 @@ import com.google.inject.Provider; import com.google.inject.persist.Transactional; +import jakarta.persistence.EntityManager; import uk.gov.pay.adminusers.persistence.entity.ServiceRoleEntity; import uk.gov.pay.adminusers.persistence.entity.UserEntity; import javax.inject.Inject; -import javax.persistence.EntityManager; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; diff --git a/src/main/java/uk/gov/pay/adminusers/persistence/entity/AbstractEntity.java b/src/main/java/uk/gov/pay/adminusers/persistence/entity/AbstractEntity.java index 6b99bcfe8..fc713f7c0 100644 --- a/src/main/java/uk/gov/pay/adminusers/persistence/entity/AbstractEntity.java +++ b/src/main/java/uk/gov/pay/adminusers/persistence/entity/AbstractEntity.java @@ -1,11 +1,12 @@ package uk.gov.pay.adminusers.persistence.entity; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; + import java.io.Serializable; @MappedSuperclass diff --git a/src/main/java/uk/gov/pay/adminusers/persistence/entity/CustomBrandingConverter.java b/src/main/java/uk/gov/pay/adminusers/persistence/entity/CustomBrandingConverter.java index fb769692d..381115a04 100644 --- a/src/main/java/uk/gov/pay/adminusers/persistence/entity/CustomBrandingConverter.java +++ b/src/main/java/uk/gov/pay/adminusers/persistence/entity/CustomBrandingConverter.java @@ -3,10 +3,10 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; import org.postgresql.util.PGobject; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; import java.io.IOException; import java.sql.SQLException; import java.util.Map; diff --git a/src/main/java/uk/gov/pay/adminusers/persistence/entity/ForgottenPasswordEntity.java b/src/main/java/uk/gov/pay/adminusers/persistence/entity/ForgottenPasswordEntity.java index 444b8b5d5..65df246c9 100644 --- a/src/main/java/uk/gov/pay/adminusers/persistence/entity/ForgottenPasswordEntity.java +++ b/src/main/java/uk/gov/pay/adminusers/persistence/entity/ForgottenPasswordEntity.java @@ -1,14 +1,14 @@ package uk.gov.pay.adminusers.persistence.entity; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import uk.gov.pay.adminusers.model.ForgottenPassword; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; import java.time.ZoneId; import java.time.ZonedDateTime; diff --git a/src/main/java/uk/gov/pay/adminusers/persistence/entity/GatewayAccountIdEntity.java b/src/main/java/uk/gov/pay/adminusers/persistence/entity/GatewayAccountIdEntity.java index 92251aa74..51e372fee 100644 --- a/src/main/java/uk/gov/pay/adminusers/persistence/entity/GatewayAccountIdEntity.java +++ b/src/main/java/uk/gov/pay/adminusers/persistence/entity/GatewayAccountIdEntity.java @@ -1,15 +1,15 @@ package uk.gov.pay.adminusers.persistence.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; @Entity @Table(name = "service_gateway_accounts") diff --git a/src/main/java/uk/gov/pay/adminusers/persistence/entity/GovUkPayAgreementEntity.java b/src/main/java/uk/gov/pay/adminusers/persistence/entity/GovUkPayAgreementEntity.java index 52f95277c..eb09d93a7 100644 --- a/src/main/java/uk/gov/pay/adminusers/persistence/entity/GovUkPayAgreementEntity.java +++ b/src/main/java/uk/gov/pay/adminusers/persistence/entity/GovUkPayAgreementEntity.java @@ -1,17 +1,17 @@ package uk.gov.pay.adminusers.persistence.entity; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import uk.gov.pay.adminusers.model.GovUkPayAgreement; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; import java.time.ZonedDateTime; @Entity diff --git a/src/main/java/uk/gov/pay/adminusers/persistence/entity/InviteEntity.java b/src/main/java/uk/gov/pay/adminusers/persistence/entity/InviteEntity.java index 0eacd439a..18cbf5531 100644 --- a/src/main/java/uk/gov/pay/adminusers/persistence/entity/InviteEntity.java +++ b/src/main/java/uk/gov/pay/adminusers/persistence/entity/InviteEntity.java @@ -1,17 +1,17 @@ package uk.gov.pay.adminusers.persistence.entity; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import uk.gov.pay.adminusers.app.util.RandomIdGenerator; import uk.gov.pay.adminusers.model.Invite; import uk.gov.pay.adminusers.model.InviteType; import uk.gov.pay.adminusers.model.SecondFactorMethod; import uk.gov.pay.adminusers.utils.telephonenumber.TelephoneNumberUtility; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; import java.time.ZoneId; import java.time.ZonedDateTime; import java.util.Locale; diff --git a/src/main/java/uk/gov/pay/adminusers/persistence/entity/InviteTypeConverter.java b/src/main/java/uk/gov/pay/adminusers/persistence/entity/InviteTypeConverter.java index b3c346f63..98324471e 100644 --- a/src/main/java/uk/gov/pay/adminusers/persistence/entity/InviteTypeConverter.java +++ b/src/main/java/uk/gov/pay/adminusers/persistence/entity/InviteTypeConverter.java @@ -1,10 +1,9 @@ package uk.gov.pay.adminusers.persistence.entity; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; import uk.gov.pay.adminusers.model.InviteType; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; - @Converter public class InviteTypeConverter implements AttributeConverter { diff --git a/src/main/java/uk/gov/pay/adminusers/persistence/entity/MerchantDetailsEntity.java b/src/main/java/uk/gov/pay/adminusers/persistence/entity/MerchantDetailsEntity.java index 8b3e1c64a..ab65bcd15 100644 --- a/src/main/java/uk/gov/pay/adminusers/persistence/entity/MerchantDetailsEntity.java +++ b/src/main/java/uk/gov/pay/adminusers/persistence/entity/MerchantDetailsEntity.java @@ -1,10 +1,10 @@ package uk.gov.pay.adminusers.persistence.entity; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import uk.gov.pay.adminusers.model.MerchantDetails; import uk.gov.pay.adminusers.model.UpdateMerchantDetailsRequest; -import javax.persistence.Column; -import javax.persistence.Embeddable; import java.util.Objects; @Embeddable diff --git a/src/main/java/uk/gov/pay/adminusers/persistence/entity/PermissionEntity.java b/src/main/java/uk/gov/pay/adminusers/persistence/entity/PermissionEntity.java index 678fb01fe..150c9b02d 100644 --- a/src/main/java/uk/gov/pay/adminusers/persistence/entity/PermissionEntity.java +++ b/src/main/java/uk/gov/pay/adminusers/persistence/entity/PermissionEntity.java @@ -1,13 +1,12 @@ package uk.gov.pay.adminusers.persistence.entity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.eclipse.persistence.annotations.ReadOnly; import uk.gov.pay.adminusers.model.Permission; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - /** * Represents a single Permission assignable to a selfservice user (Government department user) *

diff --git a/src/main/java/uk/gov/pay/adminusers/persistence/entity/RoleEntity.java b/src/main/java/uk/gov/pay/adminusers/persistence/entity/RoleEntity.java index 8686d43f9..a2261fe8d 100644 --- a/src/main/java/uk/gov/pay/adminusers/persistence/entity/RoleEntity.java +++ b/src/main/java/uk/gov/pay/adminusers/persistence/entity/RoleEntity.java @@ -1,16 +1,16 @@ package uk.gov.pay.adminusers.persistence.entity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import org.eclipse.persistence.annotations.ReadOnly; import uk.gov.pay.adminusers.model.Role; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.Table; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/uk/gov/pay/adminusers/persistence/entity/SecondFactorMethodConverter.java b/src/main/java/uk/gov/pay/adminusers/persistence/entity/SecondFactorMethodConverter.java index 524833026..8a9c5a3be 100644 --- a/src/main/java/uk/gov/pay/adminusers/persistence/entity/SecondFactorMethodConverter.java +++ b/src/main/java/uk/gov/pay/adminusers/persistence/entity/SecondFactorMethodConverter.java @@ -1,10 +1,9 @@ package uk.gov.pay.adminusers.persistence.entity; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; import uk.gov.pay.adminusers.model.SecondFactorMethod; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; - @Converter public class SecondFactorMethodConverter implements AttributeConverter { diff --git a/src/main/java/uk/gov/pay/adminusers/persistence/entity/ServiceEntity.java b/src/main/java/uk/gov/pay/adminusers/persistence/entity/ServiceEntity.java index f4ccb8158..f87e62384 100644 --- a/src/main/java/uk/gov/pay/adminusers/persistence/entity/ServiceEntity.java +++ b/src/main/java/uk/gov/pay/adminusers/persistence/entity/ServiceEntity.java @@ -1,24 +1,24 @@ package uk.gov.pay.adminusers.persistence.entity; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import uk.gov.pay.adminusers.model.GoLiveStage; import uk.gov.pay.adminusers.model.Service; import uk.gov.pay.adminusers.model.ServiceName; import uk.gov.pay.adminusers.persistence.entity.service.ServiceNameEntity; import uk.gov.pay.commons.model.SupportedLanguage; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.HashSet; @@ -27,9 +27,9 @@ import java.util.Set; import java.util.stream.Collectors; +import static jakarta.persistence.EnumType.STRING; import static java.time.ZoneOffset.UTC; import static java.util.Arrays.asList; -import static javax.persistence.EnumType.STRING; import static uk.gov.pay.adminusers.app.util.RandomIdGenerator.randomUuid; @Entity diff --git a/src/main/java/uk/gov/pay/adminusers/persistence/entity/ServiceRoleEntity.java b/src/main/java/uk/gov/pay/adminusers/persistence/entity/ServiceRoleEntity.java index 3735711db..140ec40ed 100644 --- a/src/main/java/uk/gov/pay/adminusers/persistence/entity/ServiceRoleEntity.java +++ b/src/main/java/uk/gov/pay/adminusers/persistence/entity/ServiceRoleEntity.java @@ -1,14 +1,14 @@ package uk.gov.pay.adminusers.persistence.entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; +import jakarta.persistence.Table; import uk.gov.pay.adminusers.model.ServiceRole; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; -import javax.persistence.Table; @Entity @Table(name = "user_services_roles") diff --git a/src/main/java/uk/gov/pay/adminusers/persistence/entity/StripeAgreementEntity.java b/src/main/java/uk/gov/pay/adminusers/persistence/entity/StripeAgreementEntity.java index ebfad7de7..6b0879a3b 100644 --- a/src/main/java/uk/gov/pay/adminusers/persistence/entity/StripeAgreementEntity.java +++ b/src/main/java/uk/gov/pay/adminusers/persistence/entity/StripeAgreementEntity.java @@ -1,17 +1,17 @@ package uk.gov.pay.adminusers.persistence.entity; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import uk.gov.pay.adminusers.model.StripeAgreement; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; import java.net.InetAddress; import java.net.UnknownHostException; import java.time.ZonedDateTime; @@ -19,7 +19,6 @@ @Entity @Table(name = "stripe_agreements") @SequenceGenerator(name = "stripe_agreements_id_seq_gen", sequenceName = "stripe_agreements_id_seq", allocationSize = 1) - public class StripeAgreementEntity { @Id diff --git a/src/main/java/uk/gov/pay/adminusers/persistence/entity/UTCDateTimeConverter.java b/src/main/java/uk/gov/pay/adminusers/persistence/entity/UTCDateTimeConverter.java index 38bcf6740..5181be8c2 100644 --- a/src/main/java/uk/gov/pay/adminusers/persistence/entity/UTCDateTimeConverter.java +++ b/src/main/java/uk/gov/pay/adminusers/persistence/entity/UTCDateTimeConverter.java @@ -1,7 +1,8 @@ package uk.gov.pay.adminusers.persistence.entity; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; + import java.sql.Timestamp; import java.time.ZoneId; import java.time.ZonedDateTime; diff --git a/src/main/java/uk/gov/pay/adminusers/persistence/entity/UserEntity.java b/src/main/java/uk/gov/pay/adminusers/persistence/entity/UserEntity.java index f843d4ac0..85054359a 100644 --- a/src/main/java/uk/gov/pay/adminusers/persistence/entity/UserEntity.java +++ b/src/main/java/uk/gov/pay/adminusers/persistence/entity/UserEntity.java @@ -1,5 +1,12 @@ package uk.gov.pay.adminusers.persistence.entity; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import uk.gov.pay.adminusers.app.util.RandomIdGenerator; import uk.gov.pay.adminusers.model.CreateUserRequest; import uk.gov.pay.adminusers.model.SecondFactorMethod; @@ -7,13 +14,6 @@ import uk.gov.pay.adminusers.model.User; import uk.gov.pay.adminusers.utils.telephonenumber.TelephoneNumberUtility; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; import java.time.ZoneId; import java.time.ZonedDateTime; import java.util.ArrayList; diff --git a/src/main/java/uk/gov/pay/adminusers/persistence/entity/UserServiceId.java b/src/main/java/uk/gov/pay/adminusers/persistence/entity/UserServiceId.java index 056b8cd09..0ced98661 100644 --- a/src/main/java/uk/gov/pay/adminusers/persistence/entity/UserServiceId.java +++ b/src/main/java/uk/gov/pay/adminusers/persistence/entity/UserServiceId.java @@ -1,7 +1,8 @@ package uk.gov.pay.adminusers.persistence.entity; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; + import java.io.Serializable; @Embeddable diff --git a/src/main/java/uk/gov/pay/adminusers/persistence/entity/service/ServiceNameEntity.java b/src/main/java/uk/gov/pay/adminusers/persistence/entity/service/ServiceNameEntity.java index 10a3e2fb4..c4b697436 100644 --- a/src/main/java/uk/gov/pay/adminusers/persistence/entity/service/ServiceNameEntity.java +++ b/src/main/java/uk/gov/pay/adminusers/persistence/entity/service/ServiceNameEntity.java @@ -1,22 +1,22 @@ package uk.gov.pay.adminusers.persistence.entity.service; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import uk.gov.pay.adminusers.persistence.entity.ServiceEntity; import uk.gov.pay.commons.model.SupportedLanguage; import uk.gov.pay.commons.model.SupportedLanguageJpaConverter; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; import java.util.Objects; @Entity diff --git a/src/test/java/uk/gov/pay/adminusers/persistence/dao/GovUkPayAgreementDaoIT.java b/src/test/java/uk/gov/pay/adminusers/persistence/dao/GovUkPayAgreementDaoIT.java index a67de5575..12200cad4 100644 --- a/src/test/java/uk/gov/pay/adminusers/persistence/dao/GovUkPayAgreementDaoIT.java +++ b/src/test/java/uk/gov/pay/adminusers/persistence/dao/GovUkPayAgreementDaoIT.java @@ -1,12 +1,12 @@ package uk.gov.pay.adminusers.persistence.dao; +import jakarta.persistence.RollbackException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import uk.gov.pay.adminusers.model.Service; import uk.gov.pay.adminusers.persistence.entity.GovUkPayAgreementEntity; import uk.gov.pay.adminusers.persistence.entity.ServiceEntity; -import javax.persistence.RollbackException; import java.time.ZoneOffset; import java.time.ZonedDateTime; import java.util.List; diff --git a/src/test/java/uk/gov/pay/adminusers/persistence/dao/StripeAgreementDaoIT.java b/src/test/java/uk/gov/pay/adminusers/persistence/dao/StripeAgreementDaoIT.java index 49224a8bc..c8007e1e1 100644 --- a/src/test/java/uk/gov/pay/adminusers/persistence/dao/StripeAgreementDaoIT.java +++ b/src/test/java/uk/gov/pay/adminusers/persistence/dao/StripeAgreementDaoIT.java @@ -1,12 +1,12 @@ package uk.gov.pay.adminusers.persistence.dao; +import jakarta.persistence.RollbackException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import uk.gov.pay.adminusers.model.Service; import uk.gov.pay.adminusers.persistence.entity.ServiceEntity; import uk.gov.pay.adminusers.persistence.entity.StripeAgreementEntity; -import javax.persistence.RollbackException; import java.sql.Timestamp; import java.time.ZoneId; import java.time.ZonedDateTime;