This is an automated email from the ASF dual-hosted git repository. arnold pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git
commit 4dada53f8d8dcedc2fb46562d38687059d822706 Author: Hemant Gupta <[email protected]> AuthorDate: Mon Jul 25 12:22:14 2022 +0530 refactor: add lombok to FinancialActivityAccount module --- .../data/FinancialActivityAccountData.java | 7 ++----- .../data/FinancialActivityData.java | 6 ++---- .../domain/FinancialActivityAccount.java | 17 +++++------------ 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/data/FinancialActivityAccountData.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/data/FinancialActivityAccountData.java index a32f76c4e..3c761a649 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/data/FinancialActivityAccountData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/data/FinancialActivityAccountData.java @@ -20,21 +20,18 @@ package org.apache.fineract.accounting.financialactivityaccount.data; import java.util.List; import java.util.Map; -import lombok.Getter; +import lombok.Data; import lombok.RequiredArgsConstructor; -import lombok.Setter; import org.apache.fineract.accounting.glaccount.data.GLAccountData; @RequiredArgsConstructor -@Getter +@Data public class FinancialActivityAccountData { private final Long id; private final FinancialActivityData financialActivityData; private final GLAccountData glAccountData; - @Setter private Map<String, List<GLAccountData>> glAccountOptions; - @Setter private List<FinancialActivityData> financialActivityOptions; public FinancialActivityAccountData() { diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/data/FinancialActivityData.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/data/FinancialActivityData.java index 9311d8f92..004f9c0aa 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/data/FinancialActivityData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/data/FinancialActivityData.java @@ -18,12 +18,10 @@ */ package org.apache.fineract.accounting.financialactivityaccount.data; -import lombok.Getter; -import lombok.RequiredArgsConstructor; +import lombok.Data; import org.apache.fineract.accounting.glaccount.domain.GLAccountType; -@RequiredArgsConstructor -@Getter +@Data public class FinancialActivityData { private final Integer id; diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/domain/FinancialActivityAccount.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/domain/FinancialActivityAccount.java index ab8f18b54..ad9484cec 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/domain/FinancialActivityAccount.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/domain/FinancialActivityAccount.java @@ -24,11 +24,16 @@ import javax.persistence.FetchType; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; import org.apache.fineract.accounting.glaccount.domain.GLAccount; import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom; @Entity @Table(name = "acc_gl_financial_activity_account") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Getter public class FinancialActivityAccount extends AbstractPersistableCustom { @ManyToOne(fetch = FetchType.EAGER) @@ -42,23 +47,11 @@ public class FinancialActivityAccount extends AbstractPersistableCustom { return new FinancialActivityAccount(glAccount, financialAccountType); } - protected FinancialActivityAccount() { - // - } - private FinancialActivityAccount(final GLAccount glAccount, final int financialAccountType) { this.glAccount = glAccount; this.financialActivityType = financialAccountType; } - public GLAccount getGlAccount() { - return this.glAccount; - } - - public Integer getFinancialActivityType() { - return this.financialActivityType; - } - public void updateGlAccount(final GLAccount glAccount) { this.glAccount = glAccount; }
