FINERACT-2304 - fix entity manager usage only through persistence context annotation

fineract-core/src/main/java/org/apache/fineract/batch/service/BatchApiServiceImpl.java

@@ -90,8 +90,7 @@ public class BatchApiServiceImpl implements BatchApiService {
 
     private final List<BatchRequestPreprocessor> batchPreprocessors;
 
-    @PersistenceContext
-    private final EntityManager entityManager;
+    private EntityManager entityManager;
 
     /**
      * Run each request root step in a separated transaction
@@ -380,4 +379,9 @@ public class BatchApiServiceImpl implements BatchApiService {
         return new BatchResponse().setRequestId(requestId).setStatusCode(statusCode == null ? SC_INTERNAL_SERVER_ERROR : statusCode)
                 .setBody(body == null ? "Request with id " + requestId + " was erroneous!" : body).setHeaders(headers);
     }
+
+    @PersistenceContext
+    public void setEntityManager(EntityManager entityManager) {
+        this.entityManager = entityManager;
+    }
 }

fineract-core/src/main/java/org/apache/fineract/infrastructure/core/jpa/CriteriaQueryFactory.java

@@ -19,6 +19,7 @@
 package org.apache.fineract.infrastructure.core.jpa;
 
 import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.TypedQuery;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
@@ -41,7 +42,8 @@ import org.springframework.stereotype.Component;
 @RequiredArgsConstructor
 public class CriteriaQueryFactory {
 
-    private final EntityManager entityManager;
+    @PersistenceContext
+    private EntityManager entityManager;
 
     public List<Order> ordersFromPageable(Pageable pageable, CriteriaBuilder cb, Root<?> root) {
         return ordersFromPageable(pageable, cb, root, () -> null);

fineract-core/src/main/java/org/apache/fineract/infrastructure/event/external/repository/CustomExternalEventConfigurationRepositoryImpl.java

@@ -30,7 +30,7 @@ import org.springframework.stereotype.Component;
 public class CustomExternalEventConfigurationRepositoryImpl implements CustomExternalEventConfigurationRepository {
 
     @PersistenceContext
-    private final EntityManager entityManager;
+    private EntityManager entityManager;
 
     @Override
     public ExternalEventConfiguration findExternalEventConfigurationByTypeWithNotFoundDetection(String externalEventType) {

fineract-core/src/main/java/org/apache/fineract/portfolio/client/domain/search/SearchingClientRepositoryImpl.java

@@ -19,6 +19,7 @@
 package org.apache.fineract.portfolio.client.domain.search;
 
 import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.TypedQuery;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
@@ -44,7 +45,9 @@ import org.springframework.stereotype.Repository;
 @RequiredArgsConstructor
 public class SearchingClientRepositoryImpl implements SearchingClientRepository {
 
-    private final EntityManager entityManager;
+    @PersistenceContext
+    private EntityManager entityManager;
+
     private final CriteriaQueryFactory criteriaQueryFactory;
 
     @Override

fineract-core/src/test/java/org/apache/fineract/batch/service/BatchApiServiceImplTest.java

@@ -66,6 +66,7 @@ class BatchApiServiceImplTest {
 
     @BeforeEach
     void setUp() {
+        batchApiService.setEntityManager(entityManager);
         request = new BatchRequest();
         request.setRequestId(1L);
         request.setMethod("POST");