[fineract] 05/07: Revert "Fixing some code to be compatible with Spring update"

[vorburger]

This is an automated email from the ASF dual-hosted git repository.

vorburger pushed a commit to branch revert-592-Fineract-614
in repository https://gitbox.apache.org/repos/asf/fineract.git

commit 2fbad414f6ef1cbd8435eb47fb63b1009ab93908
Author: Michael Vorburger ⛑️ <m...@vorburger.ch>
AuthorDate: Fri Mar 13 17:15:42 2020 +0100

    Revert "Fixing some code to be compatible with Spring update"
    
    This reverts commit e2f5c950349d713663c101e67345a9734f40d6d3.
---
 .../portfolio/rate/domain/RateRepositoryWrapper.java       |  9 +++++++--
 .../portfolio/rate/service/RateWriteServiceImpl.java       | 14 ++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git 
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/domain/RateRepositoryWrapper.java
 
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/domain/RateRepositoryWrapper.java
index 679c2d7..7604a11 100644
--- 
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/domain/RateRepositoryWrapper.java
+++ 
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/domain/RateRepositoryWrapper.java
@@ -36,14 +36,19 @@ public class RateRepositoryWrapper {
   }
 
   public Rate findOneWithNotFoundDetection(final Long rateId) {
-    final Rate rate = this.repository.findById(rateId).orElseThrow(() -> new 
RateNotFoundException(rateId));
+
+    final Rate rate = this.repository.findOne(rateId);
+    if (rate == null) {
+      throw new RateNotFoundException(rateId);
+    }
+
     return rate;
   }
 
   public List<Rate> findMultipleWithNotFoundDetection(final List<Long> 
rateIds) {
     List<Rate> rates = new ArrayList<>();
     if (rateIds != null && !rateIds.isEmpty()) {
-      final List<Rate> foundRates = this.repository.findAllById(rateIds);
+      final List<Rate> foundRates = this.repository.findAll(rateIds);
       for (Long rateId : rateIds) {
         Boolean found = false;
         for (Rate foundRate : foundRates) {
diff --git 
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateWriteServiceImpl.java
 
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateWriteServiceImpl.java
index b7f7c3d..51f97b4 100644
--- 
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateWriteServiceImpl.java
+++ 
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateWriteServiceImpl.java
@@ -34,7 +34,6 @@ import 
org.apache.fineract.portfolio.rate.exception.RateNotFoundException;
 import 
org.apache.fineract.portfolio.rate.serialization.RateDefinitionCommandFromApiJsonDeserializer;
 import org.apache.fineract.useradministration.domain.AppUser;
 import org.apache.fineract.useradministration.domain.AppUserRepository;
-import org.apache.fineract.useradministration.exception.UserNotFoundException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -74,7 +73,7 @@ public class RateWriteServiceImpl implements RateWriteService 
{
       final Long approveUserId = 
command.longValueOfParameterNamed(approveUserIdParamName);
       AppUser approveUser = null;
       if (approveUserId != null) {
-        approveUser = 
this.appUserRepository.findById(approveUserId).orElseThrow(() -> new 
UserNotFoundException(approveUserId));
+        approveUser = this.appUserRepository.findOne(approveUserId);
       }
       final Rate rate = Rate.fromJson(command, approveUser);
 
@@ -99,17 +98,20 @@ public class RateWriteServiceImpl implements 
RateWriteService {
     try {
       this.context.authenticatedUser();
 
-      final Rate rateToUpdate = 
this.rateRepository.findById(rateId).orElseThrow(() -> new 
RateNotFoundException(rateId));
+      final Rate rateToUpdate = this.rateRepository.findOne(rateId);
+      if (rateToUpdate == null) {
+        throw new RateNotFoundException(rateId);
+      }
 
       final Map<String, Object> changes = rateToUpdate.update(command);
 
       this.fromApiJsonDeserializer.validateForUpdate(command.json());
 
       if (changes.containsKey(approveUserIdParamName)) {
-        final Long newApproveUserId = (Long) 
changes.get(approveUserIdParamName);
+        final Long newValue = (Long) changes.get(approveUserIdParamName);
         AppUser newApproveUser = null;
-        if (newApproveUserId != null) {
-          newApproveUser = 
this.appUserRepository.findById(newApproveUserId).orElseThrow(() -> new 
UserNotFoundException(newApproveUserId));
+        if (newValue != null) {
+          newApproveUser = this.appUserRepository.findOne(newValue);
         }
         rateToUpdate.setApproveUser(newApproveUser);
       }