methods in daoRepository have changed with new names, also check this refactors in other classes.

Author: PouyaPouryaie

src/main/java/ir/bigz/springbootreal/dal/DaoRepository.java

@@ -19,26 +19,32 @@ public interface DaoRepository<T, K extends Serializable> {
 
     Object getORMapper();
     <E> E getORMapper(Class<E> type);
-    <S extends T> S insert(S entity);
-    <S extends T> Iterable<S> insert(Iterable<S> entities);
+    <S extends T> S save(S entity);
+    <S extends T> Iterable<S> saveAll(Iterable<S> entities);
+
     <S extends T> S update(S entity);
-    <S extends T> Iterable<S> update(Iterable<S> entities);
+    <S extends T> Iterable<S> updateAll(Iterable<S> entities);
+
+    void deleteById(K id);
     <S extends T> void delete(S entity);
-    void delete(K id);
     void deleteAll();
-    Optional<T> find(K id);
-    <S extends T> List<S> find(List<K> entityIds);
+    void deleteAllById(Iterable<? extends K> entities);
+    void deleteAll(Iterable<? extends T> entities);
+
+    Optional<T> findById(K id);
+    Stream<T> findAll();
+    List<T> findAll(Sort sort);
+    Page<T> findAll(Pageable pageable);
     <S extends T> List<S> find(String entityName);
+
     List<T> genericSearch(String query);
+    List<T> genericSearch(CriteriaQuery<T> criteriaQuery);
+    Page<T> genericSearch(CriteriaQuery<T> criteriaQuery, Pageable pageable);
+    Page<T> genericSearch(String query, Pageable pageable);
+
     List<T> nativeQuery(String query, Map<String, Object> parameters);
     PageResult<T> pageCreateQuery(String nativeQuery, PagedQuery pagedQuery, Map<String, Object> parameterMap, boolean getTotalCount);
+
     void flush();
     void clear();
-
-    Stream<T> getAll();
-    List<T> getAll(Sort sort);
-    Page<T> getAll(Pageable pageable);
-    List<T> genericSearch(CriteriaQuery<T> criteriaQuery);
-    Page<T> genericSearch(CriteriaQuery<T> criteriaQuery, Pageable pageable);
-    Page<T> genericSearch(String query, Pageable pageable);
 }

src/main/java/ir/bigz/springbootreal/dal/DaoRepositoryImpl.java

