FINERACT-822 enable InconsistentCapitalization error

This commit is contained in:
percyashu
2020-06-11 21:55:11 +02:00
committed by Michael Vorburger ⛑️
parent 960ae3f855
commit 15f244c09f
26 changed files with 95 additions and 96 deletions
+1 -2
View File
@@ -312,7 +312,6 @@ tasks.withType(JavaCompile) {
//Todo Remove necessary checks from this list //Todo Remove necessary checks from this list
disable( disable(
"UnusedVariable", "UnusedVariable",
"InconsistentCapitalization",
"ClassCanBeStatic", "ClassCanBeStatic",
"MixedMutabilityReturnType", "MixedMutabilityReturnType",
"SameNameButDifferent", "SameNameButDifferent",
@@ -374,6 +373,7 @@ tasks.withType(JavaCompile) {
"EqualsGetClass", "EqualsGetClass",
"JdkObsolete", "JdkObsolete",
"DoubleBraceInitialization", "DoubleBraceInitialization",
"InconsistentCapitalization",
// "ReturnMissingNullable", // "ReturnMissingNullable",
// "InconsistentOverloads", // "InconsistentOverloads",
// "MethodCanBeStatic", // "MethodCanBeStatic",
@@ -384,7 +384,6 @@ tasks.withType(JavaCompile) {
// "InjectOnConstructorOfAbstractClass", // "InjectOnConstructorOfAbstractClass",
// "StringSplitter", // "StringSplitter",
// "UnnecessaryDefaultInEnumSwitch", // "UnnecessaryDefaultInEnumSwitch",
// "InconsistentCapitalization",
// "FieldCanBeFinal" // "FieldCanBeFinal"
) )
} }
@@ -42,7 +42,7 @@ public class CenterDomain implements Comparable<CenterDomain> {
private final ArrayList<HashMap> groupMembers; private final ArrayList<HashMap> groupMembers;
private Builder(final Integer id, final Integer statusid, final String statuscode, final String statusvalue, final boolean active, private Builder(final Integer id, final Integer statusid, final String statuscode, final String statusvalue, final boolean active,
final String name, final String externalId, final Integer staffId, final int officeID, final String officeName, final String name, final String externalId, final Integer staffId, final int officeId, final String officeName,
final String hierarchy, final ArrayList<HashMap> groupMembers) { final String hierarchy, final ArrayList<HashMap> groupMembers) {
this.id = id; this.id = id;
this.accountNo = null; this.accountNo = null;
@@ -54,7 +54,7 @@ public class CenterDomain implements Comparable<CenterDomain> {
this.name = name; this.name = name;
this.externalId = externalId; this.externalId = externalId;
this.staffId = staffId; this.staffId = staffId;
this.officeId = officeID; this.officeId = officeId;
this.officeName = officeName; this.officeName = officeName;
this.hierarchy = hierarchy; this.hierarchy = hierarchy;
this.groupMembers = groupMembers; this.groupMembers = groupMembers;
@@ -85,7 +85,7 @@ public class CenterDomain implements Comparable<CenterDomain> {
} }
private CenterDomain(final Integer id, final String accountNo, final Integer statusid, final String statuscode, final String statusvalue, final boolean active, private CenterDomain(final Integer id, final String accountNo, final Integer statusid, final String statuscode, final String statusvalue, final boolean active,
final String name, final String externalId, final Integer staffId, final Integer officeID, final String officeName, final String name, final String externalId, final Integer staffId, final Integer officeId, final String officeName,
final String hierarchy, final ArrayList<HashMap> groupMembers) { final String hierarchy, final ArrayList<HashMap> groupMembers) {
this.id = id; this.id = id;
this.accountNo = accountNo; this.accountNo = accountNo;
@@ -97,7 +97,7 @@ public class CenterDomain implements Comparable<CenterDomain> {
this.name = name; this.name = name;
this.externalId = externalId; this.externalId = externalId;
this.staffId = staffId; this.staffId = staffId;
this.officeId = officeID; this.officeId = officeId;
this.officeName = officeName; this.officeName = officeName;
this.hierarchy = hierarchy; this.hierarchy = hierarchy;
this.groupMembers = groupMembers; this.groupMembers = groupMembers;
@@ -112,15 +112,15 @@ public class CenterDomain implements Comparable<CenterDomain> {
} }
public static Builder create(final Integer id, final Integer statusid, final String statuscode, final String statusvalue, public static Builder create(final Integer id, final Integer statusid, final String statuscode, final String statusvalue,
final boolean active, final String name, final String externalId, final Integer staffId, final Integer officeID, final boolean active, final String name, final String externalId, final Integer staffId, final Integer officeId,
final String officeName, final String hierarchy, final ArrayList<HashMap> groupMembers) { final String officeName, final String hierarchy, final ArrayList<HashMap> groupMembers) {
return new Builder(id, statusid, statuscode, statusvalue, active, name, externalId, staffId, officeID, officeName, hierarchy, return new Builder(id, statusid, statuscode, statusvalue, active, name, externalId, staffId, officeId, officeName, hierarchy,
groupMembers); groupMembers);
} }
@SuppressWarnings({ "rawtypes", "unchecked" }) @SuppressWarnings({ "rawtypes", "unchecked" })
public static String jsonRequestToCreateCenter(Integer id, Integer statusId, String statusCode, String statusValue, Boolean active, public static String jsonRequestToCreateCenter(Integer id, Integer statusId, String statusCode, String statusValue, Boolean active,
String activationDate, String submittedDate, String name, String externalId, Integer staffId, Integer officeID, String activationDate, String submittedDate, String name, String externalId, Integer staffId, Integer officeId,
String officeName, String hierarchy, final int[] groupMembers) { String officeName, String hierarchy, final int[] groupMembers) {
// String ids = String.valueOf(id); // String ids = String.valueOf(id);
final HashMap map = new HashMap<>(); final HashMap map = new HashMap<>();
@@ -222,9 +222,9 @@ public class SavingsProductHelper {
return this; return this;
} }
public SavingsProductHelper withOverDraft(final String overDraftLimit) { public SavingsProductHelper withOverDraft(final String overdraftLimit) {
this.allowOverdraft = "true"; this.allowOverdraft = "true";
this.overdraftLimit = overDraftLimit; this.overdraftLimit = overdraftLimit;
return this; return this;
} }
@@ -304,4 +304,4 @@ public class SavingsProductHelper {
return this; return this;
} }
} }
@@ -237,8 +237,8 @@ public class GLAccount extends AbstractPersistableCustom {
return GLAccountUsage.DETAIL.getValue().equals(this.usage); return GLAccountUsage.DETAIL.getValue().equals(this.usage);
} }
public void updateTagId(final CodeValue tagID) { public void updateTagId(final CodeValue tagId) {
this.tagId = tagID; this.tagId = tagId;
} }
public void updateParentAccount(final GLAccount parentAccount) { public void updateParentAccount(final GLAccount parentAccount) {
@@ -85,7 +85,7 @@ public class LoanProductProvisioningEntryData {
} }
public LoanProductProvisioningEntryData(final Long historyId, final Long officeId, final String officeName, final String currencyCode, final Long productId, public LoanProductProvisioningEntryData(final Long historyId, final Long officeId, final String officeName, final String currencyCode, final Long productId,
final String productName, final Long categoryId, final String categoryName, final Long overdueInDays, final BigDecimal amountReserved, final String productName, final Long categoryId, final String categoryName, final Long overdueInDays, final BigDecimal amountreserved,
Long liablityAccount, String liabilityAccountglCode, String liabilityAccountName, Long expenseAccount, String expenseAccountglCode, String expenseAccountName, final Long criteriaId) { Long liablityAccount, String liabilityAccountglCode, String liabilityAccountName, Long expenseAccount, String expenseAccountglCode, String expenseAccountName, final Long criteriaId) {
this.historyId = historyId; this.historyId = historyId;
this.officeId = officeId; this.officeId = officeId;
@@ -100,7 +100,7 @@ public class LoanProductProvisioningEntryData {
this.expenseAccount = expenseAccount; this.expenseAccount = expenseAccount;
this.officeName = officeName ; this.officeName = officeName ;
this.productName = productName ; this.productName = productName ;
this.amountreserved = amountReserved ; this.amountreserved = amountreserved ;
this.liabilityAccountCode = liabilityAccountglCode ; this.liabilityAccountCode = liabilityAccountglCode ;
this.liabilityAccountName = liabilityAccountName ; this.liabilityAccountName = liabilityAccountName ;
this.expenseAccountCode = expenseAccountglCode ; this.expenseAccountCode = expenseAccountglCode ;
@@ -135,8 +135,8 @@ public class CommandSource extends AbstractPersistableCustom {
} }
public void setOrganisationCreditBureauId(Long OrganisationCreditBureauId) { public void setOrganisationCreditBureauId(Long organisationCreditBureauId) {
this.organisationCreditBureauId = OrganisationCreditBureauId; this.organisationCreditBureauId = organisationCreditBureauId;
} }
public void markAsChecked(final AppUser checker, final DateTime checkedOnDate) { public void markAsChecked(final AppUser checker, final DateTime checkedOnDate) {
@@ -274,4 +274,4 @@ public class CommandSource extends AbstractPersistableCustom {
this.transactionId = transactionId; this.transactionId = transactionId;
} }
} }
@@ -77,12 +77,12 @@ public class CommandWrapperBuilder {
return this; return this;
} }
public CommandWrapperBuilder createCreditBureauLoanProductMapping(final long CreditBureauId) { public CommandWrapperBuilder createCreditBureauLoanProductMapping(final long creditBureauId) {
this.actionName = "CREATE"; this.actionName = "CREATE";
this.entityName = "CREDITBUREAU_LOANPRODUCT_MAPPING"; this.entityName = "CREDITBUREAU_LOANPRODUCT_MAPPING";
this.entityId = CreditBureauId; this.entityId = creditBureauId;
this.href = "/creditBureauConfiguration/template"; this.href = "/creditBureauConfiguration/template";
this.creditBureauId=CreditBureauId; this.creditBureauId=creditBureauId;
return this; return this;
} }
@@ -50,8 +50,8 @@ public class RuntimeDelegatingCacheManager implements CacheManager {
private CacheManager currentCacheManager; private CacheManager currentCacheManager;
@Autowired @Autowired
public RuntimeDelegatingCacheManager(final EhCacheCacheManager ehCacheCacheManager) { public RuntimeDelegatingCacheManager(final EhCacheCacheManager ehcacheCacheManager) {
this.ehcacheCacheManager = ehCacheCacheManager; this.ehcacheCacheManager = ehcacheCacheManager;
this.currentCacheManager = this.noOpCacheManager; this.currentCacheManager = this.noOpCacheManager;
} }
@@ -122,4 +122,4 @@ public class RuntimeDelegatingCacheManager implements CacheManager {
private void clearEhCache() { private void clearEhCache() {
this.ehcacheCacheManager.getCacheManager().clearAll(); this.ehcacheCacheManager.getCacheManager().clearAll();
} }
} }
@@ -42,10 +42,10 @@ public class OrganisationCreditBureau extends AbstractPersistableCustom {
@OneToMany(mappedBy = "organisation_creditbureau", cascade = CascadeType.ALL) @OneToMany(mappedBy = "organisation_creditbureau", cascade = CascadeType.ALL)
private List<CreditBureauLoanProductMapping> creditBureauLoanProductMapping = new ArrayList<>(); private List<CreditBureauLoanProductMapping> creditBureauLoanProductMapping = new ArrayList<>();
public OrganisationCreditBureau(String alias, CreditBureau creditBureau, boolean is_active, public OrganisationCreditBureau(String alias, CreditBureau creditbureau, boolean is_active,
List<CreditBureauLoanProductMapping> creditBureauLoanProductMapping) { List<CreditBureauLoanProductMapping> creditBureauLoanProductMapping) {
this.alias = alias; this.alias = alias;
this.creditbureau = creditBureau; this.creditbureau = creditbureau;
this.is_active = is_active; this.is_active = is_active;
this.creditBureauLoanProductMapping = creditBureauLoanProductMapping; this.creditBureauLoanProductMapping = creditBureauLoanProductMapping;
} }
@@ -54,11 +54,11 @@ public class OrganisationCreditBureau extends AbstractPersistableCustom {
} }
public static OrganisationCreditBureau fromJson(final JsonCommand command, CreditBureau creditBureau) { public static OrganisationCreditBureau fromJson(final JsonCommand command, CreditBureau creditbureau) {
final String alias = command.stringValueOfParameterNamed("alias"); final String alias = command.stringValueOfParameterNamed("alias");
final boolean is_active = command.booleanPrimitiveValueOfParameterNamed("is_active"); final boolean is_active = command.booleanPrimitiveValueOfParameterNamed("is_active");
return new OrganisationCreditBureau(alias, creditBureau, is_active, null); return new OrganisationCreditBureau(alias, creditbureau, is_active, null);
} }
public String getAlias() { public String getAlias() {
@@ -73,8 +73,8 @@ public class OrganisationCreditBureau extends AbstractPersistableCustom {
return this.creditbureau; return this.creditbureau;
} }
public void setCreditBureau(CreditBureau creditBureau) { public void setCreditBureau(CreditBureau creditbureau) {
this.creditbureau = creditBureau; this.creditbureau = creditbureau;
} }
public boolean isActive() { public boolean isActive() {
@@ -48,11 +48,11 @@ public class CreditBureauLoanProductMappingWritePlatformServiceImpl implements C
@Autowired @Autowired
public CreditBureauLoanProductMappingWritePlatformServiceImpl(final PlatformSecurityContext context, public CreditBureauLoanProductMappingWritePlatformServiceImpl(final PlatformSecurityContext context,
final CreditBureauLoanProductMappingRepository creditbureauLoanProductMappingRepository, final CreditBureauLoanProductMappingRepository creditBureauLoanProductMappingRepository,
final OrganisationCreditBureauRepository organisationCreditBureauRepository, LoanProductRepository loanProductRepository, final OrganisationCreditBureauRepository organisationCreditBureauRepository, LoanProductRepository loanProductRepository,
final CreditBureauLoanProductCommandFromApiJsonDeserializer fromApiJsonDeserializer) { final CreditBureauLoanProductCommandFromApiJsonDeserializer fromApiJsonDeserializer) {
this.context = context; this.context = context;
this.creditBureauLoanProductMappingRepository = creditbureauLoanProductMappingRepository; this.creditBureauLoanProductMappingRepository = creditBureauLoanProductMappingRepository;
this.organisationCreditBureauRepository = organisationCreditBureauRepository; this.organisationCreditBureauRepository = organisationCreditBureauRepository;
this.loanProductRepository = loanProductRepository; this.loanProductRepository = loanProductRepository;
this.fromApiJsonDeserializer = fromApiJsonDeserializer; this.fromApiJsonDeserializer = fromApiJsonDeserializer;
@@ -45,9 +45,9 @@ public class StaffData implements Serializable {
private String dateFormat; private String dateFormat;
private String locale; private String locale;
public static StaffData importInstance(String externalId, String firstName, String lastName, String mobileNo, Long officeId, Boolean isLoanOfficer, public static StaffData importInstance(String externalId, String firstname, String lastname, String mobileNo, Long officeId, Boolean isLoanOfficer,
Boolean isActive, LocalDate joinedOnDate, Integer rowIndex,String locale, String dateFormat){ Boolean isActive, LocalDate joinedOnDate, Integer rowIndex,String locale, String dateFormat){
return new StaffData(externalId,firstName,lastName,mobileNo,officeId,isLoanOfficer,isActive, return new StaffData(externalId,firstname,lastname,mobileNo,officeId,isLoanOfficer,isActive,
joinedOnDate,rowIndex,locale,dateFormat); joinedOnDate,rowIndex,locale,dateFormat);
} }
@@ -138,4 +138,4 @@ public class StaffData implements Serializable {
public Long getOfficeId() { public Long getOfficeId() {
return this.officeId; return this.officeId;
} }
} }
@@ -49,8 +49,8 @@ public class PortfolioAccountData implements Serializable {
} }
public PortfolioAccountData(final Long id, final String accountNo, final String externalId, final Long groupId, final String groupName, public PortfolioAccountData(final Long id, final String accountNo, final String externalId, final Long groupId, final String groupName,
final Long clientId, final String clientName, final Long productId, final String productName, final Long fieldofficerId, final Long clientId, final String clientName, final Long productId, final String productName, final Long fieldOfficerId,
final String fieldofficerName, final CurrencyData currency) { final String fieldOfficerName, final CurrencyData currency) {
this.id = id; this.id = id;
this.accountNo = accountNo; this.accountNo = accountNo;
this.externalId = externalId; this.externalId = externalId;
@@ -60,15 +60,15 @@ public class PortfolioAccountData implements Serializable {
this.clientName = clientName; this.clientName = clientName;
this.productId = productId; this.productId = productId;
this.productName = productName; this.productName = productName;
this.fieldOfficerId = fieldofficerId; this.fieldOfficerId = fieldOfficerId;
this.fieldOfficerName = fieldofficerName; this.fieldOfficerName = fieldOfficerName;
this.currency = currency; this.currency = currency;
this.amtForTransfer = null; this.amtForTransfer = null;
} }
public PortfolioAccountData(final Long id, final String accountNo, final String externalId, final Long groupId, final String groupName, public PortfolioAccountData(final Long id, final String accountNo, final String externalId, final Long groupId, final String groupName,
final Long clientId, final String clientName, final Long productId, final String productName, final Long fieldofficerId, final Long clientId, final String clientName, final Long productId, final String productName, final Long fieldOfficerId,
final String fieldofficerName, final CurrencyData currency, final BigDecimal amtForTransfer) { final String fieldOfficerName, final CurrencyData currency, final BigDecimal amtForTransfer) {
this.id = id; this.id = id;
this.accountNo = accountNo; this.accountNo = accountNo;
this.externalId = externalId; this.externalId = externalId;
@@ -78,8 +78,8 @@ public class PortfolioAccountData implements Serializable {
this.clientName = clientName; this.clientName = clientName;
this.productId = productId; this.productId = productId;
this.productName = productName; this.productName = productName;
this.fieldOfficerId = fieldofficerId; this.fieldOfficerId = fieldOfficerId;
this.fieldOfficerName = fieldofficerName; this.fieldOfficerName = fieldOfficerName;
this.currency = currency; this.currency = currency;
this.amtForTransfer = amtForTransfer; this.amtForTransfer = amtForTransfer;
} }
@@ -71,7 +71,7 @@ public class ChargeWritePlatformServiceJpaRepositoryImpl implements ChargeWriteP
public ChargeWritePlatformServiceJpaRepositoryImpl(final PlatformSecurityContext context, public ChargeWritePlatformServiceJpaRepositoryImpl(final PlatformSecurityContext context,
final ChargeDefinitionCommandFromApiJsonDeserializer fromApiJsonDeserializer, final ChargeRepository chargeRepository, final ChargeDefinitionCommandFromApiJsonDeserializer fromApiJsonDeserializer, final ChargeRepository chargeRepository,
final LoanProductRepository loanProductRepository, final RoutingDataSource dataSource, final LoanProductRepository loanProductRepository, final RoutingDataSource dataSource,
final FineractEntityAccessUtil fineractEntityAccessUtil, final GLAccountRepositoryWrapper glAccountRepository, final FineractEntityAccessUtil fineractEntityAccessUtil, final GLAccountRepositoryWrapper gLAccountRepository,
final TaxGroupRepositoryWrapper taxGroupRepository) { final TaxGroupRepositoryWrapper taxGroupRepository) {
this.context = context; this.context = context;
this.fromApiJsonDeserializer = fromApiJsonDeserializer; this.fromApiJsonDeserializer = fromApiJsonDeserializer;
@@ -80,7 +80,7 @@ public class ChargeWritePlatformServiceJpaRepositoryImpl implements ChargeWriteP
this.chargeRepository = chargeRepository; this.chargeRepository = chargeRepository;
this.loanProductRepository = loanProductRepository; this.loanProductRepository = loanProductRepository;
this.fineractEntityAccessUtil = fineractEntityAccessUtil; this.fineractEntityAccessUtil = fineractEntityAccessUtil;
this.gLAccountRepository = glAccountRepository; this.gLAccountRepository = gLAccountRepository;
this.taxGroupRepository = taxGroupRepository; this.taxGroupRepository = taxGroupRepository;
} }
@@ -127,12 +127,12 @@ final public class ClientData implements Comparable<ClientData>, Serializable {
address,clientNonPersonDetails, locale,dateFormat); address,clientNonPersonDetails, locale,dateFormat);
} }
public static ClientData importClientPersonInstance(Long legalFormId,Integer rowIndex,String firstName,String lastName,String middleName, public static ClientData importClientPersonInstance(Long legalFormId,Integer rowIndex,String firstname,String lastname,String middlename,
LocalDate submittedOn,LocalDate activationDate,Boolean active,String externalId,Long officeId, LocalDate submittedOn,LocalDate activationDate,Boolean active,String externalId,Long officeId,
Long staffId,String mobileNo, LocalDate dob,Long clientTypeId,Long genderId, Long staffId,String mobileNo, LocalDate dob,Long clientTypeId,Long genderId,
Long clientClassificationId, Boolean isStaff, Collection<AddressData> address,String locale,String dateFormat){ Long clientClassificationId, Boolean isStaff, Collection<AddressData> address,String locale,String dateFormat){
return new ClientData(legalFormId,rowIndex, null, firstName,lastName,middleName,submittedOn,activationDate,active,externalId, return new ClientData(legalFormId,rowIndex, null, firstname,lastname,middlename,submittedOn,activationDate,active,externalId,
officeId,staffId,mobileNo,dob,clientTypeId,genderId,clientClassificationId,isStaff,address, null, locale,dateFormat); officeId,staffId,mobileNo,dob,clientTypeId,genderId,clientClassificationId,isStaff,address, null, locale,dateFormat);
} }
@@ -609,4 +609,4 @@ final public class ClientData implements Comparable<ClientData>, Serializable {
public Boolean getIsAddressEnabled() { public Boolean getIsAddressEnabled() {
return this.isAddressEnabled; return this.isAddressEnabled;
} }
} }
@@ -1201,7 +1201,7 @@ public class LoanAccountData {
Boolean allowPartialPeriodInterestCalcualtion, final LocalDate expectedFirstRepaymentOnDate, Boolean allowPartialPeriodInterestCalcualtion, final LocalDate expectedFirstRepaymentOnDate,
final Integer graceOnPrincipalPayment, final Integer recurringMoratoriumOnPrincipalPeriods, final Integer graceOnInterestPayment, final Integer graceOnInterestCharged, final Integer graceOnPrincipalPayment, final Integer recurringMoratoriumOnPrincipalPeriods, final Integer graceOnInterestPayment, final Integer graceOnInterestCharged,
final LocalDate interestChargedFromDate, final LoanApplicationTimelineData timeline, final LoanSummaryData loanSummary, final LocalDate interestChargedFromDate, final LoanApplicationTimelineData timeline, final LoanSummaryData loanSummary,
final BigDecimal feeChargesDueAtDisbursementCharged, final Boolean syncDisbursementWithMeeting, final Integer loancounter, final BigDecimal feeChargesDueAtDisbursementCharged, final Boolean syncDisbursementWithMeeting, final Integer loanCounter,
final Integer loanProductCounter, final Boolean multiDisburseLoan, Boolean canDefineInstallmentAmount, final Integer loanProductCounter, final Boolean multiDisburseLoan, Boolean canDefineInstallmentAmount,
final BigDecimal fixedEmiAmont, final BigDecimal outstandingLoanBalance, final Boolean inArrears, final BigDecimal fixedEmiAmont, final BigDecimal outstandingLoanBalance, final Boolean inArrears,
final Integer graceOnArrearsAgeing, final Boolean isNPA, final EnumOptionData daysInMonthType, final Integer graceOnArrearsAgeing, final Boolean isNPA, final EnumOptionData daysInMonthType,
@@ -1262,7 +1262,7 @@ public class LoanAccountData {
repaymentFrequencyTypeOptions, repaymentFrequencyNthDayTypeOptions, repaymentFrequencyDayOfWeekTypeOptions, repaymentFrequencyTypeOptions, repaymentFrequencyNthDayTypeOptions, repaymentFrequencyDayOfWeekTypeOptions,
repaymentStrategyOptions, interestRateFrequencyTypeOptions, amortizationTypeOptions, interestTypeOptions, repaymentStrategyOptions, interestRateFrequencyTypeOptions, amortizationTypeOptions, interestTypeOptions,
interestCalculationPeriodTypeOptions, fundOptions, chargeOptions, chargeTemplate, loanOfficerOptions, loanPurposeOptions, interestCalculationPeriodTypeOptions, fundOptions, chargeOptions, chargeTemplate, loanOfficerOptions, loanPurposeOptions,
loanCollateralOptions, calendarOptions, syncDisbursementWithMeeting, loancounter, loanProductCounter, notes, loanCollateralOptions, calendarOptions, syncDisbursementWithMeeting, loanCounter, loanProductCounter, notes,
accountLinkingOptions, linkedAccount, disbursementData, multiDisburseLoan, canDefineInstallmentAmount, fixedEmiAmont, accountLinkingOptions, linkedAccount, disbursementData, multiDisburseLoan, canDefineInstallmentAmount, fixedEmiAmont,
outstandingLoanBalance, emiAmountVariations, memberVariations, product, inArrears, graceOnArrearsAgeing, overdueCharges, outstandingLoanBalance, emiAmountVariations, memberVariations, product, inArrears, graceOnArrearsAgeing, overdueCharges,
isNPA, daysInMonthType, daysInYearType, isInterestRecalculationEnabled, interestRecalculationData, originalSchedule, isNPA, daysInMonthType, daysInYearType, isInterestRecalculationEnabled, interestRecalculationData, originalSchedule,
@@ -253,9 +253,9 @@ public class LoanTransactionData {
public LoanTransactionData(Long id, LoanTransactionEnumData transactionType, LocalDate date, BigDecimal totalAmount, public LoanTransactionData(Long id, LoanTransactionEnumData transactionType, LocalDate date, BigDecimal totalAmount,
BigDecimal principalPortion, BigDecimal interestPortion, BigDecimal feeChargesPortion, BigDecimal penaltyChargesPortion, BigDecimal principalPortion, BigDecimal interestPortion, BigDecimal feeChargesPortion, BigDecimal penaltyChargesPortion,
BigDecimal overPaymentPortion, BigDecimal unrecognizedIncomePortion, BigDecimal outstandingLoanBalance,final boolean manuallyReversed) { BigDecimal overpaymentPortion, BigDecimal unrecognizedIncomePortion, BigDecimal outstandingLoanBalance,final boolean manuallyReversed) {
this(id, null, null, transactionType, null, null, date, totalAmount, principalPortion, interestPortion, feeChargesPortion, this(id, null, null, transactionType, null, null, date, totalAmount, principalPortion, interestPortion, feeChargesPortion,
penaltyChargesPortion, overPaymentPortion, unrecognizedIncomePortion, null, null, null, null, outstandingLoanBalance, null, penaltyChargesPortion, overpaymentPortion, unrecognizedIncomePortion, null, null, null, null, outstandingLoanBalance, null,
manuallyReversed); manuallyReversed);
} }
@@ -349,4 +349,4 @@ public class LoanTransactionData {
public void setLoanChargePaidByList(Collection<LoanChargePaidByData> loanChargePaidByList) { public void setLoanChargePaidByList(Collection<LoanChargePaidByData> loanChargePaidByList) {
this.loanChargePaidByList = loanChargePaidByList; this.loanChargePaidByList = loanChargePaidByList;
} }
} }
@@ -73,8 +73,8 @@ public class LoanInstallmentCharge extends AbstractPersistableCustom implements
return this.installment.getInstallmentNumber().compareTo(o.installment.getInstallmentNumber()); return this.installment.getInstallmentNumber().compareTo(o.installment.getInstallmentNumber());
} }
public LoanInstallmentCharge(final BigDecimal amount, final LoanCharge loanCharge, final LoanRepaymentScheduleInstallment installment) { public LoanInstallmentCharge(final BigDecimal amount, final LoanCharge loancharge, final LoanRepaymentScheduleInstallment installment) {
this.loancharge = loanCharge; this.loancharge = loancharge;
this.installment = installment; this.installment = installment;
this.amount = amount; this.amount = amount;
this.amountOutstanding = amount; this.amountOutstanding = amount;
@@ -299,4 +299,4 @@ public class LoanInstallmentCharge extends AbstractPersistableCustom implements
} }
} }
@@ -44,9 +44,9 @@ public class LoanOverdueInstallmentCharge extends AbstractPersistableCustom {
} }
public LoanOverdueInstallmentCharge(final LoanCharge loanCharge, final LoanRepaymentScheduleInstallment installment, public LoanOverdueInstallmentCharge(final LoanCharge loancharge, final LoanRepaymentScheduleInstallment installment,
final Integer frequencyNumber) { final Integer frequencyNumber) {
this.loancharge = loanCharge; this.loancharge = loancharge;
this.installment = installment; this.installment = installment;
this.frequencyNumber = frequencyNumber; this.frequencyNumber = frequencyNumber;
} }
@@ -59,4 +59,4 @@ public class LoanOverdueInstallmentCharge extends AbstractPersistableCustom {
return this.installment; return this.installment;
} }
} }
@@ -41,8 +41,8 @@ public class LoanTrancheDisbursementCharge extends AbstractPersistableCustom {
} }
public LoanTrancheDisbursementCharge(final LoanCharge loanCharge, final LoanDisbursementDetails loanDisbursementDetails){ public LoanTrancheDisbursementCharge(final LoanCharge loancharge, final LoanDisbursementDetails loanDisbursementDetails){
this.loancharge = loanCharge; this.loancharge = loancharge;
this.loanDisbursementDetails = loanDisbursementDetails; this.loanDisbursementDetails = loanDisbursementDetails;
} }
@@ -50,4 +50,4 @@ public class LoanTrancheDisbursementCharge extends AbstractPersistableCustom {
return this.loanDisbursementDetails; return this.loanDisbursementDetails;
} }
} }
@@ -77,10 +77,10 @@ public class GuarantorData {
private String dateFormat; private String dateFormat;
private String locale; private String locale;
public static GuarantorData importInstance(Integer guarantorTypeId,Integer clientRelationshipTypeId,Long entityId,String firstName, public static GuarantorData importInstance(Integer guarantorTypeId,Integer clientRelationshipTypeId,Long entityId,String firstname,
String lastName,String addressLine1,String addressLine2,String city,LocalDate dob, String zip, String lastname,String addressLine1,String addressLine2,String city,LocalDate dob, String zip,
Integer savingsId, BigDecimal amount,Integer rowIndex,Long accountId,String locale,String dateFormat){ Integer savingsId, BigDecimal amount,Integer rowIndex,Long accountId,String locale,String dateFormat){
return new GuarantorData(guarantorTypeId,clientRelationshipTypeId,entityId,firstName, lastName, return new GuarantorData(guarantorTypeId,clientRelationshipTypeId,entityId,firstname, lastname,
addressLine1, addressLine2,city,dob,zip,savingsId,amount, rowIndex, accountId,locale,dateFormat); addressLine1, addressLine2,city,dob,zip,savingsId,amount, rowIndex, accountId,locale,dateFormat);
} }
private GuarantorData(Integer guarantorTypeId,Integer clientRelationshipTypeId,Long entityId,String firstname, private GuarantorData(Integer guarantorTypeId,Integer clientRelationshipTypeId,Long entityId,String firstname,
@@ -213,4 +213,4 @@ public class GuarantorData {
return this.entityId; return this.entityId;
} }
} }
@@ -33,11 +33,11 @@ public class ObligeeData {
private final BigDecimal amountReleased; private final BigDecimal amountReleased;
private final BigDecimal amountTransferred; private final BigDecimal amountTransferred;
private ObligeeData(String firstname, String lastname, String displayName, String accountNumber, private ObligeeData(String firstName, String lastName, String displayName, String accountNumber,
BigDecimal loanAmount, BigDecimal guaranteeAmount, BigDecimal amountReleased, BigDecimal loanAmount, BigDecimal guaranteeAmount, BigDecimal amountReleased,
BigDecimal amountTransferred) { BigDecimal amountTransferred) {
this.firstName = firstname; this.firstName = firstName;
this.lastName = lastname; this.lastName = lastName;
this.displayName = displayName; this.displayName = displayName;
this.accountNumber = accountNumber; this.accountNumber = accountNumber;
this.loanAmount = loanAmount; this.loanAmount = loanAmount;
@@ -46,10 +46,10 @@ public class ObligeeData {
this.amountTransferred = amountTransferred; this.amountTransferred = amountTransferred;
} }
public static ObligeeData instance(final String firstname, final String lastname, final String displayName, public static ObligeeData instance(final String firstName, final String lastName, final String displayName,
final String accountNumber, final BigDecimal loanAmount, final BigDecimal guaranteeAmount, final String accountNumber, final BigDecimal loanAmount, final BigDecimal guaranteeAmount,
final BigDecimal amountReleased, final BigDecimal amountTransferred) { final BigDecimal amountReleased, final BigDecimal amountTransferred) {
return new ObligeeData(firstname, lastname, displayName, accountNumber, loanAmount, guaranteeAmount, return new ObligeeData(firstName, lastName, displayName, accountNumber, loanAmount, guaranteeAmount,
amountReleased, amountTransferred); amountReleased, amountTransferred);
} }
@@ -232,8 +232,8 @@ public final class LoanApplicationTerms {
final BigDecimal principalThresholdForLastInstalment, final Integer installmentAmountInMultiplesOf, final BigDecimal principalThresholdForLastInstalment, final Integer installmentAmountInMultiplesOf,
final LoanPreClosureInterestCalculationStrategy preClosureInterestCalculationStrategy, final Calendar loanCalendar, final LoanPreClosureInterestCalculationStrategy preClosureInterestCalculationStrategy, final Calendar loanCalendar,
BigDecimal approvedAmount, List<LoanTermVariationsData> loanTermVariations, BigDecimal approvedAmount, List<LoanTermVariationsData> loanTermVariations,
Boolean isInterestChargedFromDateSameAsDisbursalDateEnabled, final Integer numberOfdays, Boolean isInterestChargedFromDateSameAsDisbursalDateEnabled, final Integer numberOfDays,
boolean isSkipRepaymentOnFirstDayofMonth, final HolidayDetailDTO holidayDetailDTO, final boolean allowCompoundingOnEod, boolean isSkipRepaymentOnFirstDayOfMonth, final HolidayDetailDTO holidayDetailDTO, final boolean allowCompoundingOnEod,
final boolean isEqualAmortization) { final boolean isEqualAmortization) {
final LoanRescheduleStrategyMethod rescheduleStrategyMethod = null; final LoanRescheduleStrategyMethod rescheduleStrategyMethod = null;
@@ -248,7 +248,7 @@ public final class LoanApplicationTerms {
interestRecalculationCompoundingMethod, restCalendarInstance, recalculationFrequencyType, compoundingCalendarInstance, interestRecalculationCompoundingMethod, restCalendarInstance, recalculationFrequencyType, compoundingCalendarInstance,
compoundingFrequencyType, principalThresholdForLastInstalment, installmentAmountInMultiplesOf, compoundingFrequencyType, principalThresholdForLastInstalment, installmentAmountInMultiplesOf,
preClosureInterestCalculationStrategy, loanCalendar, approvedAmount, loanTermVariations, calendarHistoryDataWrapper, preClosureInterestCalculationStrategy, loanCalendar, approvedAmount, loanTermVariations, calendarHistoryDataWrapper,
isInterestChargedFromDateSameAsDisbursalDateEnabled, numberOfdays, isSkipRepaymentOnFirstDayofMonth, holidayDetailDTO, isInterestChargedFromDateSameAsDisbursalDateEnabled, numberOfDays, isSkipRepaymentOnFirstDayOfMonth, holidayDetailDTO,
allowCompoundingOnEod, isEqualAmortization); allowCompoundingOnEod, isEqualAmortization);
} }
@@ -265,7 +265,7 @@ public final class LoanApplicationTerms {
final CalendarInstance compoundingCalendarInstance, final RecalculationFrequencyType compoundingFrequencyType, final CalendarInstance compoundingCalendarInstance, final RecalculationFrequencyType compoundingFrequencyType,
final LoanPreClosureInterestCalculationStrategy loanPreClosureInterestCalculationStrategy, final LoanPreClosureInterestCalculationStrategy loanPreClosureInterestCalculationStrategy,
final LoanRescheduleStrategyMethod rescheduleStrategyMethod, BigDecimal approvedAmount, BigDecimal annualNominalInterestRate, final LoanRescheduleStrategyMethod rescheduleStrategyMethod, BigDecimal approvedAmount, BigDecimal annualNominalInterestRate,
List<LoanTermVariationsData> loanTermVariations, final Integer numberOfdays, final boolean isSkipRepaymentOnFirstDayofMonth, List<LoanTermVariationsData> loanTermVariations, final Integer numberOfDays, final boolean isSkipRepaymentOnFirstDayOfMonth,
final Calendar loanCalendar, final HolidayDetailDTO holidayDetailDTO, final boolean allowCompoundingOnEod) { final Calendar loanCalendar, final HolidayDetailDTO holidayDetailDTO, final boolean allowCompoundingOnEod) {
final CalendarHistoryDataWrapper calendarHistoryDataWrapper = null; final CalendarHistoryDataWrapper calendarHistoryDataWrapper = null;
@@ -275,7 +275,7 @@ public final class LoanApplicationTerms {
principalThresholdForLastInstalment, installmentAmountInMultiplesOf, recalculationFrequencyType, restCalendarInstance, principalThresholdForLastInstalment, installmentAmountInMultiplesOf, recalculationFrequencyType, restCalendarInstance,
compoundingMethod, compoundingCalendarInstance, compoundingFrequencyType, loanPreClosureInterestCalculationStrategy, compoundingMethod, compoundingCalendarInstance, compoundingFrequencyType, loanPreClosureInterestCalculationStrategy,
rescheduleStrategyMethod, loanCalendar, approvedAmount, annualNominalInterestRate, loanTermVariations, rescheduleStrategyMethod, loanCalendar, approvedAmount, annualNominalInterestRate, loanTermVariations,
calendarHistoryDataWrapper, numberOfdays, isSkipRepaymentOnFirstDayofMonth, holidayDetailDTO, allowCompoundingOnEod); calendarHistoryDataWrapper, numberOfDays, isSkipRepaymentOnFirstDayOfMonth, holidayDetailDTO, allowCompoundingOnEod);
} }
public static LoanApplicationTerms assembleFrom(final ApplicationCurrency applicationCurrency, final Integer loanTermFrequency, public static LoanApplicationTerms assembleFrom(final ApplicationCurrency applicationCurrency, final Integer loanTermFrequency,
@@ -291,8 +291,8 @@ public final class LoanApplicationTerms {
final LoanPreClosureInterestCalculationStrategy loanPreClosureInterestCalculationStrategy, final LoanPreClosureInterestCalculationStrategy loanPreClosureInterestCalculationStrategy,
final LoanRescheduleStrategyMethod rescheduleStrategyMethod, final Calendar loanCalendar, BigDecimal approvedAmount, final LoanRescheduleStrategyMethod rescheduleStrategyMethod, final Calendar loanCalendar, BigDecimal approvedAmount,
BigDecimal annualNominalInterestRate, final List<LoanTermVariationsData> loanTermVariations, BigDecimal annualNominalInterestRate, final List<LoanTermVariationsData> loanTermVariations,
final CalendarHistoryDataWrapper calendarHistoryDataWrapper, final Integer numberOfdays, final CalendarHistoryDataWrapper calendarHistoryDataWrapper, final Integer numberOfDays,
final boolean isSkipRepaymentOnFirstDayofMonth, final HolidayDetailDTO holidayDetailDTO, final boolean allowCompoundingOnEod) { final boolean isSkipRepaymentOnFirstDayOfMonth, final HolidayDetailDTO holidayDetailDTO, final boolean allowCompoundingOnEod) {
final Integer numberOfRepayments = loanProductRelatedDetail.getNumberOfRepayments(); final Integer numberOfRepayments = loanProductRelatedDetail.getNumberOfRepayments();
final Integer repaymentEvery = loanProductRelatedDetail.getRepayEvery(); final Integer repaymentEvery = loanProductRelatedDetail.getRepayEvery();
@@ -328,8 +328,8 @@ public final class LoanApplicationTerms {
isInterestRecalculationEnabled, rescheduleStrategyMethod, compoundingMethod, restCalendarInstance, isInterestRecalculationEnabled, rescheduleStrategyMethod, compoundingMethod, restCalendarInstance,
recalculationFrequencyType, compoundingCalendarInstance, compoundingFrequencyType, principalThresholdForLastInstalment, recalculationFrequencyType, compoundingCalendarInstance, compoundingFrequencyType, principalThresholdForLastInstalment,
installmentAmountInMultiplesOf, loanPreClosureInterestCalculationStrategy, loanCalendar, approvedAmount, installmentAmountInMultiplesOf, loanPreClosureInterestCalculationStrategy, loanCalendar, approvedAmount,
loanTermVariations, calendarHistoryDataWrapper, isInterestChargedFromDateSameAsDisbursalDateEnabled, numberOfdays, loanTermVariations, calendarHistoryDataWrapper, isInterestChargedFromDateSameAsDisbursalDateEnabled, numberOfDays,
isSkipRepaymentOnFirstDayofMonth, holidayDetailDTO, allowCompoundingOnEod, isEqualAmortization); isSkipRepaymentOnFirstDayOfMonth, holidayDetailDTO, allowCompoundingOnEod, isEqualAmortization);
} }
public static LoanApplicationTerms assembleFrom(final ApplicationCurrency applicationCurrency, final Integer loanTermFrequency, public static LoanApplicationTerms assembleFrom(final ApplicationCurrency applicationCurrency, final Integer loanTermFrequency,
@@ -343,7 +343,7 @@ public final class LoanApplicationTerms {
final BigDecimal principalThresholdForLastInstalment, final Integer installmentAmountInMultiplesOf, final BigDecimal principalThresholdForLastInstalment, final Integer installmentAmountInMultiplesOf,
final LoanPreClosureInterestCalculationStrategy loanPreClosureInterestCalculationStrategy, final Calendar loanCalendar, final LoanPreClosureInterestCalculationStrategy loanPreClosureInterestCalculationStrategy, final Calendar loanCalendar,
BigDecimal approvedAmount, final BigDecimal annualNominalInterestRate, final List<LoanTermVariationsData> loanTermVariations, BigDecimal approvedAmount, final BigDecimal annualNominalInterestRate, final List<LoanTermVariationsData> loanTermVariations,
Integer numberOfdays, boolean isSkipRepaymentOnFirstDayofMonth, final HolidayDetailDTO holidayDetailDTO, Integer numberOfDays, boolean isSkipRepaymentOnFirstDayOfMonth, final HolidayDetailDTO holidayDetailDTO,
final boolean allowCompoundingOnEod) { final boolean allowCompoundingOnEod) {
final Integer numberOfRepayments = loanProductRelatedDetail.getNumberOfRepayments(); final Integer numberOfRepayments = loanProductRelatedDetail.getNumberOfRepayments();
@@ -387,7 +387,7 @@ public final class LoanApplicationTerms {
rescheduleStrategyMethod, interestRecalculationCompoundingMethod, restCalendarInstance, recalculationFrequencyType, rescheduleStrategyMethod, interestRecalculationCompoundingMethod, restCalendarInstance, recalculationFrequencyType,
compoundingCalendarInstance, compoundingFrequencyType, principalThresholdForLastInstalment, installmentAmountInMultiplesOf, compoundingCalendarInstance, compoundingFrequencyType, principalThresholdForLastInstalment, installmentAmountInMultiplesOf,
loanPreClosureInterestCalculationStrategy, loanCalendar, approvedAmount, loanTermVariations, calendarHistoryDataWrapper, loanPreClosureInterestCalculationStrategy, loanCalendar, approvedAmount, loanTermVariations, calendarHistoryDataWrapper,
isInterestChargedFromDateSameAsDisbursalDateEnabled, numberOfdays, isSkipRepaymentOnFirstDayofMonth, holidayDetailDTO, isInterestChargedFromDateSameAsDisbursalDateEnabled, numberOfDays, isSkipRepaymentOnFirstDayOfMonth, holidayDetailDTO,
allowCompoundingOnEod, isEqualAmortization); allowCompoundingOnEod, isEqualAmortization);
} }
@@ -437,7 +437,7 @@ public final class LoanApplicationTerms {
final LoanPreClosureInterestCalculationStrategy preClosureInterestCalculationStrategy, final Calendar loanCalendar, final LoanPreClosureInterestCalculationStrategy preClosureInterestCalculationStrategy, final Calendar loanCalendar,
BigDecimal approvedAmount, List<LoanTermVariationsData> loanTermVariations, BigDecimal approvedAmount, List<LoanTermVariationsData> loanTermVariations,
final CalendarHistoryDataWrapper calendarHistoryDataWrapper, Boolean isInterestChargedFromDateSameAsDisbursalDateEnabled, final CalendarHistoryDataWrapper calendarHistoryDataWrapper, Boolean isInterestChargedFromDateSameAsDisbursalDateEnabled,
final Integer numberOfdays, final boolean isSkipRepaymentOnFirstDayofMonth, final HolidayDetailDTO holidayDetailDTO, final Integer numberOfDays, final boolean isSkipRepaymentOnFirstDayOfMonth, final HolidayDetailDTO holidayDetailDTO,
final boolean allowCompoundingOnEod, final boolean isEqualAmortization) { final boolean allowCompoundingOnEod, final boolean isEqualAmortization) {
this.currency = currency; this.currency = currency;
@@ -487,8 +487,8 @@ public final class LoanApplicationTerms {
this.principalThresholdForLastInstalment = principalThresholdForLastInstalment; this.principalThresholdForLastInstalment = principalThresholdForLastInstalment;
this.installmentAmountInMultiplesOf = installmentAmountInMultiplesOf; this.installmentAmountInMultiplesOf = installmentAmountInMultiplesOf;
this.preClosureInterestCalculationStrategy = preClosureInterestCalculationStrategy; this.preClosureInterestCalculationStrategy = preClosureInterestCalculationStrategy;
this.isSkipRepaymentOnFirstDayOfMonth = isSkipRepaymentOnFirstDayofMonth; this.isSkipRepaymentOnFirstDayOfMonth = isSkipRepaymentOnFirstDayOfMonth;
this.numberOfDays = numberOfdays; this.numberOfDays = numberOfDays;
this.loanCalendar = loanCalendar; this.loanCalendar = loanCalendar;
this.approvedPrincipal = Money.of(principal.getCurrency(), approvedAmount); this.approvedPrincipal = Money.of(principal.getCurrency(), approvedAmount);
@@ -229,7 +229,7 @@ public class DepositAccountData {
protected DepositAccountData(final Long id, final String accountNo, final String externalId, final Long groupId, protected DepositAccountData(final Long id, final String accountNo, final String externalId, final Long groupId,
final String groupName, final Long clientId, final String clientName, final Long productId, final String productName, final String groupName, final Long clientId, final String clientName, final Long productId, final String productName,
final Long fieldofficerId, final String fieldofficerName, final SavingsAccountStatusEnumData status, final Long fieldOfficerId, final String fieldOfficerName, final SavingsAccountStatusEnumData status,
final SavingsAccountApplicationTimelineData timeline, final CurrencyData currency, final BigDecimal nominalAnnualInterestRate, final SavingsAccountApplicationTimelineData timeline, final CurrencyData currency, final BigDecimal nominalAnnualInterestRate,
final EnumOptionData interestPeriodType, final EnumOptionData interestPostingPeriodType, final EnumOptionData interestPeriodType, final EnumOptionData interestPostingPeriodType,
final EnumOptionData interestCalculationType, final EnumOptionData interestCalculationDaysInYearType, final EnumOptionData interestCalculationType, final EnumOptionData interestCalculationDaysInYearType,
@@ -255,8 +255,8 @@ public class DepositAccountData {
this.clientName = clientName; this.clientName = clientName;
this.depositProductId = productId; this.depositProductId = productId;
this.depositProductName = productName; this.depositProductName = productName;
this.fieldOfficerId = fieldofficerId; this.fieldOfficerId = fieldOfficerId;
this.fieldOfficerName = fieldofficerName; this.fieldOfficerName = fieldOfficerName;
this.status = status; this.status = status;
this.timeline = timeline; this.timeline = timeline;
this.currency = currency; this.currency = currency;
@@ -644,7 +644,7 @@ public class SavingsAccountData implements Serializable {
private SavingsAccountData(final Long id, final String accountNo, final EnumOptionData depositType, final String externalId, private SavingsAccountData(final Long id, final String accountNo, final EnumOptionData depositType, final String externalId,
final Long groupId, final String groupName, final Long clientId, final String clientName, final Long productId, final Long groupId, final String groupName, final Long clientId, final String clientName, final Long productId,
final String productName, final Long fieldofficerId, final String fieldofficerName, final SavingsAccountStatusEnumData status, final String productName, final Long fieldOfficerId, final String fieldOfficerName, final SavingsAccountStatusEnumData status,
final SavingsAccountSubStatusEnumData subStatus, final SavingsAccountApplicationTimelineData timeline, final CurrencyData currency, final SavingsAccountSubStatusEnumData subStatus, final SavingsAccountApplicationTimelineData timeline, final CurrencyData currency,
final BigDecimal nominalAnnualInterestRate, final EnumOptionData interestPeriodType, final BigDecimal nominalAnnualInterestRate, final EnumOptionData interestPeriodType,
final EnumOptionData interestPostingPeriodType, final EnumOptionData interestCalculationType, final EnumOptionData interestPostingPeriodType, final EnumOptionData interestCalculationType,
@@ -674,8 +674,8 @@ public class SavingsAccountData implements Serializable {
this.clientName = clientName; this.clientName = clientName;
this.savingsProductId = productId; this.savingsProductId = productId;
this.savingsProductName = productName; this.savingsProductName = productName;
this.fieldOfficerId = fieldofficerId; this.fieldOfficerId = fieldOfficerId;
this.fieldOfficerName = fieldofficerName; this.fieldOfficerName = fieldOfficerName;
this.status = status; this.status = status;
this.subStatus = subStatus; this.subStatus = subStatus;
this.timeline = timeline; this.timeline = timeline;
@@ -81,10 +81,10 @@ public class SelfServiceRegistration extends AbstractPersistableCustom {
this.createdDate = new Date(); this.createdDate = new Date();
} }
public static SelfServiceRegistration instance(final Client client, final String accountNumber, final String firstname, public static SelfServiceRegistration instance(final Client client, final String accountNumber, final String firstName,
final String lastName, final String mobileNumber, final String email, final String authenticationToken, final String username, final String lastName, final String mobileNumber, final String email, final String authenticationToken, final String username,
final String password) { final String password) {
return new SelfServiceRegistration(client, accountNumber, firstname, lastName, mobileNumber, email, authenticationToken, username, return new SelfServiceRegistration(client, accountNumber, firstName, lastName, mobileNumber, email, authenticationToken, username,
password); password);
} }
@@ -56,10 +56,10 @@ public class AppUserData {
@SuppressWarnings("unused") @SuppressWarnings("unused")
private Set<ClientData> clients; private Set<ClientData> clients;
public static AppUserData importInstance(Long officeId,Long staffId,String userName, String firstName, String lastName, public static AppUserData importInstance(Long officeId,Long staffId,String username, String firstname, String lastname,
String email,Boolean sendPasswordToEmail,Boolean passwordNeverExpires, List<Long> roleIds, String email,Boolean sendPasswordToEmail,Boolean passwordNeverExpires, List<Long> roleIds,
Integer rowIndex){ Integer rowIndex){
return new AppUserData(officeId,staffId,userName,firstName,lastName,email, return new AppUserData(officeId,staffId,username,firstname,lastname,email,
sendPasswordToEmail,passwordNeverExpires,roleIds,rowIndex); sendPasswordToEmail,passwordNeverExpires,roleIds,rowIndex);
} }
private AppUserData(Long officeId,Long staffId,String username, String firstname, String lastname, private AppUserData(Long officeId,Long staffId,String username, String firstname, String lastname,