Introduced Base class for JPA repositories

Author: michalluzyna

src/main/java/com/capgemini/training/appointmentbooking/AppointmentBookingAppApplication.java

@@ -1,9 +1,12 @@
 package com.capgemini.training.appointmentbooking;
 
+import com.capgemini.training.appointmentbooking.dataaccess.repository.impl.BaseJpaRepositoryImpl;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 @SpringBootApplication
+@EnableJpaRepositories(repositoryBaseClass = BaseJpaRepositoryImpl.class)
 public class AppointmentBookingAppApplication {
 
 	public static void main(String[] args) {

src/main/java/com/capgemini/training/appointmentbooking/dataaccess/repository/AppointmentRepository.java

@@ -6,9 +6,7 @@
 import com.capgemini.training.appointmentbooking.dataaccess.entity.SpecialistEntity;
 import com.capgemini.training.appointmentbooking.dataaccess.entity.TreatmentEntity;
 import com.capgemini.training.appointmentbooking.dataaccess.repository.criteria.AppointmentCriteria;
-import jakarta.persistence.EntityManager;
 import jakarta.persistence.criteria.*;
-import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
@@ -21,12 +19,12 @@
 
 
 @Repository
-public interface AppointmentRepository extends JpaRepository<AppointmentEntity, Long> {
+public interface AppointmentRepository extends BaseJpaRepository<AppointmentEntity, Long> {
 
-    default List<AppointmentEntity> findByCriteria(AppointmentCriteria appointmentCriteria, EntityManager entityManager) {
+    default List<AppointmentEntity> findByCriteria(AppointmentCriteria appointmentCriteria) {
         Objects.requireNonNull(appointmentCriteria, "appointmentCriteria must not be null");
 
-        CriteriaBuilder cb = entityManager.getCriteriaBuilder();
+        CriteriaBuilder cb = getEntityManager().getCriteriaBuilder();
         CriteriaQuery<AppointmentEntity> cq = cb.createQuery(AppointmentEntity.class);
         Root<AppointmentEntity> root = cq.from(AppointmentEntity.class);
         List<Predicate> predicates = new ArrayList<>();
@@ -40,14 +38,11 @@ default List<AppointmentEntity> findByCriteria(AppointmentCriteria appointmentCr
                 });
 
         Optional.ofNullable(appointmentCriteria.startDate())
-                .ifPresent(startDate -> {
-                    predicates.add(cb.greaterThanOrEqualTo(root.get("dateTime"), startDate));
-                });
+                .ifPresent(startDate -> predicates.add(cb.greaterThanOrEqualTo(root.get("dateTime"), startDate))
+                );
 
         Optional.ofNullable(appointmentCriteria.endDate())
-                .ifPresent(endDate -> {
-                    predicates.add(cb.lessThanOrEqualTo(root.get("dateTime"), endDate));
-                });
+                .ifPresent(endDate -> predicates.add(cb.lessThanOrEqualTo(root.get("dateTime"), endDate)));
 
         Optional.ofNullable(appointmentCriteria.status())
                 .ifPresent(status -> predicates.add(cb.equal(root.get("status"), status)));
@@ -66,7 +61,7 @@ default List<AppointmentEntity> findByCriteria(AppointmentCriteria appointmentCr
                 });
 
         cq.where(predicates.toArray(new Predicate[0]));
-        return entityManager.createQuery(cq).getResultList();
+        return getEntityManager().createQuery(cq).getResultList();
     }
 
     List<AppointmentEntity> findByDateTimeBetweenAndStatus(Instant start, Instant end, AppointmentStatus status);

src/main/java/com/capgemini/training/appointmentbooking/dataaccess/repository/BaseJpaRepository.java

@@ -0,0 +1,11 @@
+package com.capgemini.training.appointmentbooking.dataaccess.repository;
+
+import jakarta.persistence.EntityManager;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.support.JpaRepositoryImplementation;
+import org.springframework.data.repository.NoRepositoryBean;
+
+@NoRepositoryBean
+public interface BaseJpaRepository<T, ID> extends JpaRepositoryImplementation<T, ID> {
+    EntityManager getEntityManager();
+}

src/main/java/com/capgemini/training/appointmentbooking/dataaccess/repository/ClientRepository.java

@@ -11,10 +11,10 @@
 import java.util.List;
 
 @Repository
-public interface ClientRepository extends JpaRepository<ClientEntity, Long> {
+public interface ClientRepository extends BaseJpaRepository<ClientEntity, Long> {
 
-    default List<ClientEntity> findByName(String firstName, String lastName, EntityManager entityManager) {
-        JPAQueryFactory queryFactory = new JPAQueryFactory(entityManager);
+    default List<ClientEntity> findByName(String firstName, String lastName) {
+        JPAQueryFactory queryFactory = new JPAQueryFactory(getEntityManager());
 
         QClientEntity client = QClientEntity.clientEntity;
         QUserEntity user = QUserEntity.userEntity;

src/main/java/com/capgemini/training/appointmentbooking/dataaccess/repository/SpecialistRepository.java

@@ -1,21 +1,22 @@
 package com.capgemini.training.appointmentbooking.dataaccess.repository;
 
 import com.capgemini.training.appointmentbooking.common.datatype.Specialization;
-import com.capgemini.training.appointmentbooking.dataaccess.entity.*;
+import com.capgemini.training.appointmentbooking.dataaccess.entity.QSpecialistEntity;
+import com.capgemini.training.appointmentbooking.dataaccess.entity.QUserEntity;
+import com.capgemini.training.appointmentbooking.dataaccess.entity.SpecialistEntity;
 import com.querydsl.jpa.impl.JPAQueryFactory;
-import jakarta.persistence.EntityManager;
-import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.querydsl.QuerydslPredicateExecutor;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
 @Repository
-public interface SpecialistRepository extends JpaRepository<SpecialistEntity, Long> {
+public interface SpecialistRepository extends BaseJpaRepository<SpecialistEntity, Long>, QuerydslPredicateExecutor<SpecialistEntity> {
 
     List<SpecialistEntity> findBySpecialization(Specialization specialization);
 
-    default List<SpecialistEntity> findSpecialistByName(String firstName, String lastName, EntityManager entityManager) {
-        JPAQueryFactory queryFactory = new JPAQueryFactory(entityManager);
+    default List<SpecialistEntity> findSpecialistByName(String firstName, String lastName) {
+        JPAQueryFactory queryFactory = new JPAQueryFactory(getEntityManager());
 
         QSpecialistEntity specialist = QSpecialistEntity.specialistEntity;
         QUserEntity user = QUserEntity.userEntity;
@@ -26,5 +27,6 @@ default List<SpecialistEntity> findSpecialistByName(String firstName, String las
                 .where(user.firstname.eq(firstName)
                         .and(user.lastname.eq(lastName)))
                 .fetch();
+
     }
 }

src/main/java/com/capgemini/training/appointmentbooking/dataaccess/repository/TreatmentRepository.java

@@ -7,26 +7,25 @@
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.jpa.impl.JPAQuery;
 import jakarta.persistence.EntityManager;
-import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 import java.util.Objects;
 
 @Repository
-public interface TreatmentRepository extends JpaRepository<TreatmentEntity, Long> {
+public interface TreatmentRepository extends BaseJpaRepository<TreatmentEntity, Long> {
 
     List<TreatmentEntity> findAllByName(String name);
 
     List<TreatmentEntity> findByNameNamedQuery(String name);
 
-    default List<TreatmentEntity> findByCriteria(TreatmentCriteria treatmentCriteria, EntityManager entityManager) {
+    default List<TreatmentEntity> findByCriteria(TreatmentCriteria treatmentCriteria) {
         Objects.requireNonNull(treatmentCriteria, "treatmentCriteria cannot be null");
 
         QTreatmentEntity treatment = QTreatmentEntity.treatmentEntity;
         QSpecialistEntity specialist = QSpecialistEntity.specialistEntity;
 
-        JPAQuery<TreatmentEntity> query = new JPAQuery<>(entityManager);
+        JPAQuery<TreatmentEntity> query = new JPAQuery<>(getEntityManager());
         BooleanExpression predicate = treatment.isNotNull();
 
         if (treatmentCriteria.name() != null) {

src/main/java/com/capgemini/training/appointmentbooking/dataaccess/repository/impl/BaseJpaRepositoryImpl.java

@@ -0,0 +1,22 @@
+package com.capgemini.training.appointmentbooking.dataaccess.repository.impl;
+
+import com.capgemini.training.appointmentbooking.dataaccess.repository.BaseJpaRepository;
+import jakarta.persistence.EntityManager;
+import org.springframework.data.jpa.repository.support.JpaEntityInformation;
+import org.springframework.data.jpa.repository.support.SimpleJpaRepository;
+import org.springframework.stereotype.Repository;
+
+public class BaseJpaRepositoryImpl <T, ID>  extends SimpleJpaRepository<T, ID> implements BaseJpaRepository<T, ID> {
+
+    private final EntityManager entityManager;
+
+    BaseJpaRepositoryImpl(JpaEntityInformation<T, ?> entityInformation, EntityManager entityManager) {
+        super(entityInformation, entityManager);
+        this.entityManager = entityManager;
+    }
+
+    @Override
+    public EntityManager getEntityManager(){
+        return this.entityManager;
+    }
+}

src/test/java/com/capgemini/training/appointmentbooking/dataaccess/repository/AppointmentRepositoryTest.java

@@ -7,16 +7,11 @@
 import com.capgemini.training.appointmentbooking.dataaccess.entity.SpecialistEntity;
 import com.capgemini.training.appointmentbooking.dataaccess.entity.TreatmentEntity;
 import com.capgemini.training.appointmentbooking.dataaccess.repository.criteria.AppointmentCriteria;
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.PersistenceContext;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 
 import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Optional;
 
@@ -26,8 +21,6 @@ public class AppointmentRepositoryTest extends BaseTest {
     @Autowired
     private AppointmentRepository appointmentRepository;
 
-    @PersistenceContext
-    private EntityManager entityManager;
 
     @Test
     void shouldFindAll() {
@@ -48,7 +41,7 @@ void shouldFindAppointmentsByTreatmentName() {
                 .build();
 
         // when
-        List<AppointmentEntity> result = appointmentRepository.findByCriteria(criteria, entityManager);
+        List<AppointmentEntity> result = appointmentRepository.findByCriteria(criteria);
 
         // then
         assertThat(result).hasSize(2);
@@ -64,7 +57,7 @@ void shouldFindAppointmentsByTreatmentNameAndStartDate() {
                 .build();
 
         // when
-        List<AppointmentEntity> result = appointmentRepository.findByCriteria(criteria, entityManager);
+        List<AppointmentEntity> result = appointmentRepository.findByCriteria(criteria);
 
         // then
         assertThat(result).hasSize(2);
@@ -81,7 +74,7 @@ void shouldFindAppointmentsByTreatmentNameAndBetweenStartDateAndEndDate() {
                 .build();
 
         // when
-        List<AppointmentEntity> result = appointmentRepository.findByCriteria(criteria, entityManager);
+        List<AppointmentEntity> result = appointmentRepository.findByCriteria(criteria);
 
         // then
         assertThat(result).hasSize(1);
@@ -97,7 +90,7 @@ void shouldFindAppointmentsByTreatmentNameAndAppointmentStatus() {
                 .build();
 
         // when
-        List<AppointmentEntity> result = appointmentRepository.findByCriteria(criteria, entityManager);
+        List<AppointmentEntity> result = appointmentRepository.findByCriteria(criteria);
 
         // then
         assertThat(result).hasSize(2);
@@ -113,7 +106,7 @@ void shouldFindAppointmentsByClientId() {
                 .build();
 
         // when
-        List<AppointmentEntity> result = appointmentRepository.findByCriteria(criteria, entityManager);
+        List<AppointmentEntity> result = appointmentRepository.findByCriteria(criteria);
 
         // then
         assertThat(result).hasSize(5);
@@ -130,7 +123,7 @@ void shouldFindAppointmentsBySpecialistId() {
                 .build();
 
         // when
-        List<AppointmentEntity> result = appointmentRepository.findByCriteria(criteria, entityManager);
+        List<AppointmentEntity> result = appointmentRepository.findByCriteria(criteria);
 
         // then
         assertThat(result).hasSize(4);

src/test/java/com/capgemini/training/appointmentbooking/dataaccess/repository/ClientRepositoryTest.java

@@ -2,8 +2,6 @@
 
 import com.capgemini.training.appointmentbooking.common.BaseTest;
 import com.capgemini.training.appointmentbooking.dataaccess.entity.ClientEntity;
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.PersistenceContext;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
@@ -16,17 +14,14 @@ public class ClientRepositoryTest extends BaseTest {
     @Autowired
     private ClientRepository clientRepository;
 
-    @PersistenceContext
-    private EntityManager entityManager;
-
     @Test
     void shouldFindClientsByName() {
         // given
         String firstName = "Stefan";
         String lastName = "Kowalski";
 
         // when
-        List<ClientEntity> clients = clientRepository.findByName(firstName, lastName, entityManager);
+        List<ClientEntity> clients = clientRepository.findByName(firstName, lastName);
 
         // then
         assertThat(clients)

src/test/java/com/capgemini/training/appointmentbooking/dataaccess/repository/SpecialistRepositoryTest.java

@@ -3,8 +3,6 @@
 import com.capgemini.training.appointmentbooking.common.BaseTest;
 import com.capgemini.training.appointmentbooking.common.datatype.Specialization;
 import com.capgemini.training.appointmentbooking.dataaccess.entity.SpecialistEntity;
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.PersistenceContext;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
@@ -17,9 +15,6 @@ public class SpecialistRepositoryTest extends BaseTest {
     @Autowired
     private SpecialistRepository specialistRepository;
 
-    @PersistenceContext
-    private EntityManager entityManager;
-
     @Test
     void shouldFindSpecialistsBySpecialization() {
         // given
@@ -42,7 +37,7 @@ void shouldFindSpecialistsByName() {
         String lastName = "Zegula";
 
         // when
-        List<SpecialistEntity> specialists = specialistRepository.findSpecialistByName(firstName, lastName, entityManager);
+        List<SpecialistEntity> specialists = specialistRepository.findSpecialistByName(firstName, lastName);
 
         // then
         assertThat(specialists)