@@ -71,13 +71,13 @@ public <E> E getORMapper(Class<E> type) {
 
     @Override
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
-    public <S extends T> S insert(S entity) {
+    public <S extends T> S save(S entity) {
         entityManager.persist(entity);
         return entity;
     }
 
     @Override
-    public <S extends T> Iterable<S> insert(Iterable<S> entities) {
+    public <S extends T> Iterable<S> saveAll(Iterable<S> entities) {
         return null;
     }
 
@@ -88,7 +88,7 @@ public <S extends T> S update(S entity) {
     }
 
     @Override
-    public <S extends T> Iterable<S> update(Iterable<S> entities) {
+    public <S extends T> Iterable<S> updateAll(Iterable<S> entities) {
         return null;
     }
 
@@ -99,25 +99,30 @@ public <S extends T> void delete(S entity) {
 
     @Override
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
-    public void delete(K id) {
-        entityManager.remove(find(id).get());
+    public void deleteById(K id) {
+        entityManager.remove(findById(id).get());
     }
 
     @Override
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void deleteAll() {
-        getAll().forEach(t -> entityManager.remove(t));
+        findAll().forEach(t -> entityManager.remove(t));
     }
 
     @Override
-    @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-    public Optional<T> find(K id) throws IllegalArgumentException {
-        return Optional.of(entityManager.find(daoType, id));
+    public void deleteAllById(Iterable<? extends K> entities) {
+
     }
 
     @Override
-    public <S extends T> List<S> find(List<K> entityIds) {
-        return null;
+    public void deleteAll(Iterable<? extends T> entities) {
+
+    }
+
+    @Override
+    @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
+    public Optional<T> findById(K id) throws IllegalArgumentException {
+        return Optional.of(entityManager.find(daoType, id));
     }
 
     @Override
@@ -220,7 +225,7 @@ public void clear() {
     @SuppressWarnings("unchecked")
     @Override
     @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-    public Stream<T> getAll() {
+    public Stream<T> findAll() {
         Session session = entityManager.unwrap(Session.class);
         return session.createQuery("from " + daoType.getName())
                 .setHint(QueryHints.HINT_FETCH_SIZE, 50)
@@ -229,7 +234,7 @@ public Stream<T> getAll() {
 
     @Override
     @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-    public List<T> getAll(Sort sort) {
+    public List<T> findAll(Sort sort) {
         CriteriaQuery<T> query = criteriaBuilder.createQuery(daoType);
         Root<T> root = query.from(daoType);
         query.orderBy(orderByClauseBuilder(root, sort));
@@ -240,7 +245,7 @@ public List<T> getAll(Sort sort) {
 
     @Override
     @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-    public Page<T> getAll(Pageable pageable) {
+    public Page<T> findAll(Pageable pageable) {
 
         long totalCount = totalCountOfEntities();
 

src/main/java/ir/bigz/springbootreal/datagenerator/DataGenerator.java

@@ -48,7 +48,7 @@ private void createUser(Faker faker){
                             createDateFromString("2020-10-20")).getTime()));
                     return user;
                 }).collect(Collectors.toList());
-        userList.forEach(userRepository::insert);
+        userList.forEach(userRepository::save);
     }
 
     private String generateNationalCode(Faker faker){

src/main/java/ir/bigz/springbootreal/service/UserServiceImpl.java

@@ -47,7 +47,7 @@ public UserServiceImpl(UserRepository userRepository,
     @Cacheable(value = "userCache", key = "#userId", condition = "#userId != null", unless = "#result==null")
     public UserModel getUser(Long userId) {
         try {
-            Optional<User> user = userRepository.find(userId);
+            Optional<User> user = userRepository.findById(userId);
             return userMapper.userToUserModel(user.get());
         } catch (RuntimeException exception) {
             throw AppException.newInstance(
@@ -65,7 +65,7 @@ public UserModel addUser(UserModel userModel) {
                 userModel.setInsertDate(Utils.getLocalTimeNow());
                 userModel.setActiveStatus(true);
                 User user = userMapper.userModelToUser(userModel);
-                User insert = userRepository.insert(user);
+                User insert = userRepository.save(user);
                 return userMapper.userToUserModel(insert);
             }
             throw new RuntimeException("user has already exist");
@@ -82,7 +82,7 @@ public UserModel addUser(UserModel userModel) {
     @CachePut(value = "userCache", key = "#userId", condition = "#userId != null", unless = "#result==null")
     public UserModel updateUser(long userId, UserModel userModel) {
         try {
-            Optional<User> user = userRepository.find(userId);
+            Optional<User> user = userRepository.findById(userId);
             User sourceUser = user.get();
             User updateUser = userMapper.userModelToUser(userModel);
             mapUserForUpdate(sourceUser, updateUser);
@@ -101,8 +101,8 @@ public UserModel updateUser(long userId, UserModel userModel) {
     @CacheEvict(value = "userCache", beforeInvocation = true, key = "#userId")
     public String deleteUser(long userId) {
         try {
-            userRepository.find(userId);
-            userRepository.delete(userId);
+            userRepository.findById(userId);
+            userRepository.deleteById(userId);
             return "Success";
 
         } catch (RuntimeException exception) {
@@ -117,7 +117,7 @@ public String deleteUser(long userId) {
     @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.DEFAULT)
     public List<UserModel> getAll() {
         try {
-            Stream<User> allUser = userRepository.getAll();
+            Stream<User> allUser = userRepository.findAll();
             return allUser.map(userMapper::userToUserModel).collect(Collectors.toList());
         } catch (RuntimeException exception) {
             throw AppException.newInstance(
@@ -152,7 +152,7 @@ public Page<UserModel> getUserSearchResult(UserSearchDto userSearchDto, String s
     public Page<UserModel> getAllUserPage(String sortOrder, Sort.Direction direction, Integer pageNumber, Integer pageSize) {
         Sort.Order order = new Sort.Order(direction, sortOrder);
         Pageable pageable = PageRequest.of(pageNumber, pageSize, Sort.by(order));
-        Page<User> all = userRepository.getAll(pageable);
+        Page<User> all = userRepository.findAll(pageable);
         List<UserModel> collect = all.get().map(userMapper::userToUserModel).collect(Collectors.toList());
         return new PageImpl<>(collect, pageable, all.getTotalElements());
     }

src/test/groovy/ir/bigz/springbootreal/web/RepositoryTest.groovy

@@ -44,7 +44,7 @@ class RepositoryTest extends InitTestContainerDB {
         def user = generateUser()
 
         when: "insert entity to db and assign id to entity"
-        userRepository.insert(user)
+        userRepository.save(user)
 
         then: "entity has id, success persist"
         user.getId() != null
@@ -54,14 +54,14 @@ class RepositoryTest extends InitTestContainerDB {
     @Transactional
     def "deactivate user with stream data and not throw exception"(){
 
-        def countActiveUser = userRepository.getAll().filter(BaseEntity::isActiveStatus).count()
+        def countActiveUser = userRepository.findAll().filter(BaseEntity::isActiveStatus).count()
 
         when: "deactivate users"
-        userRepository.getAll()
+        userRepository.findAll()
                 .filter(BaseEntity::isActiveStatus).peek(user -> { user.setActiveStatus(false) }).count()
 
         then: "after deactivate user, count active must be zero"
-        def count = userRepository.getAll().filter(BaseEntity::isActiveStatus).count()
+        def count = userRepository.findAll().filter(BaseEntity::isActiveStatus).count()
         count == 0
         countActiveUser != count
 
@@ -109,18 +109,18 @@ class RepositoryTest extends InitTestContainerDB {
         def user = generateUser()
 
         and: "insert user to db"
-        userRepository.insert(user)
+        userRepository.save(user)
 
         when: "find user and update"
-        def find = userRepository.find(user.getId())
+        def find = userRepository.findById(user.getId())
 
         and: "update date"
         find.get().setUserName("sample2")
         find.get().setUpdateDate(Timestamp.valueOf(LocalDateTime.now()))
         userRepository.update(find.get())
 
         then: "if properties are updated so test is success"
-        def result = userRepository.find(user.id)
+        def result = userRepository.findById(user.id)
         result.get().getUserName() == "sample2"
 
     }

src/test/groovy/ir/bigz/springbootreal/web/SampleApiTest.groovy

@@ -85,7 +85,7 @@ class SampleApiTest extends Specification{
         def model = generateUserModel()
 
         and:"define behavior of userRepository methods"
-        userRepository.insert(_) >> user
+        userRepository.save(_) >> user
         userRepository.getUserWithNationalCode(_) >> null
 
         and:"create json Object"

src/test/groovy/ir/bigz/springbootreal/web/ServiceTest.groovy

@@ -84,7 +84,7 @@ class ServiceTest extends InitTestContainerDB {
         queryParams.put("firstName", "h")
 
         when: "call method"
-        def result = userService.getUserSearchV2(queryParams, pagedQuery)
+        def result = userService.getUserSearchWithNativeQuery(queryParams, pagedQuery)
 
         then: "check result size"
         result.getResult().size() > 0