Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring

backend/core/pom.xml

@@ -61,7 +61,7 @@
         <dependency>
             <groupId>gr.cite</groupId>
             <artifactId>data-tools</artifactId>
-            <version>2.1.3</version>
+            <version>2.1.4</version>
         </dependency>
         <dependency>
             <groupId>org.opencdmp</groupId>

backend/core/src/main/java/org/opencdmp/commons/types/descriptiontemplate/FieldEntity.java

@@ -14,7 +14,7 @@ public class FieldEntity {
     private int ordinal;
     @XmlElementWrapper(name = "schematics")
     @XmlElement(name = "schematic")
-    private List<String> schematics;
+    private List<String> semantics;
     @XmlElement(name="defaultValue")
     private DefaultValueEntity defaultValue;
     @XmlElementWrapper(name = "visibilityRules")
@@ -50,11 +50,11 @@ public class FieldEntity {
         this.ordinal = ordinal;
     }
 
-    public List<String> getSchematics() {
+    public List<String> getSemantics() {
-        return this.schematics;
+        return this.semantics;
     }
-    public void setSchematics(List<String> schematics) {
+    public void setSemantics(List<String> semantics) {
-        this.schematics = schematics;
+        this.semantics = semantics;
     }
 
     public BaseFieldDataEntity getData() {

backend/core/src/main/java/org/opencdmp/commons/types/descriptiontemplate/importexport/DescriptionTemplateFieldImportExport.java

@@ -42,7 +42,7 @@ public class DescriptionTemplateFieldImportExport {
 
     @XmlElementWrapper(name = "schematics")
     @XmlElement(name = "schematic")
-    private List<String> schematics;
+    private List<String> semantics;
 
     @XmlAttribute(name="includeInExport")
     private Boolean includeInExport;
@@ -95,12 +95,12 @@ public class DescriptionTemplateFieldImportExport {
         this.validations = validations;
     }
 
-    public List<String> getSchematics() {
+    public List<String> getSemantics() {
-        return this.schematics;
+        return this.semantics;
     }
 
-    public void setSchematics(List<String> schematics) {
+    public void setSemantics(List<String> semantics) {
-        this.schematics = schematics;
+        this.semantics = semantics;
     }
 
     public List<DescriptionTemplateRuleImportExport> getVisibilityRules() {

backend/core/src/main/java/org/opencdmp/data/tenant/TenantListener.java

@@ -1,19 +1,18 @@
 package org.opencdmp.data.tenant;
 
 
-import org.opencdmp.commons.scope.tenant.TenantScope;
-import org.opencdmp.commons.scope.tenant.TenantScoped;
-import org.opencdmp.errorcode.ErrorThesaurusProperties;
 import gr.cite.tools.exception.MyForbiddenException;
 import gr.cite.tools.logging.LoggerService;
 import jakarta.persistence.PrePersist;
 import jakarta.persistence.PreRemove;
 import jakarta.persistence.PreUpdate;
+import org.opencdmp.commons.scope.tenant.TenantScope;
+import org.opencdmp.commons.scope.tenant.TenantScoped;
+import org.opencdmp.errorcode.ErrorThesaurusProperties;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.management.InvalidApplicationException;
-
 import java.util.UUID;
 
 public class TenantListener {
@@ -33,13 +32,13 @@ public class TenantListener {
 
 	@PrePersist
 	public void setTenantOnCreate(TenantScoped entity) throws InvalidApplicationException {
-		if (tenantScope.isMultitenant()) {
+		if (this.tenantScope.isMultitenant()) {
-			if (entity.getTenantId() != null && (this.tenantScope.isDefaultTenant() || entity.getTenantId().compareTo(tenantScope.getTenant()) != 0)) {
+			if (entity.getTenantId() != null && (this.tenantScope.isDefaultTenant() || entity.getTenantId().compareTo(this.tenantScope.getTenant()) != 0)) {
 				logger.error("somebody tried to set not login tenant");
 				throw new MyForbiddenException(this.errors.getTenantTampering().getCode(), this.errors.getTenantTampering().getMessage());
 			}
-			if (!tenantScope.isDefaultTenant()) {
+			if (!this.tenantScope.isDefaultTenant()) {
-				final UUID tenantId = tenantScope.getTenant();
+				final UUID tenantId = this.tenantScope.getTenant();
 				entity.setTenantId(tenantId);
 			}
 		} else {
@@ -50,18 +49,18 @@ public class TenantListener {
 	@PreUpdate
 	@PreRemove
 	public void setTenantOnUpdate(TenantScoped entity) throws InvalidApplicationException {
-		if (tenantScope.isMultitenant()) {
+		if (this.tenantScope.isMultitenant()) {
-			if (!tenantScope.isDefaultTenant()) {
+			if (!this.tenantScope.isDefaultTenant()) {
 				if (entity.getTenantId() == null) {
 					logger.error("somebody tried to set null tenant");
 					throw new MyForbiddenException(this.errors.getTenantTampering().getCode(), this.errors.getTenantTampering().getMessage());
 				}
-				if (entity.getTenantId().compareTo(tenantScope.getTenant()) != 0) {
+				if (entity.getTenantId().compareTo(this.tenantScope.getTenant()) != 0) {
 					logger.error("somebody tried to change an entries tenant");
 					throw new MyForbiddenException(this.errors.getTenantTampering().getCode(), this.errors.getTenantTampering().getMessage());
 				}
 
-				final UUID tenantId = tenantScope.getTenant();
+				final UUID tenantId = this.tenantScope.getTenant();
 				entity.setTenantId(tenantId);
 			} else {
 				if (entity.getTenantId() != null) {
@@ -70,7 +69,7 @@ public class TenantListener {
 				}
 			}
 		} else {
-			if (entity.getTenantId() != null && (!this.tenantScope.isDefaultTenant() ||entity.getTenantId().compareTo(tenantScope.getTenant()) != 0)) {
+			if (entity.getTenantId() != null && (!this.tenantScope.isDefaultTenant() ||entity.getTenantId().compareTo(this.tenantScope.getTenant()) != 0)) {
 				logger.error("somebody tried to change an entries tenant");
 				throw new MyForbiddenException(this.errors.getTenantTampering().getCode(), this.errors.getTenantTampering().getMessage());
 			}

backend/core/src/main/java/org/opencdmp/integrationevent/InboxIntegrationEventConfigurer.java

@@ -1,31 +1,33 @@
 package org.opencdmp.integrationevent;
 
-import org.opencdmp.integrationevent.inbox.InboxProperties;
-import org.opencdmp.integrationevent.inbox.InboxRepositoryImpl;
 import gr.cite.queueinbox.InboxConfigurer;
 import gr.cite.queueinbox.repository.InboxRepository;
+import jakarta.persistence.EntityManagerFactory;
+import org.opencdmp.integrationevent.inbox.InboxProperties;
+import org.opencdmp.integrationevent.inbox.InboxRepositoryImpl;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.DependsOn;
 
 @Configuration
-@EnableConfigurationProperties({InboxProperties.class})
+@EnableConfigurationProperties(InboxProperties.class)
 @ConditionalOnProperty(prefix = "queue.task.listener", name = "enable", matchIfMissing = false)
 public class InboxIntegrationEventConfigurer extends InboxConfigurer {
-	private ApplicationContext applicationContext;
+	private final ApplicationContext applicationContext;
-	private InboxProperties inboxProperties;
+	private final InboxProperties inboxProperties;
+	private final EntityManagerFactory entityManagerFactory;
 
-	public InboxIntegrationEventConfigurer(ApplicationContext applicationContext, InboxProperties inboxProperties) {
+	public InboxIntegrationEventConfigurer(ApplicationContext applicationContext, InboxProperties inboxProperties, EntityManagerFactory entityManagerFactory) {
 		this.applicationContext = applicationContext;
 		this.inboxProperties = inboxProperties;
+		this.entityManagerFactory = entityManagerFactory;
 	}
 
 	@Bean
 	public InboxRepository inboxRepositoryCreator() {
-		return new InboxRepositoryImpl(this.applicationContext, this.inboxProperties);
+		return new InboxRepositoryImpl(this.applicationContext, this.inboxProperties, this.entityManagerFactory);
 	}
 }
 

backend/core/src/main/java/org/opencdmp/integrationevent/OutboxIntegrationEventConfigurer.java

@@ -1,15 +1,16 @@
 package org.opencdmp.integrationevent;
 
 
-import org.opencdmp.data.QueueOutboxEntity;
-import org.opencdmp.integrationevent.outbox.OutboxProperties;
-import org.opencdmp.integrationevent.outbox.OutboxRepositoryImpl;
 import gr.cite.queueoutbox.IntegrationEventContextCreator;
 import gr.cite.queueoutbox.OutboxConfigurer;
 import gr.cite.queueoutbox.repository.OutboxRepository;
 import gr.cite.rabbitmq.IntegrationEventMessageConstants;
 import gr.cite.rabbitmq.RabbitProperties;
 import gr.cite.rabbitmq.broker.MessageHydrator;
+import jakarta.persistence.EntityManagerFactory;
+import org.opencdmp.data.QueueOutboxEntity;
+import org.opencdmp.integrationevent.outbox.OutboxProperties;
+import org.opencdmp.integrationevent.outbox.OutboxRepositoryImpl;
 import org.springframework.amqp.core.MessageProperties;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -23,15 +24,17 @@ import java.time.Instant;
 import java.util.UUID;
 
 @Configuration
-@EnableConfigurationProperties({OutboxProperties.class})
+@EnableConfigurationProperties(OutboxProperties.class)
 @ConditionalOnProperty(prefix = "queue.task.publisher", name = "enable", matchIfMissing = false)
 public class OutboxIntegrationEventConfigurer extends OutboxConfigurer {
-	private ApplicationContext applicationContext;
+	private final ApplicationContext applicationContext;
-	private OutboxProperties outboxProperties;
+	private final OutboxProperties outboxProperties;
+	private final EntityManagerFactory entityManagerFactory;
 
-	public OutboxIntegrationEventConfigurer(ApplicationContext applicationContext, OutboxProperties outboxProperties) {
+	public OutboxIntegrationEventConfigurer(ApplicationContext applicationContext, OutboxProperties outboxProperties, EntityManagerFactory entityManagerFactory) {
 		this.applicationContext = applicationContext;
 		this.outboxProperties = outboxProperties;
+		this.entityManagerFactory = entityManagerFactory;
 	}
 
 	@Bean
@@ -67,7 +70,7 @@ public class OutboxIntegrationEventConfigurer extends OutboxConfigurer {
 
 	@Bean
 	public OutboxRepository outboxRepositoryCreator() {
-		return new OutboxRepositoryImpl(this.applicationContext, this.outboxProperties);
+		return new OutboxRepositoryImpl(this.applicationContext, this.outboxProperties, this.entityManagerFactory);
 	}
 }
 

backend/core/src/main/java/org/opencdmp/integrationevent/inbox/InboxRepositoryImpl.java

@@ -1,12 +1,5 @@
 package org.opencdmp.integrationevent.inbox;
 
-import org.opencdmp.commons.JsonHandlingService;
-import org.opencdmp.commons.enums.IsActive;
-import org.opencdmp.commons.fake.FakeRequestScope;
-import org.opencdmp.data.QueueInboxEntity;
-import org.opencdmp.data.TenantEntityManager;
-import org.opencdmp.integrationevent.TrackedEvent;
-import org.opencdmp.query.QueueInboxQuery;
 import gr.cite.queueinbox.entity.QueueInbox;
 import gr.cite.queueinbox.entity.QueueInboxStatus;
 import gr.cite.queueinbox.repository.CandidateInfo;
@@ -21,6 +14,13 @@ import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
 import jakarta.persistence.EntityTransaction;
 import jakarta.persistence.OptimisticLockException;
+import org.opencdmp.commons.JsonHandlingService;
+import org.opencdmp.commons.enums.IsActive;
+import org.opencdmp.commons.fake.FakeRequestScope;
+import org.opencdmp.data.QueueInboxEntity;
+import org.opencdmp.data.TenantEntityManager;
+import org.opencdmp.integrationevent.TrackedEvent;
+import org.opencdmp.query.QueueInboxQuery;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
 
@@ -36,13 +36,15 @@ public class InboxRepositoryImpl implements InboxRepository { private static fin
     private final JsonHandlingService jsonHandlingService;
 
     private final InboxProperties inboxProperties;
+    private final EntityManagerFactory entityManagerFactory;
 
     public InboxRepositoryImpl(
-            ApplicationContext applicationContext,
+		    ApplicationContext applicationContext,
-            InboxProperties inboxProperties
+		    InboxProperties inboxProperties, EntityManagerFactory entityManagerFactory
     ) {
         this.applicationContext = applicationContext;
-        this.jsonHandlingService = this.applicationContext.getBean(JsonHandlingService.class);
+	    this.entityManagerFactory = entityManagerFactory;
+	    this.jsonHandlingService = this.applicationContext.getBean(JsonHandlingService.class);
         this.inboxProperties = inboxProperties;
     }
 
@@ -54,8 +56,7 @@ public class InboxRepositoryImpl implements InboxRepository { private static fin
         try (FakeRequestScope ignored = new FakeRequestScope()) {
             try {
                 QueryFactory queryFactory = this.applicationContext.getBean(QueryFactory.class);
-                EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
+                entityManager = this.entityManagerFactory.createEntityManager();
-                entityManager = entityManagerFactory.createEntityManager();
 
                 transaction = entityManager.getTransaction();
                 transaction.begin();
@@ -112,9 +113,7 @@ public class InboxRepositoryImpl implements InboxRepository { private static fin
 
         try (FakeRequestScope ignored = new FakeRequestScope()) {
             try {
-                EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
+                entityManager = this.entityManagerFactory.createEntityManager();
-
-                entityManager = entityManagerFactory.createEntityManager();
                 transaction = entityManager.getTransaction();
 
                 transaction.begin();
@@ -158,9 +157,7 @@ public class InboxRepositoryImpl implements InboxRepository { private static fin
 
         try (FakeRequestScope ignored = new FakeRequestScope()) {
             try {
-                EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
+                entityManager = this.entityManagerFactory.createEntityManager();
-
-                entityManager = entityManagerFactory.createEntityManager();
                 transaction = entityManager.getTransaction();
 
                 transaction.begin();
@@ -206,9 +203,7 @@ public class InboxRepositoryImpl implements InboxRepository { private static fin
         try (FakeRequestScope ignored = new FakeRequestScope()) {
             try {
                 queueMessage = this.createQueueInboxEntity(inboxCreatorParams);
-                EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
+                entityManager = this.entityManagerFactory.createEntityManager();
-
-                entityManager = entityManagerFactory.createEntityManager();
                 transaction = entityManager.getTransaction();
 
                 transaction.begin();
@@ -266,10 +261,7 @@ public class InboxRepositoryImpl implements InboxRepository { private static fin
 
         try (FakeRequestScope ignored = new FakeRequestScope()) {
             try {
-
+                entityManager = this.entityManagerFactory.createEntityManager();
-                EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
-
-                entityManager = entityManagerFactory.createEntityManager();
                 transaction = entityManager.getTransaction();
 
                 TenantEntityManager tenantEntityManager = this.applicationContext.getBean(TenantEntityManager.class);

backend/core/src/main/java/org/opencdmp/integrationevent/outbox/OutboxRepositoryImpl.java

@@ -1,10 +1,5 @@
 package org.opencdmp.integrationevent.outbox;
 
-import org.opencdmp.commons.JsonHandlingService;
-import org.opencdmp.commons.enums.IsActive;
-import org.opencdmp.commons.fake.FakeRequestScope;
-import org.opencdmp.data.QueueOutboxEntity;
-import org.opencdmp.query.QueueOutboxQuery;
 import gr.cite.queueoutbox.entity.QueueOutbox;
 import gr.cite.queueoutbox.entity.QueueOutboxNotifyStatus;
 import gr.cite.queueoutbox.repository.CandidateInfo;
@@ -18,6 +13,11 @@ import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
 import jakarta.persistence.EntityTransaction;
 import jakarta.persistence.OptimisticLockException;
+import org.opencdmp.commons.JsonHandlingService;
+import org.opencdmp.commons.enums.IsActive;
+import org.opencdmp.commons.fake.FakeRequestScope;
+import org.opencdmp.data.QueueOutboxEntity;
+import org.opencdmp.query.QueueOutboxQuery;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
 
@@ -36,13 +36,15 @@ public class OutboxRepositoryImpl implements OutboxRepository {
     private final JsonHandlingService jsonHandlingService;
 
     private final OutboxProperties outboxProperties;
+    private final EntityManagerFactory entityManagerFactory;
 
     public OutboxRepositoryImpl(
-            ApplicationContext applicationContext,
+		    ApplicationContext applicationContext,
-            OutboxProperties outboxProperties
+		    OutboxProperties outboxProperties, EntityManagerFactory entityManagerFactory
     ) {
         this.applicationContext = applicationContext;
-        this.jsonHandlingService = this.applicationContext.getBean(JsonHandlingService.class);
+	    this.entityManagerFactory = entityManagerFactory;
+	    this.jsonHandlingService = this.applicationContext.getBean(JsonHandlingService.class);
         this.outboxProperties = outboxProperties;
     }
 
@@ -54,8 +56,7 @@ public class OutboxRepositoryImpl implements OutboxRepository {
         try (FakeRequestScope ignored = new FakeRequestScope()) {
             try {
                 QueryFactory queryFactory = this.applicationContext.getBean(QueryFactory.class);
-                EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
+                entityManager = this.entityManagerFactory.createEntityManager();
-                entityManager = entityManagerFactory.createEntityManager();
 
                 transaction = entityManager.getTransaction();
                 transaction.begin();
@@ -115,9 +116,8 @@ public class OutboxRepositoryImpl implements OutboxRepository {
 
         try (FakeRequestScope ignored = new FakeRequestScope()) {
             try {
-                EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
 
-                entityManager = entityManagerFactory.createEntityManager();
+                entityManager = this.entityManagerFactory.createEntityManager();
                 transaction = entityManager.getTransaction();
 
                 transaction.begin();
@@ -161,9 +161,7 @@ public class OutboxRepositoryImpl implements OutboxRepository {
 
         try (FakeRequestScope ignored = new FakeRequestScope()) {
             try {
-                EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
+                entityManager = this.entityManagerFactory.createEntityManager();
-
-                entityManager = entityManagerFactory.createEntityManager();
                 transaction = entityManager.getTransaction();
 
                 transaction.begin();
@@ -208,10 +206,7 @@ public class OutboxRepositoryImpl implements OutboxRepository {
 
         try (FakeRequestScope ignored = new FakeRequestScope()) {
             try {
-
+                entityManager = this.entityManagerFactory.createEntityManager();
-                EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
-
-                entityManager = entityManagerFactory.createEntityManager();
                 transaction = entityManager.getTransaction();
                 transaction.begin();
 
@@ -264,10 +259,7 @@ public class OutboxRepositoryImpl implements OutboxRepository {
 
         try (FakeRequestScope ignored = new FakeRequestScope()) {
             try {
-
+                entityManager = this.entityManagerFactory.createEntityManager();
-                EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
-
-                entityManager = entityManagerFactory.createEntityManager();
                 transaction = entityManager.getTransaction();
                 transaction.begin();
 
@@ -308,10 +300,7 @@ public class OutboxRepositoryImpl implements OutboxRepository {
 
         try (FakeRequestScope ignored = new FakeRequestScope()) {
             try {
-
+                entityManager = this.entityManagerFactory.createEntityManager();
-                EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
-
-                entityManager = entityManagerFactory.createEntityManager();
                 transaction = entityManager.getTransaction();
                 transaction.begin();
 
@@ -353,9 +342,8 @@ public class OutboxRepositoryImpl implements OutboxRepository {
         try (FakeRequestScope ignored = new FakeRequestScope()) {
             try {
                 queueMessage = this.mapEvent((OutboxIntegrationEvent) item);
-                EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
 
-                entityManager = entityManagerFactory.createEntityManager();
+                entityManager = this.entityManagerFactory.createEntityManager();
                 transaction = entityManager.getTransaction();
 
                 transaction.begin();

backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/FieldCommonModelBuilder.java

@@ -53,7 +53,7 @@ public class FieldCommonModelBuilder extends BaseCommonModelBuilder<FieldModel,
             FieldModel m = new FieldModel();
             m.setId(d.getId());
             m.setOrdinal(d.getOrdinal());
-            m.setSchematics(d.getSchematics());
+            m.setSchematics(d.getSemantics());
             if (d.getDefaultValue() != null) m.setDefaultValue(this.builderFactory.builder(DefaultValueCommonModelBuilder.class).build(d.getDefaultValue()));
             m.setIncludeInExport(d.getIncludeInExport());
             if (!this.conventionService.isListNullOrEmpty(d.getValidations())){

backend/core/src/main/java/org/opencdmp/model/builder/descriptiontemplate/FieldBuilder.java

@@ -58,7 +58,7 @@ public class FieldBuilder extends BaseBuilder<Field, FieldEntity> {
             Field m = new Field();
             if (fields.hasField(this.asIndexer(Field._id))) m.setId(d.getId());
             if (fields.hasField(this.asIndexer(Field._ordinal))) m.setOrdinal(d.getOrdinal());
-            if (fields.hasField(this.asIndexer(Field._schematics))) m.setSchematics(d.getSchematics());
+            if (fields.hasField(this.asIndexer(Field._semantics))) m.setSemantics(d.getSemantics());
             if (fields.hasField(this.asIndexer(Field._includeInExport))) m.setIncludeInExport(d.getIncludeInExport());
             if (fields.hasField(this.asIndexer(Field._validations))) m.setValidations(d.getValidations());
             if (!defaultValueFields.isEmpty() && d.getDefaultValue() != null) m.setDefaultValue(this.builderFactory.builder(DefaultValueBuilder.class).withFieldEntity(d).authorize(this.authorize).build(defaultValueFields, d.getDefaultValue()));

backend/core/src/main/java/org/opencdmp/model/descriptiontemplate/Field.java

@@ -13,8 +13,8 @@ public class Field {
 	public final static String _ordinal = "ordinal";
 	private Integer ordinal;
 
-	public final static String _schematics = "schematics";
+	public final static String _semantics = "semantics";
-	private List<String> schematics;
+	private List<String> semantics;
 
 	public final static String _defaultValue = "defaultValue";
 	private DefaultValue defaultValue;
@@ -47,12 +47,12 @@ public class Field {
 		this.ordinal = ordinal;
 	}
 
-	public List<String> getSchematics() {
+	public List<String> getSemantics() {
-		return this.schematics;
+		return this.semantics;
 	}
 
-	public void setSchematics(List<String> schematics) {
+	public void setSemantics(List<String> semantics) {
-		this.schematics = schematics;
+		this.semantics = semantics;
 	}
 
 	public DefaultValue getDefaultValue() {

backend/core/src/main/java/org/opencdmp/model/mapper/publicapi/DescriptionFieldToDatasetFieldMapper.java

@@ -21,7 +21,7 @@ public class DescriptionFieldToDatasetFieldMapper {
         defaultValueEntity.setValue(field.getDefaultValue() != null ? field.getDefaultValue().getTextValue(): null); //TODO
         model.setDefaultValue(defaultValueEntity);
         model.setExport(field.getIncludeInExport());
-        model.setSchematics(field.getSchematics());
+        model.setSemantics(field.getSemantics());
         model.setValidations(field.getValidations().stream().map(x -> (int) x.getValue()).toList());
         VisibilityEntity visibilityEntity = new VisibilityEntity();
         visibilityEntity.setRules(field.getVisibilityRules().stream().map(x -> {

backend/core/src/main/java/org/opencdmp/model/persist/descriptiontemplatedefinition/FieldPersist.java

@@ -27,7 +27,7 @@ public class FieldPersist {
 
     public static final String _ordinal = "ordinal";
 
-    private List<String> schematics;
+    private List<String> semantics;
 
     private DefaultValuePersist defaultValue;
     public static final String _defaultValue = "defaultValue";
@@ -62,12 +62,12 @@ public class FieldPersist {
         this.ordinal = ordinal;
     }
 
-    public List<String> getSchematics() {
+    public List<String> getSemantics() {
-        return this.schematics;
+        return this.semantics;
     }
 
-    public void setSchematics(List<String> schematics) {
+    public void setSemantics(List<String> semantics) {
-        this.schematics = schematics;
+        this.semantics = semantics;
     }
 
     public DefaultValuePersist getDefaultValue() {

backend/core/src/main/java/org/opencdmp/model/publicapi/datasetwizard/Field.java

@@ -32,7 +32,7 @@ public class Field implements Comparable, PropertiesModelBuilder {
     private List<Field> multiplicityItems;
     private List<FieldValidationType> validations;
     private VisibilityEntity visible;
-    private List<String> schematics;
+    private List<String> semantics;
 
     private Boolean export;
 
@@ -147,12 +147,12 @@ public class Field implements Comparable, PropertiesModelBuilder {
         this.numbering = numbering;
     }
 
-    public List<String> getSchematics() {
+    public List<String> getSemantics() {
-        return this.schematics;
+        return this.semantics;
     }
 
-    public void setSchematics(List<String> schematics) {
+    public void setSemantics(List<String> semantics) {
-        this.schematics = schematics;
+        this.semantics = semantics;
     }
 
     public Boolean getExport() {
@@ -174,7 +174,7 @@ public class Field implements Comparable, PropertiesModelBuilder {
         newField.defaultValue = this.defaultValue;
         newField.data = this.data;
         newField.validations = this.validations;
-        newField.schematics = this.schematics;
+        newField.semantics = this.semantics;
         newField.numbering = "mult" + index + "_" + this.numbering;
         newField.export = this.export;
         return newField;
@@ -210,7 +210,7 @@ public class Field implements Comparable, PropertiesModelBuilder {
         visibilityEntity.setRules(item.getVisibilityRules());
         this.visible = visibilityEntity;
         this.validations = item.getValidations();
-        this.schematics = item.getSchematics();
+        this.semantics = item.getSemantics();
         this.export = item.getIncludeInExport();
     }
 

backend/core/src/main/java/org/opencdmp/service/descriptiontemplate/DescriptionTemplateServiceImpl.java

@@ -363,7 +363,7 @@ public class DescriptionTemplateServiceImpl implements DescriptionTemplateServic
 
         data.setId(persist.getId());
         data.setOrdinal(persist.getOrdinal());
-        data.setSchematics(persist.getSchematics());
+        data.setSemantics(persist.getSemantics());
         //data.setNumbering(persist.get()); //TODO
         data.setValidations(persist.getValidations());
         data.setIncludeInExport(persist.getIncludeInExport());
@@ -863,7 +863,7 @@ public class DescriptionTemplateServiceImpl implements DescriptionTemplateServic
             FieldDataHelperService fieldDataHelperService = this.fieldDataHelperServiceProvider.get(fieldType);
             fieldEntity.setData(fieldDataHelperService.importExportMapDataToPersist(importExport.getData()));
         }
-        fieldEntity.setSchematics(importExport.getSchematics());
+        fieldEntity.setSemantics(importExport.getSemantics());
         return fieldEntity;
     }
 
@@ -1027,7 +1027,7 @@ public class DescriptionTemplateServiceImpl implements DescriptionTemplateServic
             FieldDataHelperService fieldDataHelperService = this.fieldDataHelperServiceProvider.get(fieldType);
             xml.setData(fieldDataHelperService.dataToImportExportXml(entity.getData()));
         }
-        xml.setSchematics(entity.getSchematics());
+        xml.setSemantics(entity.getSemantics());
         return xml;
     }
 

backend/core/src/main/java/org/opencdmp/service/metrics/UpdateMetricsTask.java

@@ -1,31 +1,11 @@
 package org.opencdmp.service.metrics;
 
-import org.opencdmp.commons.enums.IsActive;
-import org.opencdmp.commons.fake.FakeRequestScope;
-import org.opencdmp.commons.metrics.MetricNames;
-import org.opencdmp.commons.scope.tenant.TenantScope;
-import org.opencdmp.data.QueueInboxEntity;
-import org.opencdmp.data.StorageFileEntity;
-import org.opencdmp.data.TenantEntity;
-import org.opencdmp.data.TenantEntityManager;
-import org.opencdmp.integrationevent.inbox.EventProcessingStatus;
-import org.opencdmp.model.StorageFile;
-import org.opencdmp.model.Tenant;
-import org.opencdmp.query.QueueInboxQuery;
-import org.opencdmp.query.StorageFileQuery;
-import org.opencdmp.query.TenantQuery;
-import org.opencdmp.service.storage.StorageFileService;
-import gr.cite.queueinbox.entity.QueueInboxStatus;
-import gr.cite.queueinbox.repository.CandidateInfo;
-import gr.cite.tools.data.query.Ordering;
-import gr.cite.tools.data.query.QueryFactory;
 import gr.cite.tools.logging.LoggerService;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
 import io.prometheus.client.Gauge;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
-import jakarta.persistence.EntityTransaction;
+import org.opencdmp.commons.fake.FakeRequestScope;
-import jakarta.persistence.OptimisticLockException;
+import org.opencdmp.data.TenantEntityManager;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
@@ -36,30 +16,28 @@ import org.springframework.stereotype.Service;
 
 import java.io.Closeable;
 import java.io.IOException;
-import java.time.Instant;
 import java.util.Map;
-import java.util.UUID;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @Service
-@Scope(value = ConfigurableBeanFactory.SCOPE_SINGLETON)
+@Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)
 public class UpdateMetricsTask implements Closeable, ApplicationListener<ApplicationReadyEvent> {
 
 	private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(UpdateMetricsTask.class));
 	private final UpdateMetricsTaskProperties _config;
 	private final ApplicationContext applicationContext;
+	private final EntityManagerFactory entityManagerFactory;
 	private ScheduledExecutorService scheduler;
 	private Map<String, Gauge> gauges;
 
 	public UpdateMetricsTask(
 			UpdateMetricsTaskProperties config,
-			ApplicationContext applicationContext) {
+			ApplicationContext applicationContext, EntityManagerFactory entityManagerFactory) {
 		this._config = config;
 		this.applicationContext = applicationContext;
+		this.entityManagerFactory = entityManagerFactory;
 		this.gauges = null;
 	}
 
@@ -69,16 +47,16 @@ public class UpdateMetricsTask implements Closeable, ApplicationListener<Applica
 		if (this._config .getEnable() && intervalSeconds > 0) {
 			logger.info("File clean up run in {} seconds", intervalSeconds);
 
-			scheduler = Executors.newScheduledThreadPool(1);
+			this.scheduler = Executors.newScheduledThreadPool(1);
-			scheduler.scheduleAtFixedRate(this::process, 10, intervalSeconds, TimeUnit.SECONDS);
+			this.scheduler.scheduleAtFixedRate(this::process, 10, intervalSeconds, TimeUnit.SECONDS);
 		} else {
-			scheduler = null;
+			this.scheduler = null;
 		}
 	}
 	
 	@Override
 	public void close() throws IOException {
-		if (scheduler != null) this.scheduler.close();
+		if (this.scheduler != null) this.scheduler.close();
 	}
 
 	protected void process() {
@@ -106,15 +84,10 @@ public class UpdateMetricsTask implements Closeable, ApplicationListener<Applica
 
 		try (FakeRequestScope ignored = new FakeRequestScope()) {
 			try {
-
+				entityManager = this.entityManagerFactory.createEntityManager();
-				EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
-
-				entityManager = entityManagerFactory.createEntityManager();
 
 				TenantEntityManager tenantEntityManager = this.applicationContext.getBean(TenantEntityManager.class);
 				tenantEntityManager.setEntityManager(entityManager);
-				TenantScope tenantScope = this.applicationContext.getBean(TenantScope.class);
-				tenantScope.setTenant(null, tenantScope.getDefaultTenantCode());
 
 				MetricsService metricsService = this.applicationContext.getBean(MetricsService.class);
 

backend/core/src/main/java/org/opencdmp/service/prefillingsource/PrefillingSourceServiceImpl.java

@@ -419,16 +419,16 @@ public class PrefillingSourceServiceImpl implements PrefillingSourceService {
         if (!this.conventionService.isNullOrEmpty(type)  && !this.conventionService.isNullOrEmpty(semanticTarget) &&  !this.conventionService.isNullOrEmpty(value) && type.equals(Zenodo)) {
             if ("rda.dataset.distribution.data_access".equals(semanticTarget)) {
                 if ("open".equals(value)) {
-                    List<FieldEntity> issuedFieldEntities = definition.getAllField().stream().filter(x -> x.getSchematics() != null && x.getSchematics().contains("rda.dataset.issued")).toList();
+                    List<FieldEntity> issuedFieldEntities = definition.getAllField().stream().filter(x -> x.getSemantics() != null && x.getSemantics().contains("rda.dataset.issued")).toList();
                     if (!this.conventionService.isListNullOrEmpty(issuedFieldEntities)) {
                         String issuedIdNode = issuedFieldEntities.getFirst().getId();
                         Instant issuedValue = this.conventionService.isNullOrEmpty(issuedIdNode) ? null : description.getProperties().getFieldSets().values().stream().map(PropertyDefinitionFieldSet::getItems).flatMap(List::stream)
                                 .filter(x -> x.getFields() != null && x.getFields().containsKey(issuedIdNode)).map(x -> x.getFields().get(issuedIdNode).getDateValue()).filter(Objects::nonNull).findFirst().orElse(null);  
 
                         if (issuedValue != null) {
-                            List<FieldSetEntity> licStartFieldSetsEntities = definition.getAllFieldSets().stream().filter(x -> x.getAllField() != null && x.getAllField().stream().anyMatch(y -> y.getSchematics() != null && y.getSchematics().contains("rda.dataset.distribution.license.start_date"))).toList();
+                            List<FieldSetEntity> licStartFieldSetsEntities = definition.getAllFieldSets().stream().filter(x -> x.getAllField() != null && x.getAllField().stream().anyMatch(y -> y.getSemantics() != null && y.getSemantics().contains("rda.dataset.distribution.license.start_date"))).toList();
                             for (FieldSetEntity licStartFieldSetEntity : licStartFieldSetsEntities) {
-                                List<FieldEntity> licStartEntities = licStartFieldSetEntity.getAllField().stream().filter(x -> x.getSchematics() != null && x.getSchematics().contains("rda.dataset.distribution.license.start_date")).toList();
+                                List<FieldEntity> licStartEntities = licStartFieldSetEntity.getAllField().stream().filter(x -> x.getSemantics() != null && x.getSemantics().contains("rda.dataset.distribution.license.start_date")).toList();
                                 if (!this.conventionService.isListNullOrEmpty(licStartEntities)) {
                                     this.ensureFieldSetEntity(description, licStartFieldSetEntity);
 
@@ -456,9 +456,9 @@ public class PrefillingSourceServiceImpl implements PrefillingSourceService {
 
     private void prefillSemanticValueToDescription(Description description, List<DescriptionReference> descriptionReferences, String semanticTarget, String parsedValue, DefinitionEntity definition, String type) {
         if (this.conventionService.isNullOrEmpty(semanticTarget) || this.conventionService.isNullOrEmpty(parsedValue)) return;
-        List<FieldSetEntity> fieldSetsEntities = definition.getAllFieldSets().stream().filter(x-> x.getAllField() != null && x.getAllField().stream().anyMatch(y->  !this.conventionService.isListNullOrEmpty(y.getSchematics()) && y.getSchematics().contains(semanticTarget))).toList();
+        List<FieldSetEntity> fieldSetsEntities = definition.getAllFieldSets().stream().filter(x-> x.getAllField() != null && x.getAllField().stream().anyMatch(y->  !this.conventionService.isListNullOrEmpty(y.getSemantics()) && y.getSemantics().contains(semanticTarget))).toList();
         for (FieldSetEntity fieldSetEntity: fieldSetsEntities) {
-            List<FieldEntity> fieldEntities = fieldSetEntity.getAllField().stream().filter(x->  !this.conventionService.isListNullOrEmpty(x.getSchematics()) &&  x.getSchematics().contains(semanticTarget)).toList();
+            List<FieldEntity> fieldEntities = fieldSetEntity.getAllField().stream().filter(x->  !this.conventionService.isListNullOrEmpty(x.getSemantics()) &&  x.getSemantics().contains(semanticTarget)).toList();
             if (!this.conventionService.isListNullOrEmpty(fieldEntities)) {
                 this.ensureFieldSetEntity(description, fieldSetEntity);
                 for (FieldEntity fieldEntity : fieldEntities){

backend/core/src/main/java/org/opencdmp/service/storage/StorageFileCleanupTask.java

@@ -7,6 +7,7 @@ import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
 import jakarta.persistence.EntityTransaction;
 import jakarta.persistence.OptimisticLockException;
+import org.jetbrains.annotations.NotNull;
 import org.opencdmp.commons.fake.FakeRequestScope;
 import org.opencdmp.commons.scope.tenant.TenantScope;
 import org.opencdmp.data.StorageFileEntity;
@@ -34,7 +35,7 @@ import java.util.concurrent.TimeUnit;
 @Service
 @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)
 public class StorageFileCleanupTask  implements Closeable, ApplicationListener<ApplicationReadyEvent> {
-	private class CandidateInfo
+	private static class CandidateInfo
 	{
 		private UUID id;
 		private Instant createdAt;
@@ -59,19 +60,21 @@ public class StorageFileCleanupTask  implements Closeable, ApplicationListener<A
 	private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(StorageFileCleanupTask.class));
 	private final StorageFileCleanupProperties _config;
 	private final ApplicationContext applicationContext;
+	private final EntityManagerFactory entityManagerFactory;
 	private ScheduledExecutorService scheduler;
 
 	public StorageFileCleanupTask(
 			StorageFileCleanupProperties config,
-			ApplicationContext applicationContext) {
+			ApplicationContext applicationContext, EntityManagerFactory entityManagerFactory) {
 		this._config = config;
 		this.applicationContext = applicationContext;
 
 
+		this.entityManagerFactory = entityManagerFactory;
 	}
 
 	@Override
-	public void onApplicationEvent(ApplicationReadyEvent event) {
+	public void onApplicationEvent(@NotNull ApplicationReadyEvent event) {
 		long intervalSeconds = this._config .getIntervalSeconds();
 		if (this._config .getEnable() && intervalSeconds > 0) {
 			logger.info("File clean up run in {} seconds", intervalSeconds);
@@ -117,9 +120,8 @@ public class StorageFileCleanupTask  implements Closeable, ApplicationListener<A
 		try (FakeRequestScope fakeRequestScope = new FakeRequestScope()) {
 			try {
 				QueryFactory queryFactory = this.applicationContext.getBean(QueryFactory.class);
-				EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
 				
-				entityManager = entityManagerFactory.createEntityManager();
+				entityManager = this.entityManagerFactory.createEntityManager();
 				
 				transaction = entityManager.getTransaction();
 				transaction.begin();
@@ -173,8 +175,7 @@ public class StorageFileCleanupTask  implements Closeable, ApplicationListener<A
 		try (FakeRequestScope fakeRequestScope = new FakeRequestScope()) {
 			try {
 				QueryFactory queryFactory = this.applicationContext.getBean(QueryFactory.class);
-				EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
+				entityManager = this.entityManagerFactory.createEntityManager();
-				entityManager = entityManagerFactory.createEntityManager();
 
 				transaction = entityManager.getTransaction();
 				transaction.begin();

backend/core/src/main/java/org/opencdmp/service/user/UserServiceImpl.java

@@ -322,11 +322,10 @@ public class UserServiceImpl implements UserService {
             throw new MyApplicationException("Currently cannot update roles for this user");
         if (userCredentials.getFirst().getExternalId() == null)
             throw new MyApplicationException("Currently cannot update roles for this user");
-        String subjectId = userCredentials.getFirst().getExternalId();
 
-        this.applyGlobalRoles(data.getId(), subjectId, model);
+        this.applyGlobalRoles(data.getId(), model);
         
-        this.applyTenantRoles(data.getId(), subjectId, model);
+        this.applyTenantRoles(data.getId(), model);
 
         this.entityManager.flush();
         
@@ -338,7 +337,7 @@ public class UserServiceImpl implements UserService {
         return this.builderFactory.builder(UserBuilder.class).authorize(AuthorizationFlags.OwnerOrDmpAssociatedOrPermission).build(BaseFieldSet.build(fields, User._id), data);
     }
     
-    private void applyGlobalRoles(UUID userId, String subjectId, UserRolePatchPersist model) throws InvalidApplicationException {
+    private void applyGlobalRoles(UUID userId, UserRolePatchPersist model) throws InvalidApplicationException {
         try {
             this.tenantScope.setTempTenant(this.entityManager, null, this.tenantScope.getDefaultTenantCode());
             
@@ -368,7 +367,7 @@ public class UserServiceImpl implements UserService {
         }
     }
 
-    private void applyTenantRoles(UUID userId, String subjectId, UserRolePatchPersist model) throws InvalidApplicationException {
+    private void applyTenantRoles(UUID userId, UserRolePatchPersist model) throws InvalidApplicationException {
         if (!this.tenantScope.isSet())  throw new MyForbiddenException("tenant scope required");
 
         UserRoleQuery userRoleQuery = this.queryFactory.query(UserRoleQuery.class).userIds(userId).roles(this.authorizationProperties.getAllowedTenantRoles());
@@ -498,10 +497,10 @@ public class UserServiceImpl implements UserService {
         if (this.userScope.getUserIdSafe() == null) throw new MyForbiddenException(this.errors.getForbidden().getCode(),  this.errors.getForbidden().getMessage());
         
         String token = this.createMergeAccountConfirmation(model.getEmail());
-	    this.createMergeNotificationEvent(token, user, model.getEmail(), NotificationContactType.EMAIL);
+	    this.createMergeNotificationEvent(token, user, model.getEmail());
     }
 
-    private void createMergeNotificationEvent(String token, UserEntity user, String email, NotificationContactType type) throws InvalidApplicationException {
+    private void createMergeNotificationEvent(String token, UserEntity user, String email) throws InvalidApplicationException {
         UserEntity currentUser = this.entityManager.find(UserEntity.class,  this.userScope.getUserIdSafe());
         if (currentUser == null) throw new MyNotFoundException(this.messageSource.getMessage("General_ItemNotFound", new Object[]{ this.userScope.getUserIdSafe(), User.class.getSimpleName()}, LocaleContextHolder.getLocale()));
         
@@ -511,7 +510,7 @@ public class UserServiceImpl implements UserService {
         contactPairs.add(new ContactPair(ContactInfoType.Email, email));
         NotificationContactData contactData = new NotificationContactData(contactPairs, null, null);
         event.setContactHint(this.jsonHandlingService.toJsonSafe(contactData));
-        event.setContactTypeHint(type);
+        event.setContactTypeHint(NotificationContactType.EMAIL);
         event.setNotificationType(this.notificationProperties.getMergeAccountConfirmationType());
         NotificationFieldData data = new NotificationFieldData();
         List<FieldInfo> fieldInfoList = new ArrayList<>();
@@ -530,13 +529,13 @@ public class UserServiceImpl implements UserService {
 
 
         String token = this.createRemoveConfirmation(data.getId());
-        this.createRemoveCredentialNotificationEvent(token, data.getUserId(), NotificationContactType.EMAIL);
+        this.createRemoveCredentialNotificationEvent(token, data.getUserId());
     }
 
-    private void createRemoveCredentialNotificationEvent(String token, UUID userId, NotificationContactType type) throws InvalidApplicationException {
+    private void createRemoveCredentialNotificationEvent(String token, UUID userId) throws InvalidApplicationException {
         NotifyIntegrationEvent event = new NotifyIntegrationEvent();
         event.setUserId(userId);
-        event.setContactTypeHint(type);
+        event.setContactTypeHint(NotificationContactType.EMAIL);
         event.setNotificationType(this.notificationProperties.getRemoveCredentialConfirmationType());
         NotificationFieldData data = new NotificationFieldData();
         List<FieldInfo> fieldInfoList = new ArrayList<>();
@@ -647,12 +646,12 @@ public class UserServiceImpl implements UserService {
             this.entityManager.merge(userCredential);
         }
 
-        List<UserContactInfoEntity> userContactInfos = this.queryFactory.query(UserContactInfoQuery.class).userIds(oldUser.getId()).collect();
+        List<UserContactInfoEntity> userContacts = this.queryFactory.query(UserContactInfoQuery.class).userIds(oldUser.getId()).collect();
         UserContactInfoQuery newUserContactInfoQuery = this.queryFactory.query(UserContactInfoQuery.class).userIds(newUser.getId());
         newUserContactInfoQuery.setOrder(new Ordering().addDescending(UserContactInfo._ordinal));
         UserContactInfoEntity newUserContactInfo = newUserContactInfoQuery.first();
         int ordinal = newUserContactInfo == null ? 0 : newUserContactInfo.getOrdinal() + 1;
-        for (UserContactInfoEntity userContactInfo : userContactInfos){
+        for (UserContactInfoEntity userContactInfo : userContacts){
             userContactInfo.setUserId(newUser.getId());
             userContactInfo.setOrdinal(ordinal);
             this.entityManager.merge(userContactInfo);
@@ -759,9 +758,9 @@ public class UserServiceImpl implements UserService {
         if (userCredentialEntity.getData() != null){
             UserCredentialDataEntity userCredentialDataEntity = this.jsonHandlingService.fromJsonSafe(UserCredentialDataEntity.class, userCredentialEntity.getData());
             if (userCredentialDataEntity != null && !this.conventionService.isNullOrEmpty(userCredentialDataEntity.getEmail())) {
-                List<UserContactInfoEntity> userContactInfos = this.queryFactory.query(UserContactInfoQuery.class).values(userCredentialDataEntity.getEmail()).userIds(userCredentialEntity.getUserId()).collect();
+                List<UserContactInfoEntity> userContacts = this.queryFactory.query(UserContactInfoQuery.class).values(userCredentialDataEntity.getEmail()).userIds(userCredentialEntity.getUserId()).collect();
-                if (!this.conventionService.isListNullOrEmpty(userContactInfos)) 
+                if (!this.conventionService.isListNullOrEmpty(userContacts)) 
-                    this.deleterFactory.deleter(UserContactInfoDeleter.class).delete(userContactInfos);
+                    this.deleterFactory.deleter(UserContactInfoDeleter.class).delete(userContacts);
             }
         }
         this.deleterFactory.deleter(UserCredentialDeleter.class).delete(List.of(userCredentialEntity));
@@ -772,10 +771,10 @@ public class UserServiceImpl implements UserService {
 
         this.entityManager.flush();
 
+        this.userTouchedIntegrationEventHandler.handle(userCredentialEntity.getUserId());
+
         this.keycloakService.removeFromAllGroups(userCredentialEntity.getExternalId());
         this.addToDefaultUserGroups(userCredentialEntity.getExternalId());
-
-        this.userTouchedIntegrationEventHandler.handle(userCredentialEntity.getUserId());
     }
     
     private void addToDefaultUserGroups(String subjectId){

backend/pom.xml

@@ -215,7 +215,7 @@
         <dependency>
             <groupId>gr.cite</groupId>
             <artifactId>data-tools</artifactId>
-            <version>2.1.3</version>
+            <version>2.1.4</version>
         </dependency>
         <dependency>
             <groupId>gr.cite</groupId>

backend/web/src/main/java/org/opencdmp/controllers/publicapi/PublicDatasetsDescriptionDocumentation.java

@@ -186,7 +186,7 @@ public class PublicDatasetsDescriptionDocumentation {
                 String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._fieldSets, FieldSet._fields, Field._ordinal),
                 String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._fieldSets, FieldSet._fields, Field._data, BaseFieldData._label),
                 String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._fieldSets, FieldSet._fields, Field._data, BaseFieldData._fieldType),
-                String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._fieldSets, FieldSet._fields, Field._schematics),
+                String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._fieldSets, FieldSet._fields, Field._semantics),
                 String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._fieldSets, FieldSet._fields, Field._defaultValue, DefaultValue._dateValue),
                 String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._fieldSets, FieldSet._fields, Field._defaultValue, DefaultValue._booleanValue),
                 String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._fieldSets, FieldSet._fields, Field._defaultValue, DefaultValue._textValue),

dmp-frontend/src/app/core/model/description-template/description-template-persist.ts

@@ -71,7 +71,7 @@ export interface DescriptionTemplateFieldSetPersist {
 export interface DescriptionTemplateFieldPersist {
 	id: string;
 	ordinal: number;
-	schematics: string[];
+	semantics: string[];
 	defaultValue: DescriptionTemplateDefaultValuePersist;
 	visibilityRules: DescriptionTemplateRulePersist[];
 	validations: DescriptionTemplateFieldValidationType[];

dmp-frontend/src/app/core/model/description-template/description-template.ts

@@ -68,7 +68,7 @@ export interface DescriptionTemplateFieldSet {
 export interface DescriptionTemplateField {
 	id: string;
 	ordinal: number;
-	schematics?: string[];
+	semantics?: string[];
 	defaultValue?: DescriptionTemplateDefaultValue;
 	visibilityRules?: DescriptionTemplateRule[];
 	validations?: DescriptionTemplateFieldValidationType[];

dmp-frontend/src/app/ui/admin/description-template/editor/components/composite-field/description-template-editor-composite-field.component.ts

@@ -227,7 +227,7 @@ export class DescriptionTemplateEditorCompositeFieldComponent extends BaseCompon
 				id: editorField.id,
 				ordinal: editorField.ordinal,
 				numbering: '',
-				schematics: editorField.schematics,
+				semantics: editorField.semantics,
 				defaultValue: editorField.defaultValue,
 				visibilityRules: editorField.visibilityRules,
 				validations: editorField.validations,

dmp-frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.html

@@ -123,9 +123,9 @@
 
 		<mat-form-field class="col-6">
 			<mat-label>{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.SEMANTICS' | translate}}</mat-label>
-			<app-multiple-auto-complete placeholder="{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.SEMANTICS' | translate}}" [required]="false" [separatorKeysCodes]="separatorKeysCodes" [formControl]="this.form.get('schematics')" [configuration]="semanticsService.multipleAutocompleteConfiguration">
+			<app-multiple-auto-complete placeholder="{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.SEMANTICS' | translate}}" [required]="false" [separatorKeysCodes]="separatorKeysCodes" [formControl]="this.form.get('semantics')" [configuration]="semanticsService.multipleAutocompleteConfiguration">
 			</app-multiple-auto-complete>
-			<mat-error *ngIf="form.get('schematics').hasError('backendError')">{{form.get('schematics').getError('backendError').message}}</mat-error>
+			<mat-error *ngIf="form.get('semantics').hasError('backendError')">{{form.get('semantics').getError('backendError').message}}</mat-error>
 		</mat-form-field>
 
 		<div class="col-6">

dmp-frontend/src/app/ui/admin/description-template/editor/components/final-preview/final-preview.component.ts

@@ -122,7 +122,7 @@ export class FinalPreviewComponent implements OnInit {
 		let convertedField: DescriptionTemplateField ={
 			id: persist.id,
 			ordinal: persist.ordinal,
-			schematics: persist.schematics,
+			semantics: persist.semantics,
 			defaultValue: persist.defaultValue,
 			visibilityRules: persist.visibilityRules,
 			validations: persist.validations,

dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.model.ts

@@ -692,7 +692,7 @@ export class DescriptionTemplateMultiplicityEditorModel implements DescriptionTe
 export class DescriptionTemplateFieldEditorModel implements DescriptionTemplateFieldPersist {
 	id: string;
 	ordinal: number;
-	schematics: string[];
+	semantics: string[];
 	defaultValue: DescriptionTemplateDefaultValueEditorModel = new DescriptionTemplateDefaultValueEditorModel(this.validationErrorModel);
 	visibilityRules: DescriptionTemplateRuleEditorModel[] = [];
 	validations: DescriptionTemplateFieldValidationType[] = [];
@@ -710,7 +710,7 @@ export class DescriptionTemplateFieldEditorModel implements DescriptionTemplateF
 		if (item) {
 			this.id = item.id;
 			this.ordinal = item.ordinal;
-			this.schematics = item.schematics;
+			this.semantics = item.semantics;
 			this.defaultValue = new DescriptionTemplateDefaultValueEditorModel(this.validationErrorModel).fromModel(item.defaultValue);
 			this.validations = item.validations;
 			this.includeInExport = item.includeInExport;
@@ -737,7 +737,7 @@ export class DescriptionTemplateFieldEditorModel implements DescriptionTemplateF
 		return this.formBuilder.group({
 			id: [{ value: this.id, disabled: disabled }, context.getValidation('id').validators],
 			ordinal: [{ value: this.ordinal, disabled: disabled }, context.getValidation('ordinal').validators],
-			schematics: [{ value: this.schematics, disabled: disabled }, context.getValidation('schematics').validators],
+			semantics: [{ value: this.semantics, disabled: disabled }, context.getValidation('semantics').validators],
 			validations: [{ value: this.validations, disabled: disabled }, context.getValidation('validations').validators],
 			includeInExport: [{ value: this.includeInExport, disabled: disabled }, context.getValidation('includeInExport').validators],
 			data: this.data.buildForm({
@@ -766,7 +766,7 @@ export class DescriptionTemplateFieldEditorModel implements DescriptionTemplateF
 		const baseValidationArray: Validation[] = new Array<Validation>();
 		baseValidationArray.push({ key: 'id', validators: [BackendErrorValidator(validationErrorModel, `${rootPath}id`)] });
 		baseValidationArray.push({ key: 'ordinal', validators: [Validators.required, BackendErrorValidator(validationErrorModel, `${rootPath}ordinal`)] });
-		baseValidationArray.push({ key: 'schematics', validators: [BackendErrorValidator(validationErrorModel, `${rootPath}schematics`)] });
+		baseValidationArray.push({ key: 'semantics', validators: [BackendErrorValidator(validationErrorModel, `${rootPath}semantics`)] });
 		baseValidationArray.push({ key: 'defaultValue', validators: [BackendErrorValidator(validationErrorModel, `${rootPath}defaultValue`)] });
 		baseValidationArray.push({ key: 'validations', validators: [BackendErrorValidator(validationErrorModel, `${rootPath}validations`)] });
 		baseValidationArray.push({ key: 'includeInExport', validators: [BackendErrorValidator(validationErrorModel, `${rootPath}includeInExport`)] });
@@ -814,7 +814,7 @@ export class DescriptionTemplateFieldEditorModel implements DescriptionTemplateF
 			validationErrorModel
 		});
 
-		['id', 'ordinal', 'schematics', 'defaultValue', 'validations', 'includeInExport'].forEach(keyField => {
+		['id', 'ordinal', 'semantics', 'defaultValue', 'validations', 'includeInExport'].forEach(keyField => {
 			const control = formGroup?.get(keyField);
 			control?.clearValidators();
 			control?.addValidators(context.getValidation(keyField).validators);

dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.resolver.ts

@@ -57,7 +57,7 @@ export class DescriptionTemplateEditorResolver extends BaseEditorResolver {
 			[nameof<DescriptionTemplate>(x => x.definition), nameof<DescriptionTemplateDefinition>(x => x.pages), nameof<DescriptionTemplatePage>(x => x.sections), nameof<DescriptionTemplateSection>(x => x.fieldSets), nameof<DescriptionTemplateFieldSet>(x => x.multiplicity), nameof<DescriptionTemplateMultiplicity>(x => x.tableView)].join('.'),
 			[nameof<DescriptionTemplate>(x => x.definition), nameof<DescriptionTemplateDefinition>(x => x.pages), nameof<DescriptionTemplatePage>(x => x.sections), nameof<DescriptionTemplateSection>(x => x.fieldSets), nameof<DescriptionTemplateFieldSet>(x => x.fields), nameof<DescriptionTemplateField>(x => x.id)].join('.'),
 			[nameof<DescriptionTemplate>(x => x.definition), nameof<DescriptionTemplateDefinition>(x => x.pages), nameof<DescriptionTemplatePage>(x => x.sections), nameof<DescriptionTemplateSection>(x => x.fieldSets), nameof<DescriptionTemplateFieldSet>(x => x.fields), nameof<DescriptionTemplateField>(x => x.ordinal)].join('.'),
-			[nameof<DescriptionTemplate>(x => x.definition), nameof<DescriptionTemplateDefinition>(x => x.pages), nameof<DescriptionTemplatePage>(x => x.sections), nameof<DescriptionTemplateSection>(x => x.fieldSets), nameof<DescriptionTemplateFieldSet>(x => x.fields), nameof<DescriptionTemplateField>(x => x.schematics)].join('.'),
+			[nameof<DescriptionTemplate>(x => x.definition), nameof<DescriptionTemplateDefinition>(x => x.pages), nameof<DescriptionTemplatePage>(x => x.sections), nameof<DescriptionTemplateSection>(x => x.fieldSets), nameof<DescriptionTemplateFieldSet>(x => x.fields), nameof<DescriptionTemplateField>(x => x.semantics)].join('.'),
 			[nameof<DescriptionTemplate>(x => x.definition), nameof<DescriptionTemplateDefinition>(x => x.pages), nameof<DescriptionTemplatePage>(x => x.sections), nameof<DescriptionTemplateSection>(x => x.fieldSets), nameof<DescriptionTemplateFieldSet>(x => x.fields), nameof<DescriptionTemplateField>(x => x.defaultValue), nameof<DescriptionTemplateDefaultValue>(x => x.textValue)].join('.'),
 			[nameof<DescriptionTemplate>(x => x.definition), nameof<DescriptionTemplateDefinition>(x => x.pages), nameof<DescriptionTemplatePage>(x => x.sections), nameof<DescriptionTemplateSection>(x => x.fieldSets), nameof<DescriptionTemplateFieldSet>(x => x.fields), nameof<DescriptionTemplateField>(x => x.defaultValue), nameof<DescriptionTemplateDefaultValue>(x => x.dateValue)].join('.'),
 			[nameof<DescriptionTemplate>(x => x.definition), nameof<DescriptionTemplateDefinition>(x => x.pages), nameof<DescriptionTemplatePage>(x => x.sections), nameof<DescriptionTemplateSection>(x => x.fieldSets), nameof<DescriptionTemplateFieldSet>(x => x.fields), nameof<DescriptionTemplateField>(x => x.defaultValue), nameof<DescriptionTemplateDefaultValue>(x => x.booleanValue)].join('.'),

notification-service/notification-web/src/main/java/gr/cite/notification/web/controllerhandler/GlobalExceptionHandler.java

@@ -150,7 +150,7 @@ public class GlobalExceptionHandler {
 						Map.entry("error", "System error")
 				);
 			}
-		};
+		}
 		String serialization = this.jsonHandlingService.toJsonSafe(result);
 		return new HandledException(statusCode, serialization, logLevel);
 	}

notification-service/notification-web/src/main/java/gr/cite/notification/web/scope/tenant/TenantInterceptor.java

@@ -9,6 +9,7 @@ import gr.cite.notification.authorization.Permission;
 import gr.cite.notification.common.enums.IsActive;
 import gr.cite.notification.common.scope.tenant.TenantScope;
 import gr.cite.notification.common.scope.user.UserScope;
+import gr.cite.notification.data.TenantEntityManager;
 import gr.cite.notification.data.TenantUserEntity;
 import gr.cite.notification.data.UserEntity;
 import gr.cite.notification.data.tenant.TenantScopedBaseEntity;
@@ -52,6 +53,7 @@ public class TenantInterceptor implements WebRequestInterceptor {
 	private final UserAllowedTenantCacheService userAllowedTenantCacheService;
 	private final ErrorThesaurusProperties errors;
 	private final QueryUtilsService queryUtilsService;
+	public final TenantEntityManager tenantEntityManager;
 	@PersistenceContext
 	public EntityManager entityManager;
 
@@ -64,7 +66,7 @@ public class TenantInterceptor implements WebRequestInterceptor {
 			ApplicationContext applicationContext,
 			TenantScopeProperties tenantScopeProperties,
 			UserAllowedTenantCacheService userAllowedTenantCacheService,
-			ErrorThesaurusProperties errors, QueryUtilsService queryUtilsService) {
+			ErrorThesaurusProperties errors, QueryUtilsService queryUtilsService, TenantEntityManager tenantEntityManager) {
 		this.tenantScope = tenantScope;
 		this.userScope = userScope;
 		this.currentPrincipalResolver = currentPrincipalResolver;
@@ -74,6 +76,7 @@ public class TenantInterceptor implements WebRequestInterceptor {
 		this.userAllowedTenantCacheService = userAllowedTenantCacheService;
 		this.errors = errors;
 		this.queryUtilsService = queryUtilsService;
+		this.tenantEntityManager = tenantEntityManager;
 	}
 
 	@Override
@@ -103,16 +106,7 @@ public class TenantInterceptor implements WebRequestInterceptor {
 			}
 
 			if (isUserAllowedTenant) {
-				if(!tenantScope.isDefaultTenant()) {
+				this.tenantEntityManager.reloadTenantFilters();
-					this.entityManager
-							.unwrap(Session.class)
-							.enableFilter(TenantScopedBaseEntity.TENANT_FILTER)
-							.setParameter(TenantScopedBaseEntity.TENANT_FILTER_TENANT_PARAM, tenantScope.getTenant().toString());
-				} else {
-					this.entityManager
-							.unwrap(Session.class)
-							.enableFilter(TenantScopedBaseEntity.DEFAULT_TENANT_FILTER);
-				}
 			} else {
 				if (isAllowedNoTenant || this.isWhiteListedEndpoint(request)) {
 					tenantScope.setTenant(null, null);
@@ -181,6 +175,7 @@ public class TenantInterceptor implements WebRequestInterceptor {
 	@Override
 	public void postHandle(@NonNull WebRequest request, ModelMap model) {
 		this.tenantScope.setTenant(null, null);
+		this.tenantEntityManager.disableTenantFilters();
 	}
 
 	@Override

notification-service/notification/pom.xml

@@ -53,7 +53,7 @@
 		<dependency>
 			<groupId>gr.cite</groupId>
 			<artifactId>data-tools</artifactId>
-			<version>2.1.2</version>
+			<version>2.1.4</version>
 		</dependency>
 		<dependency>
 			<groupId>gr.cite</groupId>
@@ -83,7 +83,7 @@
 		<dependency>
 			<groupId>gr.cite</groupId>
 			<artifactId>validation</artifactId>
-			<version>3.0.2</version>
+			<version>3.0.3</version>
 		</dependency>
 
 		<dependency>

notification-service/notification/src/main/java/gr/cite/notification/common/XmlHandlingService.java

@@ -70,7 +70,7 @@ public class XmlHandlingService {
     public <T> T fromXml(Class<T> type, String xmlString) throws JAXBException, InstantiationException, IllegalAccessException, ParserConfigurationException, IOException, SAXException {
         if (XmlSerializable.class.isAssignableFrom(type)){
             XmlSerializable<T> object = (XmlSerializable<T>)type.newInstance();
-            return (T) object.fromXml(this.getDocument(xmlString).getDocumentElement());
+            return object.fromXml(this.getDocument(xmlString).getDocumentElement());
         } else {
             JAXBContext jaxbContext = JAXBContext.newInstance(type);
             Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();

notification-service/notification/src/main/java/gr/cite/notification/common/lock/LockByKeyManager.java

@@ -25,7 +25,7 @@ public class LockByKeyManager {
 
 	}
 
-	private static ConcurrentHashMap<String, LockWrapper> locks = new ConcurrentHashMap<String, LockWrapper>();
+	private static final ConcurrentHashMap<String, LockWrapper> locks = new ConcurrentHashMap<String, LockWrapper>();
 
 	public void lock(String key) {
 		LockWrapper lockWrapper = locks.compute(key, (k, v) -> v == null ? new LockWrapper() : v.addThreadInQueue());

notification-service/notification/src/main/java/gr/cite/notification/common/scope/fake/FakeRequestAttributes.java

@@ -8,7 +8,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 public class FakeRequestAttributes implements RequestAttributes {
-	private Map<String, Object> requestAttributeMap = new HashMap<>();
+	private final Map<String, Object> requestAttributeMap = new HashMap<>();
 	private final Map<String, Runnable> requestDestructionCallbacks = new LinkedHashMap<>(8);
 	private volatile boolean requestActive = true;
 

notification-service/notification/src/main/java/gr/cite/notification/common/scope/tenant/TenantScope.java

@@ -1,8 +1,6 @@
 package gr.cite.notification.common.scope.tenant;
 
-import gr.cite.notification.data.tenant.TenantScopedBaseEntity;
+import gr.cite.notification.data.TenantEntityManager;
-import jakarta.persistence.EntityManager;
-import org.hibernate.Session;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
@@ -27,11 +25,11 @@ public class TenantScope {
 	}
 
 	public Boolean isMultitenant() {
-		return multitenancy.isMultitenant();
+		return this.multitenancy.isMultitenant();
 	}
 
 	public String getDefaultTenantCode() {
-		return multitenancy.getDefaultTenantCode();
+		return this.multitenancy.getDefaultTenantCode();
 	}
 
 	public Boolean isSet() {
@@ -62,55 +60,18 @@ public class TenantScope {
 		return this.tenantCode.get();
 	}
 
-	public void setTempTenant(EntityManager entityManager, UUID tenant, String tenantCode) {
+	public void setTempTenant(TenantEntityManager entityManager, UUID tenant, String tenantCode) throws InvalidApplicationException {
 		this.tenant.set(tenant);
 		this.tenantCode.set(tenantCode);
 
-		entityManager
+		entityManager.reloadTenantFilters();
-				.unwrap(Session.class)
-				.disableFilter(TenantScopedBaseEntity.TENANT_FILTER);
-
-		entityManager
-				.unwrap(Session.class)
-				.disableFilter(TenantScopedBaseEntity.DEFAULT_TENANT_FILTER);
-		if (this.tenant.get() != null || this.isDefaultTenant()) {
-			if(!this.isDefaultTenant()) {
-				entityManager
-						.unwrap(Session.class)
-						.enableFilter(TenantScopedBaseEntity.TENANT_FILTER)
-						.setParameter(TenantScopedBaseEntity.TENANT_FILTER_TENANT_PARAM, this.tenant.get().toString());
-			} else {
-				entityManager
-						.unwrap(Session.class)
-						.enableFilter(TenantScopedBaseEntity.DEFAULT_TENANT_FILTER);
-			}
-		}
 	}
 
-	public void removeTempTenant(EntityManager entityManager) {
+	public void removeTempTenant(TenantEntityManager entityManager) throws InvalidApplicationException {
 		this.tenant.set(this.initialTenant.get());
 		this.tenantCode.set(this.initialTenantCode.get());
 
-
+		entityManager.reloadTenantFilters();
-		entityManager
-				.unwrap(Session.class)
-				.disableFilter(TenantScopedBaseEntity.TENANT_FILTER);
-
-		entityManager
-				.unwrap(Session.class)
-				.disableFilter(TenantScopedBaseEntity.DEFAULT_TENANT_FILTER);
-		if (this.initialTenant.get() != null || this.isDefaultTenant()) {
-			if(!this.isDefaultTenant()) {
-				entityManager
-						.unwrap(Session.class)
-						.enableFilter(TenantScopedBaseEntity.TENANT_FILTER)
-						.setParameter(TenantScopedBaseEntity.TENANT_FILTER_TENANT_PARAM, this.tenant.get().toString());
-			} else {
-				entityManager
-						.unwrap(Session.class)
-						.enableFilter(TenantScopedBaseEntity.DEFAULT_TENANT_FILTER);
-			}
-		}
 	}
 
 	public void setTenant(UUID tenant, String tenantCode) {

notification-service/notification/src/main/java/gr/cite/notification/config/notification/NotificationConfig.java

@@ -6,6 +6,7 @@ import gr.cite.notification.service.message.common.MessageBuilderBase;
 import gr.cite.notification.service.notificationscheduling.NotificationSchedulingService;
 import gr.cite.notification.service.notificationscheduling.NotificationSchedulingServiceImpl;
 import gr.cite.queueinbox.task.rabbitmq.QueueListenerProperties;
+import jakarta.persistence.EntityManagerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -33,11 +34,13 @@ public class NotificationConfig {
     }
     private final ApplicationContext applicationContext;
     private final NotificationProperties properties;
+    private final EntityManagerFactory entityManagerFactory;
 
     @Autowired
-    public NotificationConfig(ApplicationContext applicationContext, NotificationProperties properties) {
+    public NotificationConfig(ApplicationContext applicationContext, NotificationProperties properties, EntityManagerFactory entityManagerFactory) {
         this.applicationContext = applicationContext;
         this.properties = properties;
+	    this.entityManagerFactory = entityManagerFactory;
     }
 
     @Bean(BeanQualifier.GLOBAL_POLICIES_MAP)
@@ -71,7 +74,7 @@ public class NotificationConfig {
 
     @Bean
     public NotificationSchedulingService notificationSchedulingService() {
-        return new NotificationSchedulingServiceImpl(this.applicationContext, this.properties);
+        return new NotificationSchedulingServiceImpl(this.applicationContext, this.properties, this.entityManagerFactory);
     }
 
     @Bean

notification-service/notification/src/main/java/gr/cite/notification/data/TenantEntityManager.java

@@ -33,9 +33,9 @@ public class TenantEntityManager {
 	}
 
 	public <T> T merge(T entity) throws InvalidApplicationException {
-		if (tenantScope.isMultitenant() && (entity instanceof TenantScoped tenantScopedEntity)) {
+		if (this.tenantScope.isMultitenant() && (entity instanceof TenantScoped tenantScopedEntity)) {
-			if (!tenantScope.isDefaultTenant()) {
+			if (!this.tenantScope.isDefaultTenant()) {
-				if (tenantScopedEntity.getTenantId() == null || !tenantScopedEntity.getTenantId().equals(tenantScope.getTenant())) throw new MyForbiddenException(this.errors.getTenantTampering().getCode(), this.errors.getTenantTampering().getMessage());
+				if (tenantScopedEntity.getTenantId() == null || !tenantScopedEntity.getTenantId().equals(this.tenantScope.getTenant())) throw new MyForbiddenException(this.errors.getTenantTampering().getCode(), this.errors.getTenantTampering().getMessage());
 			} else if (tenantScopedEntity.getTenantId() != null) {
 				throw new MyForbiddenException(this.errors.getTenantTampering().getCode(), this.errors.getTenantTampering().getMessage());
 			}
@@ -44,9 +44,9 @@ public class TenantEntityManager {
 	}
 
 	public void remove(Object entity) throws InvalidApplicationException {
-		if (tenantScope.isMultitenant() && (entity instanceof TenantScoped tenantScopedEntity)) {
+		if (this.tenantScope.isMultitenant() && (entity instanceof TenantScoped tenantScopedEntity)) {
-			if (!tenantScope.isDefaultTenant()) {
+			if (!this.tenantScope.isDefaultTenant()) {
-				if (tenantScopedEntity.getTenantId() == null || !tenantScopedEntity.getTenantId().equals(tenantScope.getTenant())) throw new MyForbiddenException(this.errors.getTenantTampering().getCode(), this.errors.getTenantTampering().getMessage());
+				if (tenantScopedEntity.getTenantId() == null || !tenantScopedEntity.getTenantId().equals(this.tenantScope.getTenant())) throw new MyForbiddenException(this.errors.getTenantTampering().getCode(), this.errors.getTenantTampering().getMessage());
 			} else if (tenantScopedEntity.getTenantId() != null) {
 				throw new MyForbiddenException(this.errors.getTenantTampering().getCode(), this.errors.getTenantTampering().getMessage());
 			}
@@ -57,12 +57,22 @@ public class TenantEntityManager {
 	public <T> T find(Class<T> entityClass, Object primaryKey) throws InvalidApplicationException {
 		T entity = this.entityManager.find(entityClass, primaryKey);
 
-		if (tenantScope.isMultitenant() && (entity instanceof TenantScoped tenantScopedEntity)) {
+		if (this.tenantScope.isMultitenant() && (entity instanceof TenantScoped tenantScopedEntity)) {
-			if (tenantScopedEntity.getTenantId() != null && !tenantScopedEntity.getTenantId().equals(tenantScope.getTenant())) return null;
+			if (tenantScopedEntity.getTenantId() != null && !tenantScopedEntity.getTenantId().equals(this.tenantScope.getTenant())) return null;
 		}
 		return entity;
 	}
 
+	public <T> T find(Class<T> entityClass, Object primaryKey, boolean disableTracking) throws InvalidApplicationException {
+		T entity = this.entityManager.find(entityClass, primaryKey);
+
+		if (this.tenantScope.isMultitenant() && (entity instanceof TenantScoped tenantScopedEntity)) {
+			if (tenantScopedEntity.getTenantId() != null && !tenantScopedEntity.getTenantId().equals(this.tenantScope.getTenant())) return null;
+		}
+		if (disableTracking) this.entityManager.detach(entity);
+		return entity;
+	}
+
 	public void flush() {
 		this.entityManager.flush();
 	}
@@ -81,13 +91,33 @@ public class TenantEntityManager {
 		this.entityManager.clear();
 	}
 
-	public void enableTenantFilters() throws InvalidApplicationException {
+	public void reloadTenantFilters() throws InvalidApplicationException {
-		if (!tenantScope.isSet()) return;
+		this.disableTenantFilters();
-		if(!tenantScope.isDefaultTenant()) {
+
+		if (!this.tenantScope.isSet()) return;
+
+		if(!this.tenantScope.isDefaultTenant()) {
 			this.entityManager
 					.unwrap(Session.class)
 					.enableFilter(TenantScopedBaseEntity.TENANT_FILTER)
-					.setParameter(TenantScopedBaseEntity.TENANT_FILTER_TENANT_PARAM, tenantScope.getTenant().toString());
+					.setParameter(TenantScopedBaseEntity.TENANT_FILTER_TENANT_PARAM, this.tenantScope.getTenant().toString());
+		} else {
+			this.entityManager
+					.unwrap(Session.class)
+					.enableFilter(TenantScopedBaseEntity.DEFAULT_TENANT_FILTER);
+		}
+	}
+
+	public void loadExplictTenantFilters() throws InvalidApplicationException {
+		this.disableTenantFilters();
+
+		if (!this.tenantScope.isSet()) return;
+
+		if(!this.tenantScope.isDefaultTenant()) {
+			this.entityManager
+					.unwrap(Session.class)
+					.enableFilter(TenantScopedBaseEntity.TENANT_FILTER_EXPLICT)
+					.setParameter(TenantScopedBaseEntity.TENANT_FILTER_TENANT_PARAM, this.tenantScope.getTenant().toString());
 		} else {
 			this.entityManager
 					.unwrap(Session.class)
@@ -103,10 +133,14 @@ public class TenantEntityManager {
 		this.entityManager
 				.unwrap(Session.class)
 				.disableFilter(TenantScopedBaseEntity.DEFAULT_TENANT_FILTER);
+
+		this.entityManager
+				.unwrap(Session.class)
+				.disableFilter(TenantScopedBaseEntity.TENANT_FILTER_EXPLICT);
 	}
 
 	public EntityManager getEntityManager() {
-		return entityManager;
+		return this.entityManager;
 	}
 
 	public void setEntityManager(EntityManager entityManager) {

notification-service/notification/src/main/java/gr/cite/notification/data/tenant/TenantFilterAspect.java

@@ -1,44 +1,44 @@
-package gr.cite.notification.data.tenant;
+//package gr.cite.notification.data.tenant;
-
+//
-import gr.cite.notification.common.scope.tenant.TenantScope;
+//import gr.cite.notification.common.scope.tenant.TenantScope;
-import jakarta.persistence.EntityManager;
+//import jakarta.persistence.EntityManager;
-import org.aspectj.lang.JoinPoint;
+//import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.AfterReturning;
+//import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.Aspect;
+//import org.aspectj.lang.annotation.Aspect;
-import org.hibernate.Session;
+//import org.hibernate.Session;
-import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
+//import org.springframework.stereotype.Component;
-
+//
-import javax.management.InvalidApplicationException;
+//import javax.management.InvalidApplicationException;
-
+//
-@Aspect
+//@Aspect
-@Component
+//@Component
-public class TenantFilterAspect {
+//public class TenantFilterAspect {
-
+//
-    private final TenantScope tenantScope;
+//    private final TenantScope tenantScope;
-
+//
-    @Autowired
+//    @Autowired
-    public TenantFilterAspect(
+//    public TenantFilterAspect(
-            TenantScope tenantScope
+//            TenantScope tenantScope
-    ) {
+//    ) {
-        this.tenantScope = tenantScope;
+//        this.tenantScope = tenantScope;
-    }
+//    }
-
+//
-    @AfterReturning(
+//    @AfterReturning(
-            pointcut = "bean(entityManagerFactory) && execution(* createEntityManager(..))",
+//            pointcut = "bean(entityManagerFactory) && execution(* createEntityManager(..))",
-            returning = "retVal")
+//            returning = "retVal")
-    public void getSessionAfter(JoinPoint joinPoint, Object retVal) throws InvalidApplicationException {
+//    public void getSessionAfter(JoinPoint joinPoint, Object retVal) throws InvalidApplicationException {
-        if (retVal instanceof EntityManager && tenantScope.isSet()) {
+//        if (retVal instanceof EntityManager && tenantScope.isSet()) {
-            Session session = ((EntityManager) retVal).unwrap(Session.class);
+//            Session session = ((EntityManager) retVal).unwrap(Session.class);
-            if(!tenantScope.isDefaultTenant()) {
+//            if(!tenantScope.isDefaultTenant()) {
-                session
+//                session
-                        .enableFilter(TenantScopedBaseEntity.TENANT_FILTER)
+//                        .enableFilter(TenantScopedBaseEntity.TENANT_FILTER)
-                        .setParameter(TenantScopedBaseEntity.TENANT_FILTER_TENANT_PARAM, tenantScope.getTenant().toString());
+//                        .setParameter(TenantScopedBaseEntity.TENANT_FILTER_TENANT_PARAM, tenantScope.getTenant().toString());
-            } else {
+//            } else {
-                session
+//                session
-                        .enableFilter(TenantScopedBaseEntity.DEFAULT_TENANT_FILTER);
+//                        .enableFilter(TenantScopedBaseEntity.DEFAULT_TENANT_FILTER);
-            }
+//            }
-        }
+//        }
-    }
+//    }
-
+//
-}
+//}

notification-service/notification/src/main/java/gr/cite/notification/data/tenant/TenantListener.java

@@ -32,13 +32,13 @@ public class TenantListener {
 
 	@PrePersist
 	public void setTenantOnCreate(TenantScoped entity) throws InvalidApplicationException {
-		if (tenantScope.isMultitenant()) {
+		if (this.tenantScope.isMultitenant()) {
-			if (entity.getTenantId() != null && (this.tenantScope.isDefaultTenant() || entity.getTenantId().compareTo(tenantScope.getTenant()) != 0)) {
+			if (entity.getTenantId() != null && (this.tenantScope.isDefaultTenant() || entity.getTenantId().compareTo(this.tenantScope.getTenant()) != 0)) {
 				logger.error("somebody tried to set not login tenant");
 				throw new MyForbiddenException(this.errors.getTenantTampering().getCode(), this.errors.getTenantTampering().getMessage());
 			}
-			if (!tenantScope.isDefaultTenant()) {
+			if (!this.tenantScope.isDefaultTenant()) {
-				final UUID tenantId = tenantScope.getTenant();
+				final UUID tenantId = this.tenantScope.getTenant();
 				entity.setTenantId(tenantId);
 			}
 		} else {
@@ -49,18 +49,18 @@ public class TenantListener {
 	@PreUpdate
 	@PreRemove
 	public void setTenantOnUpdate(TenantScoped entity) throws InvalidApplicationException {
-		if (tenantScope.isMultitenant()) {
+		if (this.tenantScope.isMultitenant()) {
-			if (!tenantScope.isDefaultTenant()) {
+			if (!this.tenantScope.isDefaultTenant()) {
 				if (entity.getTenantId() == null) {
 					logger.error("somebody tried to set null tenant");
 					throw new MyForbiddenException(this.errors.getTenantTampering().getCode(), this.errors.getTenantTampering().getMessage());
 				}
-				if (entity.getTenantId().compareTo(tenantScope.getTenant()) != 0) {
+				if (entity.getTenantId().compareTo(this.tenantScope.getTenant()) != 0) {
 					logger.error("somebody tried to change an entries tenant");
 					throw new MyForbiddenException(this.errors.getTenantTampering().getCode(), this.errors.getTenantTampering().getMessage());
 				}
 
-				final UUID tenantId = tenantScope.getTenant();
+				final UUID tenantId = this.tenantScope.getTenant();
 				entity.setTenantId(tenantId);
 			} else {
 				if (entity.getTenantId() != null) {
@@ -69,7 +69,7 @@ public class TenantListener {
 				}
 			}
 		} else {
-			if (entity.getTenantId() != null && (!this.tenantScope.isDefaultTenant() ||entity.getTenantId().compareTo(tenantScope.getTenant()) != 0)) {
+			if (entity.getTenantId() != null && (!this.tenantScope.isDefaultTenant() ||entity.getTenantId().compareTo(this.tenantScope.getTenant()) != 0)) {
 				logger.error("somebody tried to change an entries tenant");
 				throw new MyForbiddenException(this.errors.getTenantTampering().getCode(), this.errors.getTenantTampering().getMessage());
 			}

notification-service/notification/src/main/java/gr/cite/notification/data/tenant/TenantScopedBaseEntity.java

@@ -15,22 +15,25 @@ import java.util.UUID;
 //@Getter
 //@Setter
 //@NoArgsConstructor
-@FilterDef(name = TenantScopedBaseEntity.TENANT_FILTER, parameters = {@ParamDef(name = TenantScopedBaseEntity.TENANT_FILTER_TENANT_PARAM, type = String.class)})
+@FilterDef(name = TenantScopedBaseEntity.TENANT_FILTER, parameters = @ParamDef(name = TenantScopedBaseEntity.TENANT_FILTER_TENANT_PARAM, type = String.class))
+@FilterDef(name = TenantScopedBaseEntity.TENANT_FILTER_EXPLICT, parameters = @ParamDef(name = TenantScopedBaseEntity.TENANT_FILTER_TENANT_PARAM, type = String.class))
 @FilterDef(name = TenantScopedBaseEntity.DEFAULT_TENANT_FILTER)
-@Filter(name = TenantScopedBaseEntity.DEFAULT_TENANT_FILTER, condition = "(tenant = tenant is null)")
 @Filter(name = TenantScopedBaseEntity.TENANT_FILTER, condition = "(tenant = (cast(:tenantId as uuid)) or tenant is null)")
+@Filter(name = TenantScopedBaseEntity.TENANT_FILTER_EXPLICT, condition = "(tenant = (cast(:tenantId as uuid)))")
+@Filter(name = TenantScopedBaseEntity.DEFAULT_TENANT_FILTER, condition = "(tenant = tenant is null)")
 @EntityListeners(TenantListener.class)
 public abstract class TenantScopedBaseEntity implements TenantScoped, Serializable {
     private static final long serialVersionUID = 1L;
     public static final String TENANT_FILTER = "tenantFilter";
     public static final String DEFAULT_TENANT_FILTER = "defaultTenantFilter";
+    public static final String TENANT_FILTER_EXPLICT = "tenantFilterExplict";
     public static final String TENANT_FILTER_TENANT_PARAM = "tenantId";
 
     @Column(name = "tenant", columnDefinition = "uuid", nullable = true)
     private UUID tenantId;
     public static final String _tenantId = "tenantId";
     public UUID getTenantId() {
-        return tenantId;
+        return this.tenantId;
     }
 
     @Override

notification-service/notification/src/main/java/gr/cite/notification/integrationevent/InboxIntegrationEventConfigurer.java

@@ -4,6 +4,7 @@ import gr.cite.notification.integrationevent.inbox.InboxProperties;
 import gr.cite.notification.integrationevent.inbox.InboxRepositoryImpl;
 import gr.cite.queueinbox.InboxConfigurer;
 import gr.cite.queueinbox.repository.InboxRepository;
+import jakarta.persistence.EntityManagerFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationContext;
@@ -15,18 +16,20 @@ import org.springframework.context.annotation.Configuration;
 @ConditionalOnProperty(prefix = "queue.task.listener", name = "enable", matchIfMissing = false)
 public class InboxIntegrationEventConfigurer extends InboxConfigurer {
 
-    private ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;
 
-    private InboxProperties inboxProperties;
+    private final InboxProperties inboxProperties;
+    private final EntityManagerFactory entityManagerFactory;
 
-    public InboxIntegrationEventConfigurer(ApplicationContext applicationContext, InboxProperties inboxProperties) {
+    public InboxIntegrationEventConfigurer(ApplicationContext applicationContext, InboxProperties inboxProperties, EntityManagerFactory entityManagerFactory) {
         this.applicationContext = applicationContext;
         this.inboxProperties = inboxProperties;
+	    this.entityManagerFactory = entityManagerFactory;
     }
 
     @Bean
     public InboxRepository inboxRepositoryCreator() {
-        return new InboxRepositoryImpl(this.applicationContext, this.inboxProperties);
+        return new InboxRepositoryImpl(this.applicationContext, this.inboxProperties, this.entityManagerFactory);
     }
 
 }

notification-service/notification/src/main/java/gr/cite/notification/integrationevent/OutboxIntegrationEventConfigurer.java

@@ -9,6 +9,7 @@ import gr.cite.queueoutbox.repository.OutboxRepository;
 import gr.cite.rabbitmq.IntegrationEventMessageConstants;
 import gr.cite.rabbitmq.RabbitProperties;
 import gr.cite.rabbitmq.broker.MessageHydrator;
+import jakarta.persistence.EntityManagerFactory;
 import org.springframework.amqp.core.MessageProperties;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -25,12 +26,14 @@ import java.util.UUID;
 @EnableConfigurationProperties({OutboxProperties.class})
 @ConditionalOnProperty(prefix = "queue.task.publisher", name = "enable", matchIfMissing = false)
 public class OutboxIntegrationEventConfigurer extends OutboxConfigurer {
-	private ApplicationContext applicationContext;
+	private final ApplicationContext applicationContext;
-	private OutboxProperties outboxProperties;
+	private final OutboxProperties outboxProperties;	
+	private final EntityManagerFactory entityManagerFactory;
 
-	public OutboxIntegrationEventConfigurer(ApplicationContext applicationContext, OutboxProperties outboxProperties) {
+	public OutboxIntegrationEventConfigurer(ApplicationContext applicationContext, OutboxProperties outboxProperties, EntityManagerFactory entityManagerFactory) {
 		this.applicationContext = applicationContext;
 		this.outboxProperties = outboxProperties;
+		this.entityManagerFactory = entityManagerFactory;
 	}
 
 	@Bean
@@ -66,7 +69,7 @@ public class OutboxIntegrationEventConfigurer extends OutboxConfigurer {
 
 	@Bean
 	public OutboxRepository outboxRepositoryCreator() {
-		return new OutboxRepositoryImpl(this.applicationContext, this.outboxProperties);
+		return new OutboxRepositoryImpl(this.applicationContext, this.outboxProperties, this.entityManagerFactory);
 	}
 }
 

notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/InboxRepositoryImpl.java

@@ -41,17 +41,17 @@ public class InboxRepositoryImpl implements InboxRepository {
     private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(InboxRepositoryImpl.class));
 
     protected final ApplicationContext applicationContext;
-
     private final JsonHandlingService jsonHandlingService;
-
     private final InboxProperties inboxProperties;
+    private final EntityManagerFactory entityManagerFactory;
 
     public InboxRepositoryImpl(
-            ApplicationContext applicationContext,
+		    ApplicationContext applicationContext,
-            InboxProperties inboxProperties
+		    InboxProperties inboxProperties, EntityManagerFactory entityManagerFactory
     ) {
         this.applicationContext = applicationContext;
-        this.jsonHandlingService = this.applicationContext.getBean(JsonHandlingService.class);
+	    this.entityManagerFactory = entityManagerFactory;
+	    this.jsonHandlingService = this.applicationContext.getBean(JsonHandlingService.class);
         this.inboxProperties = inboxProperties;
     }
 
@@ -63,8 +63,7 @@ public class InboxRepositoryImpl implements InboxRepository {
         try (FakeRequestScope ignored = new FakeRequestScope()) {
             try {
                 QueryFactory queryFactory = this.applicationContext.getBean(QueryFactory.class);
-                EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
+                entityManager = this.entityManagerFactory.createEntityManager();
-                entityManager = entityManagerFactory.createEntityManager();
 
                 transaction = entityManager.getTransaction();
                 transaction.begin();
@@ -121,9 +120,7 @@ public class InboxRepositoryImpl implements InboxRepository {
 
         try (FakeRequestScope ignored = new FakeRequestScope()) {
             try {
-                EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
+                entityManager = this.entityManagerFactory.createEntityManager();
-
-                entityManager = entityManagerFactory.createEntityManager();
                 transaction = entityManager.getTransaction();
 
                 transaction.begin();
@@ -167,9 +164,7 @@ public class InboxRepositoryImpl implements InboxRepository {
 
         try (FakeRequestScope ignored = new FakeRequestScope()) {
             try {
-                EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
+                entityManager = this.entityManagerFactory.createEntityManager();
-
-                entityManager = entityManagerFactory.createEntityManager();
                 transaction = entityManager.getTransaction();
 
                 transaction.begin();
@@ -215,9 +210,8 @@ public class InboxRepositoryImpl implements InboxRepository {
         try (FakeRequestScope ignored = new FakeRequestScope()) {
             try {
                 queueMessage = this.createQueueInboxEntity(inboxCreatorParams);
-                EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
 
-                entityManager = entityManagerFactory.createEntityManager();
+                entityManager = this.entityManagerFactory.createEntityManager();
                 transaction = entityManager.getTransaction();
 
                 transaction.begin();
@@ -276,9 +270,7 @@ public class InboxRepositoryImpl implements InboxRepository {
         try (FakeRequestScope ignored = new FakeRequestScope()) {
             try {
 
-                EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
+                entityManager = this.entityManagerFactory.createEntityManager();
-
-                entityManager = entityManagerFactory.createEntityManager();
                 transaction = entityManager.getTransaction();
                 
                 TenantEntityManager tenantEntityManager = this.applicationContext.getBean(TenantEntityManager.class);

notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/notify/NotifyIntegrationEventHandlerImpl.java

@@ -7,11 +7,9 @@ import gr.cite.notification.common.JsonHandlingService;
 import gr.cite.notification.common.enums.NotificationNotifyState;
 import gr.cite.notification.common.enums.NotificationTrackingProcess;
 import gr.cite.notification.common.enums.NotificationTrackingState;
-import gr.cite.notification.common.scope.fake.FakeRequestScope;
 import gr.cite.notification.common.scope.tenant.TenantScope;
 import gr.cite.notification.data.TenantEntity;
 import gr.cite.notification.data.TenantEntityManager;
-import gr.cite.notification.errorcode.ErrorThesaurusProperties;
 import gr.cite.notification.integrationevent.inbox.EventProcessingStatus;
 import gr.cite.notification.integrationevent.inbox.InboxPrincipal;
 import gr.cite.notification.integrationevent.inbox.IntegrationEventProperties;
@@ -21,21 +19,14 @@ import gr.cite.notification.query.TenantQuery;
 import gr.cite.notification.service.notification.NotificationService;
 import gr.cite.tools.auditing.AuditService;
 import gr.cite.tools.data.query.QueryFactory;
-import gr.cite.tools.exception.MyValidationException;
 import gr.cite.tools.fieldset.BaseFieldSet;
 import gr.cite.tools.logging.LoggerService;
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.EntityManagerFactory;
-import jakarta.persistence.EntityTransaction;
-import jakarta.persistence.OptimisticLockException;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Scope;
-import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Component;
 
+import javax.management.InvalidApplicationException;
 import java.time.Instant;
 import java.util.AbstractMap;
 import java.util.Map;
@@ -47,11 +38,6 @@ public class NotifyIntegrationEventHandlerImpl implements NotifyIntegrationEvent
     private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(NotifyIntegrationEventHandlerImpl.class));
 
     private final JsonHandlingService jsonHandlingService;
-
-
-    private final ErrorThesaurusProperties errors;
-
-    private final MessageSource messageSource;
     private final QueryFactory queryFactory;
     private final TenantScope tenantScope;
     private final CurrentPrincipalResolver currentPrincipalResolver;
@@ -60,10 +46,8 @@ public class NotifyIntegrationEventHandlerImpl implements NotifyIntegrationEvent
     private final NotificationService notificationService;
     private final AuditService auditService;
     private final TenantEntityManager tenantEntityManager;
-    public NotifyIntegrationEventHandlerImpl(JsonHandlingService jsonHandlingService, ErrorThesaurusProperties errors, MessageSource messageSource, QueryFactory queryFactory, TenantScope tenantScope, CurrentPrincipalResolver currentPrincipalResolver, ClaimExtractorProperties claimExtractorProperties, NotifyConsistencyHandler notifyConsistencyHandler, NotificationService notificationService, AuditService auditService, TenantEntityManager tenantEntityManager) {
+    public NotifyIntegrationEventHandlerImpl(JsonHandlingService jsonHandlingService, QueryFactory queryFactory, TenantScope tenantScope, CurrentPrincipalResolver currentPrincipalResolver, ClaimExtractorProperties claimExtractorProperties, NotifyConsistencyHandler notifyConsistencyHandler, NotificationService notificationService, AuditService auditService, TenantEntityManager tenantEntityManager) {
         this.jsonHandlingService = jsonHandlingService;
-        this.errors = errors;
-        this.messageSource = messageSource;
 	    this.queryFactory = queryFactory;
 	    this.tenantScope = tenantScope;
 	    this.currentPrincipalResolver = currentPrincipalResolver;
@@ -104,11 +88,11 @@ public class NotifyIntegrationEventHandlerImpl implements NotifyIntegrationEvent
                     logger.error("missing tenant from event message");
                     return EventProcessingStatus.Error;
                 }
-                this.tenantScope.setTempTenant(tenantEntityManager.getEntityManager(), properties.getTenantId(), tenant.getCode());
+                this.tenantScope.setTempTenant(tenantEntityManager, properties.getTenantId(), tenant.getCode());
             } else if (this.tenantScope.isMultitenant()) {
 //                    logger.error("missing tenant from event message");
 //                    return EventProcessingStatus.Error;
-                this.tenantScope.setTempTenant(tenantEntityManager.getEntityManager(), null, this.tenantScope.getDefaultTenantCode());
+                this.tenantScope.setTempTenant(tenantEntityManager, null, this.tenantScope.getDefaultTenantCode());
             }
 
             currentPrincipalResolver.push(InboxPrincipal.build(properties, claimExtractorProperties));
@@ -116,7 +100,7 @@ public class NotifyIntegrationEventHandlerImpl implements NotifyIntegrationEvent
             if (!(notifyConsistencyHandler.isConsistent(new NotifyConsistencyPredicates(event.getUserId(), event.getContactTypeHint(), event.getContactHint())))) {
                 status = EventProcessingStatus.Postponed;
                 currentPrincipalResolver.pop();
-                tenantScope.removeTempTenant(this.tenantEntityManager.getEntityManager());
+                tenantScope.removeTempTenant(this.tenantEntityManager);
                 return status;
             }
             notificationService.persist(model, new BaseFieldSet());
@@ -129,7 +113,11 @@ public class NotifyIntegrationEventHandlerImpl implements NotifyIntegrationEvent
             logger.error("Problem getting list of queue outbox. Skipping: {}", ex.getMessage(), ex);
         } finally {
             currentPrincipalResolver.pop();
-            tenantScope.removeTempTenant(this.tenantEntityManager.getEntityManager());
+	        try {
+		        tenantScope.removeTempTenant(this.tenantEntityManager);
+	        } catch (InvalidApplicationException e) {
+                logger.error( e.getMessage(), e);
+	        }
         }
         return status;
     }

notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenantdefaultlocaleremoval/TenantDefaultLocaleRemovalIntegrationEventHandlerImpl.java

@@ -73,11 +73,11 @@ public class TenantDefaultLocaleRemovalIntegrationEventHandlerImpl implements Te
                     logger.error("missing tenant from event message");
                     return EventProcessingStatus.Error;
                 }
-                this.tenantScope.setTempTenant(tenantEntityManager.getEntityManager(), properties.getTenantId(), tenant.getCode());
+                this.tenantScope.setTempTenant(tenantEntityManager, properties.getTenantId(), tenant.getCode());
             } else if (this.tenantScope.isMultitenant()) {
 //                    logger.error("missing tenant from event message");
 //                    return EventProcessingStatus.Error;
-                this.tenantScope.setTempTenant(tenantEntityManager.getEntityManager(), null, this.tenantScope.getDefaultTenantCode());
+                this.tenantScope.setTempTenant(tenantEntityManager, null, this.tenantScope.getDefaultTenantCode());
             }
             currentPrincipalResolver.push(InboxPrincipal.build(properties, claimExtractorProperties));
 

notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/tenantdefaultlocaletouched/TenantDefaultLocaleTouchedIntegrationEventHandlerImpl.java

@@ -82,11 +82,11 @@ public class TenantDefaultLocaleTouchedIntegrationEventHandlerImpl implements Te
                     logger.error("missing tenant from event message");
                     return EventProcessingStatus.Error;
                 }
-                this.tenantScope.setTempTenant(tenantEntityManager.getEntityManager(), properties.getTenantId(), tenant.getCode());
+                this.tenantScope.setTempTenant(tenantEntityManager, properties.getTenantId(), tenant.getCode());
             } else if (this.tenantScope.isMultitenant()) {
 //                    logger.error("missing tenant from event message");
 //                    return EventProcessingStatus.Error;
-                this.tenantScope.setTempTenant(tenantEntityManager.getEntityManager(), null, this.tenantScope.getDefaultTenantCode());
+                this.tenantScope.setTempTenant(tenantEntityManager, null, this.tenantScope.getDefaultTenantCode());
             }
             currentPrincipalResolver.push(InboxPrincipal.build(properties, claimExtractorProperties));
 

notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/userremoval/UserRemovalIntegrationEventHandlerImpl.java

@@ -26,6 +26,7 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Component;
 
+import javax.management.InvalidApplicationException;
 import java.util.AbstractMap;
 import java.util.Map;
 
@@ -86,11 +87,11 @@ public class UserRemovalIntegrationEventHandlerImpl implements UserRemovalIntegr
                     logger.error("missing tenant from event message");
                     return EventProcessingStatus.Error;
                 }
-                this.tenantScope.setTempTenant(tenantEntityManager.getEntityManager(), properties.getTenantId(), tenant.getCode());
+                this.tenantScope.setTempTenant(tenantEntityManager, properties.getTenantId(), tenant.getCode());
             } else if (this.tenantScope.isMultitenant()) {
 //                    logger.error("missing tenant from event message");
 //                    return EventProcessingStatus.Error;
-                this.tenantScope.setTempTenant(tenantEntityManager.getEntityManager(), null, this.tenantScope.getDefaultTenantCode());
+                this.tenantScope.setTempTenant(tenantEntityManager, null, this.tenantScope.getDefaultTenantCode());
             }
 
             currentPrincipalResolver.push(InboxPrincipal.build(properties, claimExtractorProperties));
@@ -98,7 +99,7 @@ public class UserRemovalIntegrationEventHandlerImpl implements UserRemovalIntegr
             if (!(userRemovalConsistencyHandler.isConsistent(new UserRemovalConsistencyPredicates(event.getUserId())))) {
                 status = EventProcessingStatus.Postponed;
                 currentPrincipalResolver.pop();
-                tenantScope.removeTempTenant(this.tenantEntityManager.getEntityManager());
+                tenantScope.removeTempTenant(this.tenantEntityManager);
                 return status;
             }
 
@@ -113,7 +114,11 @@ public class UserRemovalIntegrationEventHandlerImpl implements UserRemovalIntegr
             logger.error("Problem getting list of queue outbox. Skipping: {}", ex.getMessage(), ex);
         } finally {
             currentPrincipalResolver.pop();
-            tenantScope.removeTempTenant(this.tenantEntityManager.getEntityManager());
+	        try {
+		        tenantScope.removeTempTenant(this.tenantEntityManager);
+	        } catch (InvalidApplicationException e) {
+                logger.error( e.getMessage(), e);
+	        }
         }
 
         return status;

notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/usertouched/UserTouchedIntegrationEvent.java

@@ -14,6 +14,7 @@ import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 
@@ -229,10 +230,10 @@ public class UserTouchedIntegrationEvent extends TrackedEvent {
 
             @Override
             protected List<Specification> specifications(UserCredential item) {
-                return Arrays.asList(
+                return Collections.singletonList(
-                        this.spec()
+		                this.spec()
-                                .must(() -> !this.isEmpty(item.getSubjectId()))
+				                .must(() -> !this.isEmpty(item.getSubjectId()))
-                                .failOn(UserCredential._subjectId).failWith(messageSource.getMessage("Validation_Required", new Object[]{UserCredential._subjectId}, LocaleContextHolder.getLocale()))
+				                .failOn(UserCredential._subjectId).failWith(messageSource.getMessage("Validation_Required", new Object[]{UserCredential._subjectId}, LocaleContextHolder.getLocale()))
                 );
             }
         }
@@ -271,10 +272,10 @@ public class UserTouchedIntegrationEvent extends TrackedEvent {
 
             @Override
             protected List<Specification> specifications(TenantUser item) {
-                return Arrays.asList(
+                return Collections.singletonList(
-                        this.spec()
+		                this.spec()
-                                .must(() -> !this.isNull(item.getTenant()))
+				                .must(() -> !this.isNull(item.getTenant()))
-                                .failOn(TenantUser._tenant).failWith(messageSource.getMessage("Validation_Required", new Object[]{TenantUser._tenant}, LocaleContextHolder.getLocale()))
+				                .failOn(TenantUser._tenant).failWith(messageSource.getMessage("Validation_Required", new Object[]{TenantUser._tenant}, LocaleContextHolder.getLocale()))
                 );
             }
         }

notification-service/notification/src/main/java/gr/cite/notification/integrationevent/inbox/usertouched/UserTouchedIntegrationEventHandlerImpl.java

@@ -23,6 +23,7 @@ import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
+import javax.management.InvalidApplicationException;
 import java.util.AbstractMap;
 import java.util.Map;
 
@@ -76,11 +77,11 @@ public class UserTouchedIntegrationEventHandlerImpl implements UserTouchedIntegr
                     logger.error("missing tenant from event message");
                     return EventProcessingStatus.Error;
                 }
-                this.tenantScope.setTempTenant(tenantEntityManager.getEntityManager(), properties.getTenantId(), tenant.getCode());
+                this.tenantScope.setTempTenant(tenantEntityManager, properties.getTenantId(), tenant.getCode());
             } else if (this.tenantScope.isMultitenant()) {
 //                    logger.error("missing tenant from event message");
 //                    return EventProcessingStatus.Error;
-                this.tenantScope.setTempTenant(tenantEntityManager.getEntityManager(), null, this.tenantScope.getDefaultTenantCode());
+                this.tenantScope.setTempTenant(tenantEntityManager, null, this.tenantScope.getDefaultTenantCode());
             }
 
             currentPrincipalResolver.push(InboxPrincipal.build(properties, claimExtractorProperties));
@@ -96,7 +97,11 @@ public class UserTouchedIntegrationEventHandlerImpl implements UserTouchedIntegr
             logger.error("Problem getting list of queue outbox. Skipping: {}", ex.getMessage(), ex);
         } finally {
             currentPrincipalResolver.pop();
-            tenantScope.removeTempTenant(this.tenantEntityManager.getEntityManager());
+	        try {
+		        tenantScope.removeTempTenant(this.tenantEntityManager);
+	        } catch (InvalidApplicationException e) {
+                logger.error( e.getMessage(), e);
+	        }
         }
 
         return status;

notification-service/notification/src/main/java/gr/cite/notification/integrationevent/outbox/OutboxRepositoryImpl.java

@@ -33,16 +33,16 @@ public class OutboxRepositoryImpl implements OutboxRepository {
 
 	private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(OutboxRepositoryImpl.class));
 
-	private final JsonHandlingService jsonHandlingService;
+	private final EntityManagerFactory entityManagerFactory;
 
 	private final OutboxProperties outboxProperties;
 
 	public OutboxRepositoryImpl(
 			ApplicationContext applicationContext,
-			OutboxProperties outboxProperties
+			OutboxProperties outboxProperties, EntityManagerFactory entityManagerFactory
 	) {
 		this.applicationContext = applicationContext;
-		this.jsonHandlingService = this.applicationContext.getBean(JsonHandlingService.class);
+		this.entityManagerFactory = entityManagerFactory;
 		this.outboxProperties = outboxProperties;
 	}
 
@@ -54,8 +54,7 @@ public class OutboxRepositoryImpl implements OutboxRepository {
 		try (FakeRequestScope ignored = new FakeRequestScope()) {
 			try {
 				QueryFactory queryFactory = this.applicationContext.getBean(QueryFactory.class);
-				EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
+				entityManager = this.entityManagerFactory.createEntityManager();
-				entityManager = entityManagerFactory.createEntityManager();
 
 				transaction = entityManager.getTransaction();
 				transaction.begin();
@@ -115,9 +114,7 @@ public class OutboxRepositoryImpl implements OutboxRepository {
 
 		try (FakeRequestScope ignored = new FakeRequestScope()) {
 			try {
-				EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
+				entityManager = this.entityManagerFactory.createEntityManager();
-
-				entityManager = entityManagerFactory.createEntityManager();
 				transaction = entityManager.getTransaction();
 
 				transaction.begin();
@@ -161,9 +158,7 @@ public class OutboxRepositoryImpl implements OutboxRepository {
 
 		try (FakeRequestScope ignored = new FakeRequestScope()) {
 			try {
-				EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
+				entityManager = this.entityManagerFactory.createEntityManager();
-
-				entityManager = entityManagerFactory.createEntityManager();
 				transaction = entityManager.getTransaction();
 
 				transaction.begin();
@@ -208,10 +203,7 @@ public class OutboxRepositoryImpl implements OutboxRepository {
 
 		try (FakeRequestScope ignored = new FakeRequestScope()) {
 			try {
-
+				entityManager = this.entityManagerFactory.createEntityManager();
-				EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
-
-				entityManager = entityManagerFactory.createEntityManager();
 				transaction = entityManager.getTransaction();
 				transaction.begin();
 
@@ -264,10 +256,7 @@ public class OutboxRepositoryImpl implements OutboxRepository {
 
 		try (FakeRequestScope ignored = new FakeRequestScope()) {
 			try {
-
+				entityManager = this.entityManagerFactory.createEntityManager();
-				EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
-
-				entityManager = entityManagerFactory.createEntityManager();
 				transaction = entityManager.getTransaction();
 				transaction.begin();
 
@@ -308,10 +297,7 @@ public class OutboxRepositoryImpl implements OutboxRepository {
 
 		try (FakeRequestScope ignored = new FakeRequestScope()) {
 			try {
-
+				entityManager = this.entityManagerFactory.createEntityManager();
-				EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
-
-				entityManager = entityManagerFactory.createEntityManager();
 				transaction = entityManager.getTransaction();
 				transaction.begin();
 
@@ -353,9 +339,7 @@ public class OutboxRepositoryImpl implements OutboxRepository {
 		try (FakeRequestScope ignored = new FakeRequestScope()) {
 			try {
 				queueMessage = this.mapEvent((OutboxIntegrationEvent) item);
-				EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
+				entityManager = this.entityManagerFactory.createEntityManager();
-
-				entityManager = entityManagerFactory.createEntityManager();
 				transaction = entityManager.getTransaction();
 
 				transaction.begin();

notification-service/notification/src/main/java/gr/cite/notification/model/builder/BaseBuilder.java

@@ -34,7 +34,7 @@ public abstract class BaseBuilder<M, D> implements Builder {
 			M model = null;
 			return null; //TODO
 		}
-		List<M> models = this.build(directives, Arrays.asList(data));
+		List<M> models = this.build(directives, List.of(data));
 		return models.stream().findFirst().orElse(null); //TODO
 	}
 

notification-service/notification/src/main/java/gr/cite/notification/model/deleter/UserDeleter.java

@@ -69,12 +69,7 @@ public class UserDeleter implements Deleter {
         if (data == null || data.isEmpty())
             return;
         List<UUID> ids = data.stream().map(UserEntity::getId).distinct().collect(Collectors.toList());
-//		{
+
-//			logger.debug("checking related - {}", UserRoleEntity.class.getSimpleName());
-//			List<UserRoleEntity> items = this.queryFactory.query(UserRoleQuery.class).userIds(ids).collect();
-//			UserRoleDeleter deleter = this.deleterFactory.deleter(UserRoleDeleter.class);
-//			deleter.delete(items);
-//		}
         {
             logger.debug("checking related - {}", UserCredentialEntity.class.getSimpleName());
             List<UserCredentialEntity> items = this.queryFactory.query(UserCredentialQuery.class).userIds(ids).collect();
@@ -87,12 +82,7 @@ public class UserDeleter implements Deleter {
             UserContactInfoDeleter deleter = this.deleterFactory.deleter(UserContactInfoDeleter.class);
             deleter.delete(items);
         }
-//		{
+
-//			logger.debug("checking related - {}", TenantUserEntity.class.getSimpleName());
-//			List<TenantUserEntity> items = this.queryFactory.query(TenantUserQuery.class).userIds(ids).collect();
-//			TenantUserDeleter deleter = this.deleterFactory.deleter(TenantUserDeleter.class);
-//			deleter.delete(items);
-//		}
         Instant now = Instant.now();
 
         for (UserEntity item : data) {

notification-service/notification/src/main/java/gr/cite/notification/service/contact/extractor/EmailContactExtractor.java

@@ -102,7 +102,7 @@ public class EmailContactExtractor implements ContactExtractor {
 				return contacts;
 			}
 			default:
-				throw new MyApplicationException("Invalid type " + overrideMode.toString());
+				throw new MyApplicationException("Invalid type " + overrideMode);
 		}
 	}
 

notification-service/notification/src/main/java/gr/cite/notification/service/notification/NotificationServiceImpl.java

@@ -38,7 +38,6 @@ import gr.cite.tools.fieldset.BaseFieldSet;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.LoggerService;
 import gr.cite.tools.logging.MapLogEntry;
-import jakarta.transaction.Transactional;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
@@ -102,7 +101,6 @@ public class NotificationServiceImpl implements NotificationService {
     }
 
     @Override
-    @Transactional
     public Notification persist(NotificationPersist model, FieldSet fields) throws MyForbiddenException, MyValidationException, MyApplicationException, MyNotFoundException, InvalidApplicationException {
         logger.debug(new MapLogEntry("persisting notification").And("model", model).And("fields", fields));
 

notification-service/notification/src/main/java/gr/cite/notification/service/notificationscheduling/NotificationSchedulingServiceImpl.java

@@ -40,10 +40,12 @@ public class NotificationSchedulingServiceImpl implements NotificationScheduling
 	private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(NotificationSchedulingServiceImpl.class));
 	private final ApplicationContext applicationContext;
 	private final NotificationProperties properties;
+	private final EntityManagerFactory entityManagerFactory;
 
-	public NotificationSchedulingServiceImpl(ApplicationContext applicationContext, NotificationProperties properties) {
+	public NotificationSchedulingServiceImpl(ApplicationContext applicationContext, NotificationProperties properties, EntityManagerFactory entityManagerFactory) {
 		this.applicationContext = applicationContext;
 		this.properties = properties;
+		this.entityManagerFactory = entityManagerFactory;
 	}
 
 	@Override
@@ -53,9 +55,8 @@ public class NotificationSchedulingServiceImpl implements NotificationScheduling
 		CandidateInfo candidateInfo = null;
 		try (FakeRequestScope fakeRequestScope = new FakeRequestScope()) {
 			QueryFactory queryFactory = this.applicationContext.getBean(QueryFactory.class);
-			EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
 
-			entityManager = entityManagerFactory.createEntityManager();
+			entityManager = this.entityManagerFactory.createEntityManager();
 			transaction = entityManager.getTransaction();
 			transaction.begin();
 			NotificationQuery notificationQuery = queryFactory.query(NotificationQuery.class);
@@ -73,18 +74,21 @@ public class NotificationSchedulingServiceImpl implements NotificationScheduling
 				candidates.setNotifyState(NotificationNotifyState.PROCESSING);
 				//candidates.setUpdatedAt(Instant.now());
 				TenantScope tenantScope = this.applicationContext.getBean(TenantScope.class);
+				TenantEntityManager tenantEntityManager = this.applicationContext.getBean(TenantEntityManager.class);
+				tenantEntityManager.setEntityManager(entityManager);
+				
 				try {
 					if (candidates.getTenantId() != null) {
 						TenantEntity tenant = queryFactory.query(TenantQuery.class).ids(candidates.getTenantId()).first();
-						tenantScope.setTempTenant(entityManager, tenant.getId(), tenant.getCode());
+						tenantScope.setTempTenant(tenantEntityManager, tenant.getId(), tenant.getCode());
 					} else {
-						tenantScope.setTempTenant(entityManager, null, tenantScope.getDefaultTenantCode());
+						tenantScope.setTempTenant(tenantEntityManager, null, tenantScope.getDefaultTenantCode());
 					}
 					candidates = entityManager.merge(candidates);
 					entityManager.persist(candidates);
 					entityManager.flush();
 				} finally {
-					tenantScope.removeTempTenant(entityManager);
+					tenantScope.removeTempTenant(tenantEntityManager);
 				}
 
 				candidateInfo = new CandidateInfo(candidates.getId(), previousState, candidates.getCreatedAt());
@@ -108,9 +112,8 @@ public class NotificationSchedulingServiceImpl implements NotificationScheduling
 		EntityTransaction transaction = null;
 		Boolean shouldWait = false;
 		try (FakeRequestScope fakeRequestScope = new FakeRequestScope()) {
-			EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
 
-			entityManager = entityManagerFactory.createEntityManager();
+			entityManager = this.entityManagerFactory.createEntityManager();
 			transaction = entityManager.getTransaction();
 			transaction.begin();
 			NotificationEntity notification = entityManager.find(NotificationEntity.class, candidateInfo.getNotificationId());
@@ -122,7 +125,7 @@ public class NotificationSchedulingServiceImpl implements NotificationScheduling
 					accumulatedRetry += (i * options.getRetryThreshold());
 				for (int i = 1; i <= notification.getRetryCount(); i += 1)
 					pastAccumulateRetry += (i * options.getRetryThreshold());
-				int randAccumulatedRetry = ThreadLocalRandom.current().nextInt((int) (accumulatedRetry / 2), accumulatedRetry + 1);
+				int randAccumulatedRetry = ThreadLocalRandom.current().nextInt(accumulatedRetry / 2, accumulatedRetry + 1);
 				long additionalTime = randAccumulatedRetry > options.getMaxRetryDelaySeconds() ? options.getMaxRetryDelaySeconds() : randAccumulatedRetry;
 				long retry = pastAccumulateRetry + additionalTime;
 
@@ -133,19 +136,21 @@ public class NotificationSchedulingServiceImpl implements NotificationScheduling
 					notification.setNotifyState(candidateInfo.getPreviousState());
 					//notification.setUpdatedAt(Instant.now());
 					TenantScope tenantScope = this.applicationContext.getBean(TenantScope.class);
+					TenantEntityManager tenantEntityManager = this.applicationContext.getBean(TenantEntityManager.class);
+					tenantEntityManager.setEntityManager(entityManager);
 					try {
 						if (notification.getTenantId() != null) {
 							QueryFactory queryFactory = this.applicationContext.getBean(QueryFactory.class);
 							TenantEntity tenant = queryFactory.query(TenantQuery.class).ids(notification.getTenantId()).first();
-							tenantScope.setTempTenant(entityManager, tenant.getId(), tenant.getCode());
+							tenantScope.setTempTenant(tenantEntityManager, tenant.getId(), tenant.getCode());
 						} else {
-							tenantScope.setTempTenant(entityManager, null, tenantScope.getDefaultTenantCode());
+							tenantScope.setTempTenant(tenantEntityManager, null, tenantScope.getDefaultTenantCode());
 						}
 //						notification = entityManager.merge(notification);
 						entityManager.merge(notification);
 						entityManager.flush();
 					} finally {
-						tenantScope.removeTempTenant(entityManager);
+						tenantScope.removeTempTenant(tenantEntityManager);
 					}
 
 				}
@@ -170,9 +175,8 @@ public class NotificationSchedulingServiceImpl implements NotificationScheduling
 		EntityTransaction transaction = null;
 		Boolean shouldOmit = false;
 		try (FakeRequestScope fakeRequestScope = new FakeRequestScope()) {
-			EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
 
-			entityManager = entityManagerFactory.createEntityManager();
+			entityManager = this.entityManagerFactory.createEntityManager();
 			transaction = entityManager.getTransaction();
 			transaction.begin();
 
@@ -183,19 +187,21 @@ public class NotificationSchedulingServiceImpl implements NotificationScheduling
 				notification.setNotifyState(NotificationNotifyState.OMITTED);
 				//notification.setUpdatedAt(Instant.now());
 				TenantScope tenantScope = this.applicationContext.getBean(TenantScope.class);
+				TenantEntityManager tenantEntityManager = this.applicationContext.getBean(TenantEntityManager.class);
+				tenantEntityManager.setEntityManager(entityManager);
 				try {
 					if (notification.getTenantId() != null) {
 						QueryFactory queryFactory = this.applicationContext.getBean(QueryFactory.class);
 						TenantEntity tenant = queryFactory.query(TenantQuery.class).ids(notification.getTenantId()).first();
-						tenantScope.setTempTenant(entityManager, tenant.getId(), tenant.getCode());
+						tenantScope.setTempTenant(tenantEntityManager, tenant.getId(), tenant.getCode());
 					} else {
-						tenantScope.setTempTenant(entityManager, null, tenantScope.getDefaultTenantCode());
+						tenantScope.setTempTenant(tenantEntityManager, null, tenantScope.getDefaultTenantCode());
 					}
 					notification = entityManager.merge(notification);
 					entityManager.persist(notification);
 					entityManager.flush();
 				} finally {
-					tenantScope.removeTempTenant(entityManager);
+					tenantScope.removeTempTenant(tenantEntityManager);
 				}
 				shouldOmit = true;
 			}
@@ -219,9 +225,8 @@ public class NotificationSchedulingServiceImpl implements NotificationScheduling
 		EntityTransaction transaction = null;
 		Boolean success = null;
 		try (FakeRequestScope fakeRequestScope = new FakeRequestScope()) {
-			EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
 
-			entityManager = entityManagerFactory.createEntityManager();
+			entityManager = this.entityManagerFactory.createEntityManager();
 			transaction = entityManager.getTransaction();
 			transaction.begin();
 
@@ -239,9 +244,9 @@ public class NotificationSchedulingServiceImpl implements NotificationScheduling
 				if (notification.getTenantId() != null) {
 					QueryFactory queryFactory = this.applicationContext.getBean(QueryFactory.class);
 					TenantEntity tenant = queryFactory.query(TenantQuery.class).ids(notification.getTenantId()).first();
-					tenantScope.setTempTenant(entityManager, tenant.getId(), tenant.getCode());
+					tenantScope.setTempTenant(tenantEntityManager, tenant.getId(), tenant.getCode());
 				} else {
-					tenantScope.setTempTenant(entityManager, null, tenantScope.getDefaultTenantCode());
+					tenantScope.setTempTenant(tenantEntityManager, null, tenantScope.getDefaultTenantCode());
 				}
 				result = notificationService.doNotify(notification);
 
@@ -262,7 +267,7 @@ public class NotificationSchedulingServiceImpl implements NotificationScheduling
 				entityManager.persist(notification1);
 				entityManager.flush();
 			} finally {
-				tenantScope.removeTempTenant(entityManager);
+				tenantScope.removeTempTenant(tenantEntityManager);
 			}
 
 			
@@ -290,9 +295,8 @@ public class NotificationSchedulingServiceImpl implements NotificationScheduling
 		CandidateInfo candidateInfo = null;
 		try (FakeRequestScope fakeRequestScope = new FakeRequestScope()) {
 			QueryFactory queryFactory = this.applicationContext.getBean(QueryFactory.class);
-			EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
 
-			entityManager = entityManagerFactory.createEntityManager();
+			entityManager = this.entityManagerFactory.createEntityManager();
 			transaction = entityManager.getTransaction();
 			transaction.begin();
 			NotificationQuery notificationQuery = queryFactory.query(NotificationQuery.class);
@@ -312,18 +316,20 @@ public class NotificationSchedulingServiceImpl implements NotificationScheduling
 				candidates.setTrackingProcess(NotificationTrackingProcess.PROCESSING);
 				//candidates.setUpdatedAt(Instant.now());
 				TenantScope tenantScope = this.applicationContext.getBean(TenantScope.class);
+				TenantEntityManager tenantEntityManager = this.applicationContext.getBean(TenantEntityManager.class);
+				tenantEntityManager.setEntityManager(entityManager);
 				try {
 					if (candidates.getTenantId() != null) {
 						TenantEntity tenant = queryFactory.query(TenantQuery.class).ids(candidates.getTenantId()).first();
-						tenantScope.setTempTenant(entityManager, tenant.getId(), tenant.getCode());
+						tenantScope.setTempTenant(tenantEntityManager, tenant.getId(), tenant.getCode());
 					} else {
-						tenantScope.setTempTenant(entityManager, null, tenantScope.getDefaultTenantCode());
+						tenantScope.setTempTenant(tenantEntityManager, null, tenantScope.getDefaultTenantCode());
 					}
 					candidates = entityManager.merge(candidates);
 					entityManager.persist(candidates);
 					entityManager.flush();
 				} finally {
-					tenantScope.removeTempTenant(entityManager);
+					tenantScope.removeTempTenant(tenantEntityManager);
 				}
 				candidateInfo = new CandidateInfo(candidates.getId(), previousState, candidates.getCreatedAt());
 			}
@@ -346,9 +352,8 @@ public class NotificationSchedulingServiceImpl implements NotificationScheduling
 		EntityTransaction transaction = null;
 		Boolean shouldOmit = false;
 		try (FakeRequestScope fakeRequestScope = new FakeRequestScope()) {
-			EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
 
-			entityManager = entityManagerFactory.createEntityManager();
+			entityManager = this.entityManagerFactory.createEntityManager();
 			transaction = entityManager.getTransaction();
 			transaction.begin();
 
@@ -359,20 +364,22 @@ public class NotificationSchedulingServiceImpl implements NotificationScheduling
 				notification.setTrackingProcess(NotificationTrackingProcess.OMITTED);
 				//notification.setUpdatedAt(Instant.now());
 				TenantScope tenantScope = this.applicationContext.getBean(TenantScope.class);
+				TenantEntityManager tenantEntityManager = this.applicationContext.getBean(TenantEntityManager.class);
+				tenantEntityManager.setEntityManager(entityManager);
 				try {
 					if (notification.getTenantId() != null) {
 						QueryFactory queryFactory = this.applicationContext.getBean(QueryFactory.class);
 						TenantEntity tenant = queryFactory.query(TenantQuery.class).ids(notification.getTenantId()).first();
-						tenantScope.setTempTenant(entityManager, tenant.getId(), tenant.getCode());
+						tenantScope.setTempTenant(tenantEntityManager, tenant.getId(), tenant.getCode());
 					} else {
-						tenantScope.setTempTenant(entityManager, null, tenantScope.getDefaultTenantCode());
+						tenantScope.setTempTenant(tenantEntityManager, null, tenantScope.getDefaultTenantCode());
 					}
 
 					notification = entityManager.merge(notification);
 					entityManager.persist(notification);
 					entityManager.flush();
 				} finally {
-					tenantScope.removeTempTenant(entityManager);
+					tenantScope.removeTempTenant(tenantEntityManager);
 				}
 				shouldOmit = true;
 			}
@@ -397,9 +404,8 @@ public class NotificationSchedulingServiceImpl implements NotificationScheduling
 		Boolean success = null;
 		try (FakeRequestScope fakeRequestScope = new FakeRequestScope()) {
 			QueryFactory queryFactory = this.applicationContext.getBean(QueryFactory.class);
-			EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
 
-			entityManager = entityManagerFactory.createEntityManager();
+			entityManager = this.entityManagerFactory.createEntityManager();
 			transaction = entityManager.getTransaction();
 			transaction.begin();
 
@@ -417,9 +423,9 @@ public class NotificationSchedulingServiceImpl implements NotificationScheduling
 			try {
 				if (notification.getTenantId() != null) {
 					TenantEntity tenant = queryFactory.query(TenantQuery.class).ids(notification.getTenantId()).first();
-					tenantScope.setTempTenant(entityManager, tenant.getId(), tenant.getCode());
+					tenantScope.setTempTenant(tenantEntityManager, tenant.getId(), tenant.getCode());
 				} else {
-					tenantScope.setTempTenant(entityManager, null, tenantScope.getDefaultTenantCode());
+					tenantScope.setTempTenant(tenantEntityManager, null, tenantScope.getDefaultTenantCode());
 				}
 				try {
 					TrackingFactory trackingFactory = applicationContext.getBean(TrackingFactory.class);
@@ -445,7 +451,7 @@ public class NotificationSchedulingServiceImpl implements NotificationScheduling
 				entityManager.persist(notification1);
 				entityManager.flush();
 			} finally {
-				tenantScope.removeTempTenant(entityManager);
+				tenantScope.removeTempTenant(tenantEntityManager);
 			}
 			
 			

notification-service/notification/src/main/java/gr/cite/notification/service/notify/InAppNotifier.java

@@ -29,11 +29,13 @@ public class InAppNotifier implements Notify{
 
     private final JsonHandlingService jsonHandlingService;
     private final ApplicationContext applicationContext;
+    private final EntityManagerFactory entityManagerFactory;
 
     @Autowired
-    public InAppNotifier(JsonHandlingService jsonHandlingService, ApplicationContext applicationContext) {
+    public InAppNotifier(JsonHandlingService jsonHandlingService, ApplicationContext applicationContext, EntityManagerFactory entityManagerFactory) {
         this.jsonHandlingService = jsonHandlingService;
         this.applicationContext = applicationContext;
+	    this.entityManagerFactory = entityManagerFactory;
     }
 
     @Override
@@ -42,9 +44,7 @@ public class InAppNotifier implements Notify{
         EntityManager entityManager = null;
         EntityTransaction transaction = null;
         try {
-            EntityManagerFactory entityManagerFactory = this.applicationContext.getBean(EntityManagerFactory.class);
+            entityManager = this.entityManagerFactory.createEntityManager();
-
-            entityManager = entityManagerFactory.createEntityManager();
             transaction = entityManager.getTransaction();
             transaction.begin();
             InAppContact inAppContact = (InAppContact) contact;

notification-service/notification/src/main/java/gr/cite/notification/service/notify/NotifierFactory.java

@@ -10,7 +10,7 @@ import java.util.stream.Collectors;
 @Component
 public class NotifierFactory {
 
-    private Map<NotificationContactType, Notify> notifyMap;
+    private final Map<NotificationContactType, Notify> notifyMap;
 
     public NotifierFactory(List<Notify> notifies) {
         this.notifyMap = notifies.stream().collect(Collectors.toMap(Notify::supports, notify -> notify));

notification-service/notification/src/main/java/gr/cite/notification/service/track/EmailTracker.java

@@ -18,7 +18,7 @@ public class EmailTracker implements Track {
 //        if (notification.getTrackingProgress() != NotificationTrackingProgress.PROCESSING)
         if(1==1)
         {
-            this.logger.warn("notification " + notification.getId() + " was send for tracking but it is not locked for processing");
+            logger.warn("notification " + notification.getId() + " was send for tracking but it is not locked for processing");
             return null;
         }
 

notification-service/notification/src/main/java/gr/cite/notification/service/track/TrackingFactory.java

@@ -10,7 +10,7 @@ import java.util.stream.Collectors;
 @Component
 public class TrackingFactory {
 
-    private Map<NotificationContactType, Track> trackMap;
+    private final Map<NotificationContactType, Track> trackMap;
 
     public TrackingFactory(List<Track> notifies) {
         this.trackMap = notifies.stream().collect(Collectors.toMap(Track::supports, track -> track));

notification-service/notification/src/main/java/gr/cite/notification/service/user/UserServiceImpl.java

@@ -33,8 +33,6 @@ import gr.cite.tools.fieldset.BaseFieldSet;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.LoggerService;
 import gr.cite.tools.logging.MapLogEntry;
-import jakarta.persistence.EntityManager;
-import jakarta.transaction.Transactional;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.MessageSource;
@@ -87,7 +85,6 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    @Transactional
     public User persist(UserTouchedIntegrationEvent model, FieldSet fields) throws MyForbiddenException, MyValidationException, MyApplicationException, MyNotFoundException, InvalidApplicationException, JsonProcessingException {
         logger.debug(new MapLogEntry("persisting user").And("model", model).And("fields", fields));
 
@@ -229,7 +226,7 @@ public class UserServiceImpl implements UserService {
                     try {
                         TenantEntity tenant = tenantEntities.stream().filter(x -> x.getId().equals(model.getTenant())).findFirst().orElse(null);
                         if (tenant == null) throw new MyNotFoundException(messageSource.getMessage("General_ItemNotFound", new Object[]{model.getTenant(), Tenant.class.getSimpleName()}, LocaleContextHolder.getLocale()));
-                        this.tenantScope.setTempTenant(this.entityManager.getEntityManager(), tenant.getId(), tenant.getCode());
+                        this.tenantScope.setTempTenant(this.entityManager, tenant.getId(), tenant.getCode());
                         data = new TenantUserEntity();
                         data.setId(UUID.randomUUID());
                         data.setUserId(userId);
@@ -239,7 +236,7 @@ public class UserServiceImpl implements UserService {
                         data.setIsActive(IsActive.Active);
                         entityManager.persist(data);
                     } finally {
-                        this.tenantScope.removeTempTenant(this.entityManager.getEntityManager());
+                        this.tenantScope.removeTempTenant(this.entityManager);
                     }
                 }
                 updatedCreatedIds.add(data.getId());