FINERACT-2267: proper not null annotations. Remove jetbrains notnull, all services use non-null
This commit is contained in:
+4
-4
@@ -23,7 +23,6 @@ import static org.apache.fineract.portfolio.delinquency.validator.DelinquencyAct
|
||||
import static org.apache.fineract.portfolio.delinquency.validator.DelinquencyActionParameters.START_DATE;
|
||||
|
||||
import com.google.gson.JsonElement;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import java.time.LocalDate;
|
||||
import java.util.List;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -39,6 +38,7 @@ import org.apache.fineract.portfolio.delinquency.domain.DelinquencyAction;
|
||||
import org.apache.fineract.portfolio.delinquency.domain.LoanDelinquencyAction;
|
||||
import org.apache.fineract.portfolio.delinquency.helper.DelinquencyEffectivePauseHelper;
|
||||
import org.apache.fineract.portfolio.loanaccount.domain.Loan;
|
||||
import org.springframework.lang.NonNull;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@RequiredArgsConstructor
|
||||
@@ -48,7 +48,7 @@ public class DelinquencyActionParseAndValidator extends ParseAndValidator {
|
||||
private final FromJsonHelper jsonHelper;
|
||||
private final DelinquencyEffectivePauseHelper delinquencyEffectivePauseHelper;
|
||||
|
||||
public LoanDelinquencyAction validateAndParseUpdate(@NotNull final JsonCommand command, Loan loan,
|
||||
public LoanDelinquencyAction validateAndParseUpdate(@NonNull final JsonCommand command, Loan loan,
|
||||
List<LoanDelinquencyAction> savedDelinquencyActions, LocalDate businessDate) {
|
||||
List<LoanDelinquencyActionData> effectiveDelinquencyList = delinquencyEffectivePauseHelper
|
||||
.calculateEffectiveDelinquencyList(savedDelinquencyActions);
|
||||
@@ -183,8 +183,8 @@ public class DelinquencyActionParseAndValidator extends ParseAndValidator {
|
||||
|| (parsed.getStartDate().isEqual(existing.getStartDate()) && parsed.getEndDate().isEqual(existing.getEndDate()));
|
||||
}
|
||||
|
||||
@org.jetbrains.annotations.NotNull
|
||||
private LoanDelinquencyAction parseCommand(@org.jetbrains.annotations.NotNull JsonCommand command) {
|
||||
@NonNull
|
||||
private LoanDelinquencyAction parseCommand(@NonNull JsonCommand command) {
|
||||
LoanDelinquencyAction parsedDelinquencyAction = new LoanDelinquencyAction();
|
||||
parsedDelinquencyAction.setAction(extractAction(command.parsedJson()));
|
||||
parsedDelinquencyAction.setStartDate(extractStartDate(command.parsedJson()));
|
||||
|
||||
+5
-5
@@ -18,21 +18,21 @@
|
||||
*/
|
||||
package org.apache.fineract.portfolio.loanaccount.service;
|
||||
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import java.time.LocalDate;
|
||||
import org.apache.fineract.portfolio.loanaccount.domain.Loan;
|
||||
import org.springframework.lang.NonNull;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
public interface LoanAccrualActivityProcessingService {
|
||||
|
||||
@Transactional
|
||||
void makeAccrualActivityTransaction(@NotNull Long loanId, @NotNull LocalDate currentDate);
|
||||
void makeAccrualActivityTransaction(@NonNull Long loanId, @NonNull LocalDate currentDate);
|
||||
|
||||
void makeAccrualActivityTransaction(@NotNull Loan loan, @NotNull LocalDate currentDate);
|
||||
void makeAccrualActivityTransaction(@NonNull Loan loan, @NonNull LocalDate currentDate);
|
||||
|
||||
@Transactional
|
||||
void processAccrualActivityForLoanClosure(@NotNull Loan loan);
|
||||
void processAccrualActivityForLoanClosure(@NonNull Loan loan);
|
||||
|
||||
@Transactional
|
||||
void processAccrualActivityForLoanReopen(@NotNull Loan loan);
|
||||
void processAccrualActivityForLoanReopen(@NonNull Loan loan);
|
||||
}
|
||||
|
||||
+8
-9
@@ -18,7 +18,6 @@
|
||||
*/
|
||||
package org.apache.fineract.portfolio.loanaccount.service;
|
||||
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import java.time.LocalDate;
|
||||
import java.util.List;
|
||||
import org.apache.fineract.infrastructure.core.exception.MultiException;
|
||||
@@ -28,22 +27,22 @@ import org.springframework.lang.NonNull;
|
||||
|
||||
public interface LoanAccrualsProcessingService {
|
||||
|
||||
void addPeriodicAccruals(@NotNull LocalDate tillDate) throws MultiException;
|
||||
void addPeriodicAccruals(@NonNull LocalDate tillDate) throws MultiException;
|
||||
|
||||
void addPeriodicAccruals(@NotNull LocalDate tillDate, @NotNull Loan loan) throws MultiException;
|
||||
void addPeriodicAccruals(@NonNull LocalDate tillDate, @NonNull Loan loan) throws MultiException;
|
||||
|
||||
void addAccruals(@NotNull LocalDate tillDate) throws MultiException;
|
||||
void addAccruals(@NonNull LocalDate tillDate) throws MultiException;
|
||||
|
||||
void reprocessExistingAccruals(@NotNull Loan loan, boolean addEvent);
|
||||
void reprocessExistingAccruals(@NonNull Loan loan, boolean addEvent);
|
||||
|
||||
void processAccrualsOnInterestRecalculation(@NotNull Loan loan, boolean isInterestRecalculationEnabled, boolean addJournal);
|
||||
void processAccrualsOnInterestRecalculation(@NonNull Loan loan, boolean isInterestRecalculationEnabled, boolean addJournal);
|
||||
|
||||
void addIncomePostingAndAccruals(Long loanId) throws Exception;
|
||||
|
||||
void processIncomePostingAndAccruals(@NotNull Loan loan, boolean addEvent);
|
||||
void processIncomePostingAndAccruals(@NonNull Loan loan, boolean addEvent);
|
||||
|
||||
void processAccrualsOnLoanClosure(@NonNull Loan loan, boolean addJournal);
|
||||
|
||||
void processAccrualsOnLoanForeClosure(@NotNull Loan loan, @NotNull LocalDate foreClosureDate,
|
||||
@NotNull List<LoanTransaction> newAccrualTransactions);
|
||||
void processAccrualsOnLoanForeClosure(@NonNull Loan loan, @NonNull LocalDate foreClosureDate,
|
||||
@NonNull List<LoanTransaction> newAccrualTransactions);
|
||||
}
|
||||
|
||||
+2
-2
@@ -18,7 +18,6 @@
|
||||
*/
|
||||
package org.apache.fineract.portfolio.loanaccount.service;
|
||||
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import java.time.LocalDate;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
@@ -44,6 +43,7 @@ import org.apache.fineract.portfolio.loanaccount.loanschedule.data.LoanScheduleD
|
||||
import org.apache.fineract.portfolio.loanaccount.loanschedule.data.OverdueLoanScheduleData;
|
||||
import org.apache.fineract.portfolio.loanaccount.loanschedule.domain.LoanScheduleType;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.lang.NonNull;
|
||||
|
||||
public interface LoanReadPlatformService {
|
||||
|
||||
@@ -57,7 +57,7 @@ public interface LoanReadPlatformService {
|
||||
|
||||
Collection<LoanTransactionData> retrieveLoanTransactions(Long loanId);
|
||||
|
||||
org.springframework.data.domain.Page<LoanTransactionData> retrieveLoanTransactions(@NotNull Long loanId,
|
||||
org.springframework.data.domain.Page<LoanTransactionData> retrieveLoanTransactions(@NonNull Long loanId,
|
||||
Set<LoanTransactionType> excludedTransactionTypes, Pageable pageable);
|
||||
|
||||
LoanAccountData retrieveTemplateWithClientAndProductDetails(Long clientId, Long productId);
|
||||
|
||||
+3
-3
@@ -47,12 +47,12 @@ import org.apache.fineract.portfolio.loanaccount.serialization.LoanChargeValidat
|
||||
import org.apache.fineract.portfolio.loanaccount.service.LoanBalanceService;
|
||||
import org.apache.fineract.portfolio.loanaccount.service.LoanChargeService;
|
||||
import org.apache.fineract.portfolio.loanaccount.service.LoanTransactionProcessingService;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.junit.jupiter.api.AfterAll;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.mockito.MockedStatic;
|
||||
import org.springframework.lang.NonNull;
|
||||
|
||||
public class SingleLoanChargeRepaymentScheduleProcessingWrapperTest {
|
||||
|
||||
@@ -139,7 +139,7 @@ public class SingleLoanChargeRepaymentScheduleProcessingWrapperTest {
|
||||
penaltyChargesWrittenOff.getValue().getAmount().setScale(1, RoundingMode.UNNECESSARY));
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@NonNull
|
||||
private LoanCharge createCharge(boolean penalty) {
|
||||
Charge charge = mock(Charge.class);
|
||||
when(charge.getId()).thenReturn(1L);
|
||||
@@ -153,7 +153,7 @@ public class SingleLoanChargeRepaymentScheduleProcessingWrapperTest {
|
||||
ChargeCalculationType.FLAT, LocalDate.of(2023, 1, 15), ChargePaymentMode.REGULAR, 1, null, null);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@NonNull
|
||||
private LoanRepaymentScheduleInstallment createPeriod(int periodId, LocalDate start, LocalDate end) {
|
||||
LoanRepaymentScheduleInstallment period = mock(LoanRepaymentScheduleInstallment.class);
|
||||
MathContext mc = new MathContext(12, RoundingMode.HALF_EVEN);
|
||||
|
||||
Reference in New Issue
Block a user