FINERACT-2081: introduce builder pattern to Note entity instantiation.

- Removed all redundant static instantiation methods and constructors from `Note.java`.
- Used Builder pattern to make it easy to instantiate the Note object.
- Changed all instantiation places to use the new implementation.

fineract-core/src/main/java/org/apache/fineract/portfolio/note/domain/NoteType.java

@@ -21,8 +21,10 @@
 import java.util.Arrays;
 import java.util.Map;
 import java.util.stream.Collectors;
+import lombok.Getter;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 
+@Getter
 public enum NoteType {
 
     CLIENT(100, "noteType.client", "clients", "Client note"), //
@@ -51,22 +53,6 @@ public enum NoteType {
         this.description = description;
     }
 
-    public Integer getValue() {
-        return this.value;
-    }
-
-    public String getCode() {
-        return this.code;
-    }
-
-    public String getApiUrl() {
-        return this.apiUrl;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
     public static NoteType fromInt(int i) {
         return BY_ID.get(i);
     }

fineract-provider/src/main/java/org/apache/fineract/interoperation/service/InteropServiceImpl.java

@@ -93,6 +93,7 @@
 import org.apache.fineract.portfolio.loanaccount.exception.LoanNotFoundException;
 import org.apache.fineract.portfolio.note.domain.Note;
 import org.apache.fineract.portfolio.note.domain.NoteRepository;
+import org.apache.fineract.portfolio.note.domain.NoteType;
 import org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail;
 import org.apache.fineract.portfolio.paymenttype.domain.PaymentType;
 import org.apache.fineract.portfolio.paymenttype.domain.PaymentTypeRepository;
@@ -465,7 +466,16 @@ public InteropTransferResponseData commitTransfer(@NotNull JsonCommand command)
 
         String note = request.getNote();
         if (!StringUtils.isBlank(note)) {
-            noteRepository.save(Note.savingsTransactionNote(savingsAccount, transaction, note));
+
+            Note noteEntity = Note.builder() //
+                    .savingsAccount(savingsAccount) //
+                    .client(savingsAccount.getClient()) //
+                    .savingsTransaction(transaction) //
+                    .noteTypeId(NoteType.SAVINGS_TRANSACTION.getValue()) //
+                    .note(note) //
+                    .build();
+
+            noteRepository.save(noteEntity);
         }
 
         return InteropTransferResponseData.build(command.commandId(), request.getTransactionCode(), InteropActionState.ACCEPTED,

fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanAccountDomainServiceJpa.java

@@ -96,6 +96,7 @@
 import org.apache.fineract.portfolio.loanaccount.service.ReplayedTransactionBusinessEventService;
 import org.apache.fineract.portfolio.note.domain.Note;
 import org.apache.fineract.portfolio.note.domain.NoteRepository;
+import org.apache.fineract.portfolio.note.domain.NoteType;
 import org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail;
 import org.apache.fineract.portfolio.repaymentwithpostdatedchecks.data.PostDatedChecksStatus;
 import org.apache.fineract.portfolio.repaymentwithpostdatedchecks.domain.PostDatedChecks;
@@ -226,7 +227,15 @@ public LoanTransaction makeRepayment(final LoanTransactionType repaymentTransact
         loan = saveAndFlushLoanWithDataIntegrityViolationChecks(loan);
 
         if (StringUtils.isNotBlank(noteText)) {
-            final Note note = Note.loanTransactionNote(loan, newRepaymentTransaction, noteText);
+
+            final Note note = Note.builder() //
+                    .loan(loan) //
+                    .client(loan.client()) //
+                    .loanTransaction(newRepaymentTransaction) //
+                    .noteTypeId(NoteType.LOAN_TRANSACTION.getValue()) //
+                    .note(noteText) //
+                    .build();
+
             this.noteRepository.save(note);
         }
 
@@ -413,7 +422,15 @@ public LoanTransaction makeChargePayment(final Loan loan, final Long chargeId, f
         saveAndFlushLoanWithDataIntegrityViolationChecks(loan);
 
         if (StringUtils.isNotBlank(noteText)) {
-            final Note note = Note.loanTransactionNote(loan, newPaymentTransaction, noteText);
+
+            final Note note = Note.builder() //
+                    .loan(loan) //
+                    .client(loan.client()) //
+                    .loanTransaction(newPaymentTransaction) //
+                    .noteTypeId(NoteType.LOAN_TRANSACTION.getValue()) //
+                    .note(noteText) //
+                    .build();
+
             this.noteRepository.save(note);
         }
 
@@ -500,7 +517,15 @@ public LoanTransaction makeRefund(final Long accountId, final CommandProcessingR
         this.loanRepositoryWrapper.saveAndFlush(loan);
 
         if (StringUtils.isNotBlank(noteText)) {
-            final Note note = Note.loanTransactionNote(loan, newRefundTransaction, noteText);
+            final Note note = Note.builder() //
+                    .loan(loan) //
+                    .client(loan.client()) //
+                    .loanTransaction(newRefundTransaction) //
+                    .noteTypeId(NoteType.LOAN_TRANSACTION.getValue()) //
+                    .note(noteText) //
+                    .build();
+
+            // NoteFactory.createLoanTransactionNote(loan, newRefundTransaction, noteText);
             this.noteRepository.save(note);
         }
 
@@ -549,7 +574,15 @@ public LoanTransaction makeDisburseTransaction(final Long loanId, final LocalDat
         saveAndFlushLoanWithDataIntegrityViolationChecks(loan);
 
         if (StringUtils.isNotBlank(noteText)) {
-            final Note note = Note.loanTransactionNote(loan, disbursementTransaction, noteText);
+
+            final Note note = Note.builder() //
+                    .loan(loan) //
+                    .client(loan.client()) //
+                    .loanTransaction(disbursementTransaction) //
+                    .noteTypeId(NoteType.LOAN_TRANSACTION.getValue()) //
+                    .note(noteText) //
+                    .build();
+
             this.noteRepository.save(note);
         }
 
@@ -638,7 +671,15 @@ public LoanTransaction creditBalanceRefund(final Loan loan, final LocalDate tran
         newCreditBalanceRefundTransaction = this.loanTransactionRepository.saveAndFlush(newCreditBalanceRefundTransaction);
 
         if (StringUtils.isNotBlank(noteText)) {
-            final Note note = Note.loanTransactionNote(loan, newCreditBalanceRefundTransaction, noteText);
+
+            final Note note = Note.builder() //
+                    .loan(loan) //
+                    .client(loan.client()) //
+                    .loanTransaction(newCreditBalanceRefundTransaction) //
+                    .noteTypeId(NoteType.LOAN_TRANSACTION.getValue()) //
+                    .note(noteText) //
+                    .build();
+
             this.noteRepository.save(note);
         }
 
@@ -682,7 +723,15 @@ public LoanTransaction makeRefundForActiveLoan(Long accountId, CommandProcessing
         this.loanTransactionRepository.saveAndFlush(newRefundTransaction);
 
         if (StringUtils.isNotBlank(noteText)) {
-            final Note note = Note.loanTransactionNote(loan, newRefundTransaction, noteText);
+
+            final Note note = Note.builder() //
+                    .loan(loan) //
+                    .client(loan.client()) //
+                    .loanTransaction(newRefundTransaction) //
+                    .noteTypeId(NoteType.LOAN_TRANSACTION.getValue()) //
+                    .note(noteText) //
+                    .build();
+
             this.noteRepository.save(note);
         }
 
@@ -772,7 +821,14 @@ public LoanTransaction foreCloseLoan(Loan loan, final LocalDate foreClosureDate,
 
         if (StringUtils.isNotBlank(noteText)) {
             changes.put("note", noteText);
-            final Note note = Note.loanNote(loan, noteText);
+
+            final Note note = Note.builder() //
+                    .loan(loan) //
+                    .client(loan.client()) //
+                    .noteTypeId(NoteType.LOAN.getValue()) //
+                    .note(noteText) //
+                    .build();
+
             this.noteRepository.save(note);
         }
 

fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanApplicationWritePlatformServiceJpaRepositoryImpl.java

@@ -89,6 +89,7 @@
 import org.apache.fineract.portfolio.loanproduct.domain.RecalculationFrequencyType;
 import org.apache.fineract.portfolio.note.domain.Note;
 import org.apache.fineract.portfolio.note.domain.NoteRepository;
+import org.apache.fineract.portfolio.note.domain.NoteType;
 import org.apache.fineract.portfolio.savings.data.GroupSavingsIndividualMonitoringAccountData;
 import org.apache.fineract.portfolio.savings.domain.SavingsAccount;
 import org.apache.fineract.portfolio.savings.domain.SavingsAccountRepositoryWrapper;
@@ -841,7 +842,14 @@ private void createCalendar(JsonCommand command, Loan loan) {
 
     private Optional<Note> createNote(String submittedOnNote, Loan newLoanApplication) {
         if (StringUtils.isNotBlank(submittedOnNote)) {
-            final Note note = Note.loanNote(newLoanApplication, submittedOnNote);
+
+            final Note note = Note.builder() //
+                    .loan(newLoanApplication) //
+                    .client(newLoanApplication.client()) //
+                    .noteTypeId(NoteType.LOAN.getValue()) //
+                    .note(submittedOnNote) //
+                    .build();
+
             this.noteRepository.save(note);
             return Optional.of(note);
         } else {

fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeWritePlatformServiceImpl.java

@@ -130,6 +130,7 @@
 import org.apache.fineract.portfolio.loanproduct.exception.LinkedAccountRequiredException;
 import org.apache.fineract.portfolio.note.domain.Note;
 import org.apache.fineract.portfolio.note.domain.NoteRepository;
+import org.apache.fineract.portfolio.note.domain.NoteType;
 import org.apache.fineract.portfolio.paymentdetail.domain.PaymentDetail;
 import org.apache.fineract.portfolio.paymentdetail.service.PaymentDetailWritePlatformService;
 import org.apache.fineract.portfolio.savings.domain.SavingsAccount;
@@ -736,7 +737,14 @@ public CommandProcessingResult adjustmentForLoanCharge(Long loanId, Long loanCha
 
         final String noteText = command.stringValueOfParameterNamed("note");
         if (StringUtils.isNotBlank(noteText)) {
-            final Note note = Note.loanNote(loan, noteText);
+
+            final Note note = Note.builder() //
+                    .loan(loan) //
+                    .client(loan.client()) //
+                    .noteTypeId(NoteType.LOAN.getValue()) //
+                    .note(noteText) //
+                    .build();
+
             changes.put("note", noteText);
             this.noteRepository.save(note);
         }