From da920b1824d43fe9b4e73d9028feb1cfa16cb238 Mon Sep 17 00:00:00 2001 From: Hemant Gupta Date: Mon, 25 Jul 2022 12:51:09 +0530 Subject: [PATCH] refactor: add lombok to closure module --- .../accounting/closure/data/GLClosureData.java | 8 ++------ .../accounting/closure/domain/GLClosure.java | 17 +++++------------ 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/data/GLClosureData.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/data/GLClosureData.java index d4bd072f7..5b9949a82 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/data/GLClosureData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/data/GLClosureData.java @@ -21,9 +21,7 @@ package org.apache.fineract.accounting.closure.data; import java.time.LocalDate; import java.util.ArrayList; import java.util.Collection; -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; +import lombok.Data; import org.apache.fineract.organisation.office.data.OfficeData; /** @@ -31,8 +29,7 @@ import org.apache.fineract.organisation.office.data.OfficeData; * * Note: no getter/setters required as google-gson will produce json from fields of object. */ -@RequiredArgsConstructor -@Getter +@Data public class GLClosureData { private final Long id; @@ -48,6 +45,5 @@ public class GLClosureData { private final String lastUpdatedByUsername; private final String comments; - @Setter private Collection allowedOffices = new ArrayList<>(); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/domain/GLClosure.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/domain/GLClosure.java index 1ed254214..7816ca3ea 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/domain/GLClosure.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/domain/GLClosure.java @@ -27,6 +27,9 @@ import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; import javax.persistence.UniqueConstraint; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.apache.fineract.accounting.closure.api.GLClosureJsonInputParams; import org.apache.fineract.infrastructure.core.api.JsonCommand; @@ -36,6 +39,8 @@ import org.apache.fineract.organisation.office.domain.Office; @Entity @Table(name = "acc_gl_closure", uniqueConstraints = { @UniqueConstraint(columnNames = { "office_id", "closing_date" }, name = "office_id_closing_date") }) +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Getter public class GLClosure extends AbstractAuditableCustom { @ManyToOne @@ -51,10 +56,6 @@ public class GLClosure extends AbstractAuditableCustom { @Column(name = "comments", nullable = true, length = 500) private String comments; - protected GLClosure() { - // - } - public GLClosure(final Office office, final LocalDate closingDate, final String comments) { this.office = office; this.deleted = false; @@ -89,12 +90,4 @@ public class GLClosure extends AbstractAuditableCustom { } } - public LocalDate getClosingDate() { - return this.closingDate; - } - - public Office getOffice() { - return this.office; - } - }