SORMAS-Foundation#3488 fix to match latest state of development

Author: FredrikSchäferVitagroup

sormas-backend/src/main/java/de/symeda/sormas/backend/labmessage/LabMessageFacadeEjb.java

@@ -18,14 +18,14 @@
 import javax.persistence.criteria.Root;
 import javax.validation.constraints.NotNull;
 
-import de.symeda.sormas.api.ConfigFacade;
 import de.symeda.sormas.api.labmessage.ExternalLabResultsFacade;
 import de.symeda.sormas.api.labmessage.LabMessageCriteria;
 import de.symeda.sormas.api.labmessage.LabMessageDto;
 import de.symeda.sormas.api.labmessage.LabMessageFacade;
 import de.symeda.sormas.api.labmessage.LabMessageIndexDto;
 import de.symeda.sormas.api.utils.SortProperty;
-import de.symeda.sormas.backend.common.AbstractAdoService;
+import de.symeda.sormas.backend.common.BaseAdoService;
+import de.symeda.sormas.backend.common.ConfigFacadeEjb;
 import de.symeda.sormas.backend.util.DtoHelper;
 import de.symeda.sormas.backend.util.ModelConstants;
 
@@ -38,7 +38,7 @@ public class LabMessageFacadeEjb implements LabMessageFacade {
 	@EJB
 	private LabMessageService labMessageService;
 	@EJB
-	private ConfigFacade configFacade;
+	private ConfigFacadeEjb.ConfigFacadeEjbLocal configFacade;
 
 	private LabMessage fromDto(@NotNull LabMessageDto source, LabMessage target) {
 
@@ -141,7 +141,7 @@ public long count(LabMessageCriteria criteria) {
 
 		if (criteria != null) {
 			Predicate statusFilter = labMessageService.createStatusFilter(cb, labMessage, criteria);
-			filter = AbstractAdoService.and(cb, filter, statusFilter);
+			filter = BaseAdoService.and(cb, filter, statusFilter);
 		}
 
 		if (filter != null) {
@@ -170,7 +170,7 @@ public List<LabMessageIndexDto> getIndexList(LabMessageCriteria criteria, Intege
 		Predicate filter = null;
 		if (criteria != null) {
 			Predicate statusFilter = labMessageService.createStatusFilter(cb, labMessage, criteria);
-			filter = AbstractAdoService.and(cb, filter, statusFilter);
+			filter = BaseAdoService.and(cb, filter, statusFilter);
 		}
 
 		if (filter != null) {

sormas-backend/src/main/java/de/symeda/sormas/backend/labmessage/LabMessageService.java

@@ -1,7 +1,19 @@
 package de.symeda.sormas.backend.labmessage;
 
+import de.symeda.sormas.api.labmessage.LabMessageCriteria;
+import de.symeda.sormas.backend.common.AdoServiceWithUserFilter;
 import de.symeda.sormas.backend.common.BaseAdoService;
 
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+@Stateless
+@LocalBean
 public class LabMessageService extends BaseAdoService<LabMessage> {
 
 	public LabMessageService() {