From f26b7bc57636e4dcb66bf008ed60b543038b29df Mon Sep 17 00:00:00 2001 From: Hemant Gupta Date: Wed, 12 Oct 2022 17:09:49 +0530 Subject: [PATCH] refactor: add lombok to survey module --- .../survey/data/ClientScoresOverview.java | 33 ++++++++----------- .../data/LikeliHoodPovertyLineData.java | 28 ++++++---------- .../survey/data/LikelihoodData.java | 24 +++++++------- .../survey/data/PovertyLineData.java | 23 +++++++------ .../survey/data/PpiPovertyLineData.java | 18 +++++----- .../survey/data/SurveyDataTableData.java | 19 ++++++----- .../survey/domain/Likelihood.java | 21 +++++------- .../service/PovertyLineServiceImpl.java | 23 ++++++++----- .../service/ReadLikelihoodServiceImpl.java | 13 +++----- .../survey/service/ReadSurveyServiceImpl.java | 14 +++++--- .../service/WriteLikelihoodServiceImpl.java | 3 +- 11 files changed, 101 insertions(+), 118 deletions(-) diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/ClientScoresOverview.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/ClientScoresOverview.java index 1ed44f146..9b24b7022 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/ClientScoresOverview.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/ClientScoresOverview.java @@ -19,37 +19,30 @@ package org.apache.fineract.infrastructure.survey.data; import java.time.LocalDate; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; /** * Created by Cieyou on 3/18/14. */ +@Data +@NoArgsConstructor +@Accessors(chain = true) public class ClientScoresOverview { @SuppressWarnings("unused") - private final String surveyName; + private String surveyName; @SuppressWarnings("unused") - private final long id; + private long id; @SuppressWarnings("unused") - private final String likelihoodCode; + private String likelihoodCode; @SuppressWarnings("unused") - private final String likelihoodName; + private String likelihoodName; @SuppressWarnings("unused") - private final long score; + private long score; @SuppressWarnings("unused") - private final Double povertyLine; + private Double povertyLine; @SuppressWarnings("unused") - private final LocalDate date; - - public ClientScoresOverview(final String likelihoodCode, final String likelihoodName, final long score, final Double povertyLine, - final LocalDate date, final long resourceId, final String surveyName) { - - this.likelihoodCode = likelihoodCode; - this.likelihoodName = likelihoodName; - this.score = score; - this.povertyLine = povertyLine; - this.date = date; - this.id = resourceId; - this.surveyName = surveyName; - - } + private LocalDate date; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/LikeliHoodPovertyLineData.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/LikeliHoodPovertyLineData.java index 44e65748c..3df16ab98 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/LikeliHoodPovertyLineData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/LikeliHoodPovertyLineData.java @@ -19,30 +19,22 @@ package org.apache.fineract.infrastructure.survey.data; import java.util.List; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; /** * Created by Cieyou on 3/11/14. */ +@Data +@NoArgsConstructor +@Accessors(chain = true) public class LikeliHoodPovertyLineData { - final long resourceId; - final String likeliHoodName; - final String likeliHoodCode; - final long enabled; + long resourceId; + String likeliHoodName; + String likeliHoodCode; + long enabled; List povertyLineData; - public LikeliHoodPovertyLineData(final long resourceId, final List povertyLineData, final String likeliHoodName, - final String likeliHoodCode, final long enabled) { - this.resourceId = resourceId; - this.povertyLineData = povertyLineData; - this.likeliHoodName = likeliHoodName; - this.likeliHoodCode = likeliHoodCode; - this.enabled = enabled; - - } - - public void addPovertyLine(PovertyLineData povertyLineData) { - this.povertyLineData.add(povertyLineData); - } - } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/LikelihoodData.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/LikelihoodData.java index 55ea4ed67..19800521c 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/LikelihoodData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/LikelihoodData.java @@ -18,22 +18,20 @@ */ package org.apache.fineract.infrastructure.survey.data; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + /** * Created by Cieyou on 3/12/14. */ +@Data +@NoArgsConstructor +@Accessors(chain = true) public class LikelihoodData { - final long resourceId; - final String likeliHoodName; - final String likeliHoodCode; - final long enabled; - - public LikelihoodData(final long resourceId, final String likeliHoodName, final String likeliHoodCode, final long enabled) { - this.resourceId = resourceId; - this.likeliHoodName = likeliHoodName; - this.likeliHoodCode = likeliHoodCode; - this.enabled = enabled; - - } - + long resourceId; + String likeliHoodName; + String likeliHoodCode; + long enabled; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/PovertyLineData.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/PovertyLineData.java index 555b641d1..da8534ffe 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/PovertyLineData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/PovertyLineData.java @@ -18,21 +18,20 @@ */ package org.apache.fineract.infrastructure.survey.data; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + /** * Created by Cieyou on 3/11/14. */ +@Data +@NoArgsConstructor +@Accessors(chain = true) public class PovertyLineData { - final Long resourceId; - final Long scoreFrom; - final Long scoreTo; - final Double povertyLine; - - public PovertyLineData(final Long resourceId, final Long scoreFrom, final Long scoreTo, final Double povertyLine) { - - this.resourceId = resourceId; - this.scoreTo = scoreTo; - this.scoreFrom = scoreFrom; - this.povertyLine = povertyLine; - } + Long resourceId; + Long scoreFrom; + Long scoreTo; + Double povertyLine; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/PpiPovertyLineData.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/PpiPovertyLineData.java index 133753787..da69b2a24 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/PpiPovertyLineData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/PpiPovertyLineData.java @@ -19,20 +19,18 @@ package org.apache.fineract.infrastructure.survey.data; import java.util.List; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; /** * Created by Cieyou on 3/11/14. */ +@Data +@NoArgsConstructor +@Accessors(chain = true) public class PpiPovertyLineData { - final String ppi; - final List likeliHoodPovertyLineData; - - public PpiPovertyLineData(final List likeliHoodPovertyLineData, final String ppi) { - - this.likeliHoodPovertyLineData = likeliHoodPovertyLineData; - this.ppi = ppi; - - } - + String ppi; + List likeliHoodPovertyLineData; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/SurveyDataTableData.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/SurveyDataTableData.java index d20504f5d..b3d5247e3 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/SurveyDataTableData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/SurveyDataTableData.java @@ -18,23 +18,26 @@ */ package org.apache.fineract.infrastructure.survey.data; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.experimental.Accessors; import org.apache.fineract.infrastructure.dataqueries.data.DatatableData; +@Getter +@Setter +@NoArgsConstructor +@Accessors(chain = true) public final class SurveyDataTableData { @SuppressWarnings("unused") - private final DatatableData datatableData; + private DatatableData datatableData; @SuppressWarnings("unused") - private final boolean enabled; + private boolean enabled; public static SurveyDataTableData create(final DatatableData datatableData, final boolean enabled) { - return new SurveyDataTableData(datatableData, enabled); - } - - private SurveyDataTableData(final DatatableData datatableData, final boolean enabled) { - this.datatableData = datatableData; - this.enabled = enabled; + return new SurveyDataTableData().setDatatableData(datatableData).setEnabled(enabled); } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/domain/Likelihood.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/domain/Likelihood.java index 93682961a..034a5c50b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/domain/Likelihood.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/domain/Likelihood.java @@ -23,6 +23,10 @@ import java.util.Map; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.experimental.Accessors; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom; import org.apache.fineract.infrastructure.survey.api.LikelihoodApiConstants; @@ -30,6 +34,10 @@ import org.apache.fineract.infrastructure.survey.data.LikelihoodStatus; @Entity @Table(name = "ppi_likelihoods_ppi") +@Getter +@Setter +@NoArgsConstructor +@Accessors(chain = true) public final class Likelihood extends AbstractPersistableCustom { @Column(name = "ppi_name", nullable = false) @@ -65,17 +73,4 @@ public final class Likelihood extends AbstractPersistableCustom { public boolean isActivateCommand(final JsonCommand command) { return command.booleanPrimitiveValueOfParameterNamed(LikelihoodApiConstants.ACTIVE); } - - public String getPpiName() { - return ppiName; - } - - @Override - public Long getId() { - return super.getId(); - } - - public void disable() { - this.enabled = LikelihoodStatus.DISABLED; - } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/PovertyLineServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/PovertyLineServiceImpl.java index 73878c437..e5cd9d5d5 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/PovertyLineServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/PovertyLineServiceImpl.java @@ -58,8 +58,9 @@ public class PovertyLineServiceImpl implements PovertyLineService { String likelihoodCode = povertyLines.getString("code"); if (likelihoodCode.equals(codeName)) { - povertyLineDatas.add(new PovertyLineData(povertyLines.getLong("id"), povertyLines.getLong("score_from"), - povertyLines.getLong("score_to"), povertyLines.getDouble("poverty_line"))); + povertyLineDatas.add( + new PovertyLineData().setResourceId(povertyLines.getLong("id")).setScoreFrom(povertyLines.getLong("score_from")) + .setScoreTo(povertyLines.getLong("score_to")).setPovertyLine(povertyLines.getDouble("poverty_line"))); } } @@ -68,14 +69,16 @@ public class PovertyLineServiceImpl implements PovertyLineService { // create the likelihood object with the list of povertyLine object // belonging to it - LikeliHoodPovertyLineData likeliHoodPovertyLineData = new LikeliHoodPovertyLineData(likelihoods.getLong("id"), povertyLineDatas, - likelihoods.getString("name"), likelihoods.getString("code"), likelihoods.getLong("enabled")); + LikeliHoodPovertyLineData likeliHoodPovertyLineData = new LikeliHoodPovertyLineData().setResourceId(likelihoods.getLong("id")) + .setPovertyLineData(povertyLineDatas).setLikeliHoodName(likelihoods.getString("name")) + .setLikeliHoodCode(likelihoods.getString("code")).setEnabled(likelihoods.getLong("enabled")); listOfLikeliHoodPovertyLineData.add(likeliHoodPovertyLineData); } - PpiPovertyLineData ppiPovertyLineData = new PpiPovertyLineData(listOfLikeliHoodPovertyLineData, ppiName); + PpiPovertyLineData ppiPovertyLineData = new PpiPovertyLineData().setLikeliHoodPovertyLineData(listOfLikeliHoodPovertyLineData) + .setPpi(ppiName); return ppiPovertyLineData; } @@ -89,8 +92,9 @@ public class PovertyLineServiceImpl implements PovertyLineService { while (povertyLines.next()) { - povertyLineDatas.add(new PovertyLineData(povertyLines.getLong("id"), povertyLines.getLong("score_from"), - povertyLines.getLong("score_to"), povertyLines.getDouble("poverty_line"))); + povertyLineDatas + .add(new PovertyLineData().setResourceId(povertyLines.getLong("id")).setScoreFrom(povertyLines.getLong("score_from")) + .setScoreTo(povertyLines.getLong("score_to")).setPovertyLine(povertyLines.getDouble("poverty_line"))); } povertyLines.first(); @@ -98,8 +102,9 @@ public class PovertyLineServiceImpl implements PovertyLineService { // create the likelihood object with the list of povertyLine object // belonging to it - return new LikeliHoodPovertyLineData(povertyLines.getLong("likelihood_id"), povertyLineDatas, povertyLines.getString("name"), - povertyLines.getString("code"), povertyLines.getLong("enabled")); + return new LikeliHoodPovertyLineData().setResourceId(povertyLines.getLong("id")).setPovertyLineData(povertyLineDatas) + .setLikeliHoodName(povertyLines.getString("name")).setLikeliHoodCode(povertyLines.getString("code")) + .setEnabled(povertyLines.getLong("enabled")); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/ReadLikelihoodServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/ReadLikelihoodServiceImpl.java index 613491866..fa1ecec8b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/ReadLikelihoodServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/ReadLikelihoodServiceImpl.java @@ -43,13 +43,10 @@ public class ReadLikelihoodServiceImpl implements ReadLikelihoodService { List likelihoodDatas = new ArrayList<>(); while (likelihood.next()) { - likelihoodDatas.add(new LikelihoodData(likelihood.getLong("id"), likelihood.getString("name"), likelihood.getString("code"), - likelihood.getLong("enabled") - - )); + likelihoodDatas.add(new LikelihoodData().setResourceId(likelihood.getLong("id")).setLikeliHoodName(likelihood.getString("name")) + .setLikeliHoodCode(likelihood.getString("code")).setEnabled(likelihood.getLong("enabled"))); } - return likelihoodDatas; } @@ -69,10 +66,8 @@ public class ReadLikelihoodServiceImpl implements ReadLikelihoodService { likelihood.first(); - return new LikelihoodData(likelihood.getLong("id"), likelihood.getString("name"), likelihood.getString("code"), - likelihood.getLong("enabled") - - ); + return new LikelihoodData().setResourceId(likelihood.getLong("id")).setLikeliHoodName(likelihood.getString("name")) + .setLikeliHoodCode(likelihood.getString("code")).setEnabled(likelihood.getLong("enabled")); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/ReadSurveyServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/ReadSurveyServiceImpl.java index 10d886927..737a8f826 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/ReadSurveyServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/ReadSurveyServiceImpl.java @@ -133,10 +133,10 @@ public class ReadSurveyServiceImpl implements ReadSurveyService { List scoresOverviews = new ArrayList<>(); while (rs.next()) { - scoresOverviews.add(new ClientScoresOverview(rs.getString("code"), rs.getString("name"), rs.getLong("score"), - rs.getDouble("poverty_line"), rs.getDate("date").toLocalDate(), rs.getLong("id"), surveyName)); + scoresOverviews.add(new ClientScoresOverview().setLikelihoodCode(rs.getString("code")).setLikelihoodName(rs.getString("name")) + .setScore(rs.getLong("score")).setPovertyLine(rs.getDouble("poverty_line")).setDate(rs.getDate("date").toLocalDate()) + .setId(rs.getLong("id")).setSurveyName(surveyName)); } - return scoresOverviews; } @@ -162,8 +162,12 @@ public class ReadSurveyServiceImpl implements ReadSurveyService { final SqlRowSet rs = this.jdbcTemplate.queryForRowSet(sql); while (rs.next()) { - scoresOverviews.add(new ClientScoresOverview(rs.getString("code"), rs.getString("name"), rs.getLong("score"), - rs.getDouble("poverty_line"), rs.getDate("date").toLocalDate(), rs.getLong("id"), rs.getString("surveyName"))); + scoresOverviews.add(new ClientScoresOverview().setLikelihoodCode(rs.getString("code")) + .setLikelihoodName(rs.getString("name")).setScore(rs.getLong("score")).setPovertyLine(rs.getDouble("poverty_line")) + .setDate(rs.getDate("date").toLocalDate()).setId(rs.getLong("id")).setSurveyName(rs.getString("surveyName")) + + ); + } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/WriteLikelihoodServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/WriteLikelihoodServiceImpl.java index a9cb54d40..f385497ab 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/WriteLikelihoodServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/WriteLikelihoodServiceImpl.java @@ -25,6 +25,7 @@ import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuild import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.infrastructure.survey.data.LikelihoodDataValidator; +import org.apache.fineract.infrastructure.survey.data.LikelihoodStatus; import org.apache.fineract.infrastructure.survey.domain.Likelihood; import org.apache.fineract.infrastructure.survey.domain.LikelihoodRepository; import org.slf4j.Logger; @@ -74,7 +75,7 @@ public class WriteLikelihoodServiceImpl implements WriteLikelihoodService { likelihood.getId()); for (Likelihood aLikelihood : likelihoods) { - aLikelihood.disable(); + aLikelihood.setEnabled(LikelihoodStatus.DISABLED); } this.repository.saveAll(likelihoods); }