chore(deps): bump org.hibernate:hibernate-core from 5.1.17.Final to 5.3.20.Final

AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/auditview/control/AuditHandler.java

@@ -13,9 +13,9 @@
 import org.hibernate.envers.query.AuditEntity;
 
 import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.PersistenceContext;
 
 import static org.hibernate.envers.RevisionType.DEL;
 
@@ -36,7 +36,7 @@ public AuditViewEntry createGenericAuditViewEntry(AuditViewEntryContainer auditV
         Auditable entityForRevision = auditViewEntryContainer.getEntityForRevision();
         MyRevisionEntity revEntity = auditViewEntryContainer.getRevEntity();
 
-        AuditReader reader = AuditReaderFactory.get(entityManager);
+        AuditReader reader = AuditReaderFactory.get(entityManager.unwrap(org.hibernate.Session.class));
         Auditable previous = getPrevious(reader, entityForRevision, revEntity);
         return buildAuditViewEntry(auditViewEntryContainer, previous);
     }

AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/auditview/control/AuditService.java

@@ -43,8 +43,8 @@
 
 import javax.ejb.Stateless;
 import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import java.util.*;
 import java.util.logging.Logger;
 
@@ -68,7 +68,7 @@ public <T> Object getDeletedEntity(T entity, Integer id) {
         Objects.requireNonNull(entity, "Entity can not be null");
         Objects.requireNonNull(id, "Id can not be null");
 
-        AuditReader reader = AuditReaderFactory.get(entityManager);
+        AuditReader reader = AuditReaderFactory.get(entityManager.unwrap(org.hibernate.Session.class));
 
         if (reader.isEntityClassAudited(entity.getClass())) {
             AuditQuery query = reader.createQuery()
@@ -88,7 +88,7 @@ public <T> Object getDeletedEntity(T entity, Integer id) {
     public List<Object> getAllDeletedEntities(Class clazz) {
         Objects.requireNonNull(clazz, "Clazz can not be null");
 
-        AuditReader reader = AuditReaderFactory.get(entityManager);
+        AuditReader reader = AuditReaderFactory.get(entityManager.unwrap(org.hibernate.Session.class));
 
         if (reader.isEntityClassAudited(clazz)) {
             AuditQuery query = reader.createQuery()
@@ -110,7 +110,7 @@ public List<Object> getAllDeletedEntities(Class clazz) {
     public List<AuditViewEntry> getAuditViewEntriesForResource(Integer resourceId) {
         // Map<Hashcode, AuditViewEntry>
         Map<Integer, AuditViewEntry> allAuditViewEntries = new HashMap<>();
-        AuditReader reader = AuditReaderFactory.get(entityManager);
+        AuditReader reader = AuditReaderFactory.get(entityManager.unwrap(org.hibernate.Session.class));
         CrossTypeRevisionChangesReader crossTypeRevisionChangesReader = reader.getCrossTypeRevisionChangesReader();
         List<MyRevisionEntity> revisionsForResource = getRevisionsForResource(resourceId);
         for (MyRevisionEntity revisionEntity : revisionsForResource) {

AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/configurationtag/control/TagConfigurationService.java

@@ -28,10 +28,10 @@
 
 import javax.ejb.Stateless;
 import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;

AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/configurationtag/entity/ResourceTagEntity.java

@@ -26,7 +26,7 @@
 import lombok.Setter;
 import org.hibernate.envers.Audited;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Date;
 
 @Entity

AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/database/control/AmwAuditReader.java

@@ -25,7 +25,7 @@
 import org.hibernate.envers.exception.RevisionDoesNotExistException;
 
 import javax.inject.Inject;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.Date;
 
 /**
@@ -37,7 +37,7 @@ public class AmwAuditReader {
 	private EntityManager entityManager;
 
 	protected AuditReader getAuditReader() {
-		return AuditReaderFactory.get(entityManager);
+		return AuditReaderFactory.get(entityManager.unwrap(org.hibernate.Session.class));
 	}
 
 	/**

AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/database/control/CriteriaRestriction.java

@@ -20,8 +20,8 @@
 
 package ch.puzzle.itc.mobiliar.business.database.control;
 
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
 
 public class CriteriaRestriction<RootType, PathType> {
 

AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/database/control/EntityManagerProducer.java

@@ -21,8 +21,8 @@
 package ch.puzzle.itc.mobiliar.business.database.control;
 
 import javax.enterprise.inject.Produces;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 
 
 public class EntityManagerProducer {

AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/database/control/JpaSqlResultMapper.java

@@ -31,7 +31,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 
 
 public class JpaSqlResultMapper {

AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/database/control/QueryUtils.java

@@ -27,9 +27,9 @@
 import java.sql.SQLException;
 import java.util.List;
 
-import javax.persistence.NoResultException;
-import javax.persistence.Query;
-import javax.persistence.Table;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.Query;
+import jakarta.persistence.Table;
 
 public class QueryUtils {
 

AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/database/control/SequencesService.java

@@ -26,8 +26,8 @@
 import javax.ejb.TransactionAttribute;
 import javax.ejb.TransactionAttributeType;
 import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.LockModeType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.LockModeType;
 import java.util.logging.Logger;
 
 /**

AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/database/entity/MyRevisionEntity.java

@@ -28,7 +28,7 @@
 import org.hibernate.envers.RevisionNumber;
 import org.hibernate.envers.RevisionTimestamp;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Set;
 
 @Entity

AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/database/entity/SequencesEntity.java

@@ -24,10 +24,10 @@
 import lombok.Getter;
 import lombok.Setter;
 
-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 java.io.Serializable;
 
 /**

AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/boundary/DeploymentBoundary.java

@@ -67,7 +67,7 @@
 import javax.ejb.TransactionAttributeType;
 import javax.enterprise.event.Event;
 import javax.inject.Inject;
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.*;
 import java.nio.file.*;
 import java.nio.file.attribute.BasicFileAttributeView;

AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/entity/DeploymentEntity.java

@@ -41,7 +41,7 @@
 
 import org.hibernate.annotations.BatchSize;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import java.io.Serializable;
 import java.io.StringReader;

AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/entity/NodeJobEntity.java

@@ -25,7 +25,7 @@
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Arrays;
 import java.util.List;
 

AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploy/validation/ValidFileNameValidator.java

@@ -6,6 +6,9 @@
 
 public class ValidFileNameValidator implements ConstraintValidator<ValidFileName, String> {
 
+    @Override
+    public void initialize(ValidFileName constraintAnnotation) {
+    }
 
     @Override
     public boolean isValid(String fileName, ConstraintValidatorContext constraintValidatorContext) {

AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploymentparameter/control/DeploymentParameterRepository.java

@@ -23,7 +23,7 @@
 import ch.puzzle.itc.mobiliar.business.deploymentparameter.entity.DeploymentParameter;
 
 import javax.inject.Inject;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.List;
 
 public class DeploymentParameterRepository {

AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploymentparameter/control/KeyRepository.java

@@ -24,7 +24,7 @@
 import ch.puzzle.itc.mobiliar.business.utils.BaseRepository;
 
 import javax.inject.Inject;
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import java.util.List;
 

AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploymentparameter/entity/DeploymentParameter.java

@@ -24,9 +24,9 @@
 import ch.puzzle.itc.mobiliar.business.deploy.entity.DeploymentEntity;
 import lombok.Getter;
 import lombok.Setter;
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Entity
 @Table(name = "TAMW_deployParam")
@@ -41,7 +41,7 @@ public class DeploymentParameter {
 
     @Getter
     @Column(unique = true, nullable = false)
-    @NotEmpty
+    @NotNull
     private String key;
 
     @Getter

AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/deploymentparameter/entity/Key.java

@@ -20,13 +20,13 @@
 
 package ch.puzzle.itc.mobiliar.business.deploymentparameter.entity;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import ch.puzzle.itc.mobiliar.business.database.control.Constants;
 import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.NamedIdentifiable;
 import lombok.Getter;
 import lombok.Setter;
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 
 @Entity
 @Table(name = "TAMW_deployParamKey")
@@ -42,7 +42,7 @@ public class Key implements NamedIdentifiable {
 
     @Getter
     @Column(nullable = false, unique = true)
-    @NotEmpty
+    @NotNull
     private String name;
 
     /**

AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/domain/applist/ApplistScreenDomainServiceQueries.java

@@ -23,9 +23,9 @@
 import java.util.List;
 
 import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.*;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.*;
 
 import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceEntity;
 import ch.puzzle.itc.mobiliar.business.resourcegroup.entity.ResourceTypeEntity;

AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/domain/commons/CommonDomainService.java

@@ -36,14 +36,14 @@
 
 import javax.ejb.Stateless;
 import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;

AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/domain/commons/CommonFilterService.java

@@ -27,8 +27,8 @@
 
 import javax.ejb.Stateless;
 import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
 import java.util.*;
 import java.util.logging.Logger;
 

AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/domain/commons/CommonQueries.java

@@ -26,9 +26,9 @@
 import ch.puzzle.itc.mobiliar.common.util.DefaultResourceTypeDefinition;
 
 import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.criteria.*;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
+import jakarta.persistence.criteria.*;
 
 public class CommonQueries {
 

AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/environment/control/ContextDomainService.java

@@ -31,8 +31,8 @@
 import javax.ejb.Stateless;
 import javax.enterprise.inject.Produces;
 import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 

AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/environment/control/ContextRepository.java

@@ -26,8 +26,8 @@
 import ch.puzzle.itc.mobiliar.business.utils.BaseRepository;
 
 import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
 import java.util.List;
 import java.util.Set;
 

AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/environment/control/EnvironmentsScreenDomainService.java

@@ -31,9 +31,9 @@
 
 import javax.ejb.Stateless;
 import javax.inject.Inject;
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.Query;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 

AMW_business/src/main/java/ch/puzzle/itc/mobiliar/business/environment/entity/AbstractContext.java

@@ -27,11 +27,11 @@
 import ch.puzzle.itc.mobiliar.business.database.control.Constants;
 import org.hibernate.envers.Audited;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.util.*;
 
-import static javax.persistence.CascadeType.ALL;
+import static jakarta.persistence.CascadeType.ALL;
 
 /**
  * Entity implementation class for Entity: AbstractResourceBase