From 15f244c09fa02a4c87c1f7470f8c4557ee0c92f8 Mon Sep 17 00:00:00 2001 From: percyashu Date: Wed, 10 Jun 2020 19:56:53 +0100 Subject: [PATCH] FINERACT-822 enable InconsistentCapitalization error --- fineract-provider/build.gradle | 3 +- .../integrationtests/common/CenterDomain.java | 14 +++++----- .../common/savings/SavingsProductHelper.java | 6 ++-- .../glaccount/domain/GLAccount.java | 4 +-- .../LoanProductProvisioningEntryData.java | 4 +-- .../commands/domain/CommandSource.java | 6 ++-- .../service/CommandWrapperBuilder.java | 6 ++-- .../RuntimeDelegatingCacheManager.java | 6 ++-- .../domain/OrganisationCreditBureau.java | 12 ++++---- ...roductMappingWritePlatformServiceImpl.java | 4 +-- .../organisation/staff/data/StaffData.java | 6 ++-- .../account/data/PortfolioAccountData.java | 16 +++++------ ...WritePlatformServiceJpaRepositoryImpl.java | 4 +-- .../portfolio/client/data/ClientData.java | 6 ++-- .../loanaccount/data/LoanAccountData.java | 4 +-- .../loanaccount/data/LoanTransactionData.java | 6 ++-- .../domain/LoanInstallmentCharge.java | 6 ++-- .../domain/LoanOverdueInstallmentCharge.java | 6 ++-- .../domain/LoanTrancheDisbursementCharge.java | 6 ++-- .../guarantor/data/GuarantorData.java | 8 +++--- .../guarantor/data/ObligeeData.java | 10 +++---- .../domain/LoanApplicationTerms.java | 28 +++++++++---------- .../savings/data/DepositAccountData.java | 6 ++-- .../savings/data/SavingsAccountData.java | 6 ++-- .../domain/SelfServiceRegistration.java | 4 +-- .../useradministration/data/AppUserData.java | 4 +-- 26 files changed, 95 insertions(+), 96 deletions(-) diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle index 43644c0e1..c75599d42 100644 --- a/fineract-provider/build.gradle +++ b/fineract-provider/build.gradle @@ -312,7 +312,6 @@ tasks.withType(JavaCompile) { //Todo Remove necessary checks from this list disable( "UnusedVariable", - "InconsistentCapitalization", "ClassCanBeStatic", "MixedMutabilityReturnType", "SameNameButDifferent", @@ -374,6 +373,7 @@ tasks.withType(JavaCompile) { "EqualsGetClass", "JdkObsolete", "DoubleBraceInitialization", + "InconsistentCapitalization", // "ReturnMissingNullable", // "InconsistentOverloads", // "MethodCanBeStatic", @@ -384,7 +384,6 @@ tasks.withType(JavaCompile) { // "InjectOnConstructorOfAbstractClass", // "StringSplitter", // "UnnecessaryDefaultInEnumSwitch", -// "InconsistentCapitalization", // "FieldCanBeFinal" ) } diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterDomain.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterDomain.java index b4f991b77..46c00d04c 100644 --- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterDomain.java +++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterDomain.java @@ -42,7 +42,7 @@ public class CenterDomain implements Comparable { private final ArrayList groupMembers; 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 groupMembers) { this.id = id; this.accountNo = null; @@ -54,7 +54,7 @@ public class CenterDomain implements Comparable { this.name = name; this.externalId = externalId; this.staffId = staffId; - this.officeId = officeID; + this.officeId = officeId; this.officeName = officeName; this.hierarchy = hierarchy; this.groupMembers = groupMembers; @@ -85,7 +85,7 @@ public class CenterDomain implements Comparable { } 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 groupMembers) { this.id = id; this.accountNo = accountNo; @@ -97,7 +97,7 @@ public class CenterDomain implements Comparable { this.name = name; this.externalId = externalId; this.staffId = staffId; - this.officeId = officeID; + this.officeId = officeId; this.officeName = officeName; this.hierarchy = hierarchy; this.groupMembers = groupMembers; @@ -112,15 +112,15 @@ public class CenterDomain implements Comparable { } 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 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); } @SuppressWarnings({ "rawtypes", "unchecked" }) 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 ids = String.valueOf(id); final HashMap map = new HashMap<>(); diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsProductHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsProductHelper.java index c424135ed..223f4fd33 100644 --- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsProductHelper.java +++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsProductHelper.java @@ -222,9 +222,9 @@ public class SavingsProductHelper { return this; } - public SavingsProductHelper withOverDraft(final String overDraftLimit) { + public SavingsProductHelper withOverDraft(final String overdraftLimit) { this.allowOverdraft = "true"; - this.overdraftLimit = overDraftLimit; + this.overdraftLimit = overdraftLimit; return this; } @@ -304,4 +304,4 @@ public class SavingsProductHelper { return this; } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/GLAccount.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/GLAccount.java index bf82b1dad..c5b7d67ad 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/GLAccount.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/GLAccount.java @@ -237,8 +237,8 @@ public class GLAccount extends AbstractPersistableCustom { return GLAccountUsage.DETAIL.getValue().equals(this.usage); } - public void updateTagId(final CodeValue tagID) { - this.tagId = tagID; + public void updateTagId(final CodeValue tagId) { + this.tagId = tagId; } public void updateParentAccount(final GLAccount parentAccount) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/data/LoanProductProvisioningEntryData.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/data/LoanProductProvisioningEntryData.java index da8d6ee33..8eee0c300 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/data/LoanProductProvisioningEntryData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/data/LoanProductProvisioningEntryData.java @@ -85,7 +85,7 @@ public class LoanProductProvisioningEntryData { } 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) { this.historyId = historyId; this.officeId = officeId; @@ -100,7 +100,7 @@ public class LoanProductProvisioningEntryData { this.expenseAccount = expenseAccount; this.officeName = officeName ; this.productName = productName ; - this.amountreserved = amountReserved ; + this.amountreserved = amountreserved ; this.liabilityAccountCode = liabilityAccountglCode ; this.liabilityAccountName = liabilityAccountName ; this.expenseAccountCode = expenseAccountglCode ; diff --git a/fineract-provider/src/main/java/org/apache/fineract/commands/domain/CommandSource.java b/fineract-provider/src/main/java/org/apache/fineract/commands/domain/CommandSource.java index 08b0a26d7..561300a36 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/commands/domain/CommandSource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/commands/domain/CommandSource.java @@ -135,8 +135,8 @@ public class CommandSource extends AbstractPersistableCustom { } - public void setOrganisationCreditBureauId(Long OrganisationCreditBureauId) { - this.organisationCreditBureauId = OrganisationCreditBureauId; + public void setOrganisationCreditBureauId(Long organisationCreditBureauId) { + this.organisationCreditBureauId = organisationCreditBureauId; } public void markAsChecked(final AppUser checker, final DateTime checkedOnDate) { @@ -274,4 +274,4 @@ public class CommandSource extends AbstractPersistableCustom { this.transactionId = transactionId; } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/commands/service/CommandWrapperBuilder.java b/fineract-provider/src/main/java/org/apache/fineract/commands/service/CommandWrapperBuilder.java index 852601fd1..60fa5f65e 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/commands/service/CommandWrapperBuilder.java +++ b/fineract-provider/src/main/java/org/apache/fineract/commands/service/CommandWrapperBuilder.java @@ -77,12 +77,12 @@ public class CommandWrapperBuilder { return this; } - public CommandWrapperBuilder createCreditBureauLoanProductMapping(final long CreditBureauId) { + public CommandWrapperBuilder createCreditBureauLoanProductMapping(final long creditBureauId) { this.actionName = "CREATE"; this.entityName = "CREDITBUREAU_LOANPRODUCT_MAPPING"; - this.entityId = CreditBureauId; + this.entityId = creditBureauId; this.href = "/creditBureauConfiguration/template"; - this.creditBureauId=CreditBureauId; + this.creditBureauId=creditBureauId; return this; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/service/RuntimeDelegatingCacheManager.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/service/RuntimeDelegatingCacheManager.java index 315ccdf45..424680749 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/service/RuntimeDelegatingCacheManager.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/service/RuntimeDelegatingCacheManager.java @@ -50,8 +50,8 @@ public class RuntimeDelegatingCacheManager implements CacheManager { private CacheManager currentCacheManager; @Autowired - public RuntimeDelegatingCacheManager(final EhCacheCacheManager ehCacheCacheManager) { - this.ehcacheCacheManager = ehCacheCacheManager; + public RuntimeDelegatingCacheManager(final EhCacheCacheManager ehcacheCacheManager) { + this.ehcacheCacheManager = ehcacheCacheManager; this.currentCacheManager = this.noOpCacheManager; } @@ -122,4 +122,4 @@ public class RuntimeDelegatingCacheManager implements CacheManager { private void clearEhCache() { this.ehcacheCacheManager.getCacheManager().clearAll(); } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/domain/OrganisationCreditBureau.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/domain/OrganisationCreditBureau.java index b60fc247d..25a08b35d 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/domain/OrganisationCreditBureau.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/domain/OrganisationCreditBureau.java @@ -42,10 +42,10 @@ public class OrganisationCreditBureau extends AbstractPersistableCustom { @OneToMany(mappedBy = "organisation_creditbureau", cascade = CascadeType.ALL) private List creditBureauLoanProductMapping = new ArrayList<>(); - public OrganisationCreditBureau(String alias, CreditBureau creditBureau, boolean is_active, + public OrganisationCreditBureau(String alias, CreditBureau creditbureau, boolean is_active, List creditBureauLoanProductMapping) { this.alias = alias; - this.creditbureau = creditBureau; + this.creditbureau = creditbureau; this.is_active = is_active; 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 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() { @@ -73,8 +73,8 @@ public class OrganisationCreditBureau extends AbstractPersistableCustom { return this.creditbureau; } - public void setCreditBureau(CreditBureau creditBureau) { - this.creditbureau = creditBureau; + public void setCreditBureau(CreditBureau creditbureau) { + this.creditbureau = creditbureau; } public boolean isActive() { diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/CreditBureauLoanProductMappingWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/CreditBureauLoanProductMappingWritePlatformServiceImpl.java index 6415f00ec..c8d5b8fbe 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/CreditBureauLoanProductMappingWritePlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/CreditBureauLoanProductMappingWritePlatformServiceImpl.java @@ -48,11 +48,11 @@ public class CreditBureauLoanProductMappingWritePlatformServiceImpl implements C @Autowired public CreditBureauLoanProductMappingWritePlatformServiceImpl(final PlatformSecurityContext context, - final CreditBureauLoanProductMappingRepository creditbureauLoanProductMappingRepository, + final CreditBureauLoanProductMappingRepository creditBureauLoanProductMappingRepository, final OrganisationCreditBureauRepository organisationCreditBureauRepository, LoanProductRepository loanProductRepository, final CreditBureauLoanProductCommandFromApiJsonDeserializer fromApiJsonDeserializer) { this.context = context; - this.creditBureauLoanProductMappingRepository = creditbureauLoanProductMappingRepository; + this.creditBureauLoanProductMappingRepository = creditBureauLoanProductMappingRepository; this.organisationCreditBureauRepository = organisationCreditBureauRepository; this.loanProductRepository = loanProductRepository; this.fromApiJsonDeserializer = fromApiJsonDeserializer; diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/data/StaffData.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/data/StaffData.java index eaf4e14d8..43d74dd89 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/data/StaffData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/data/StaffData.java @@ -45,9 +45,9 @@ public class StaffData implements Serializable { private String dateFormat; 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){ - return new StaffData(externalId,firstName,lastName,mobileNo,officeId,isLoanOfficer,isActive, + return new StaffData(externalId,firstname,lastname,mobileNo,officeId,isLoanOfficer,isActive, joinedOnDate,rowIndex,locale,dateFormat); } @@ -138,4 +138,4 @@ public class StaffData implements Serializable { public Long getOfficeId() { return this.officeId; } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/data/PortfolioAccountData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/data/PortfolioAccountData.java index afd59778c..0746f46fc 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/data/PortfolioAccountData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/data/PortfolioAccountData.java @@ -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, - final Long clientId, final String clientName, final Long productId, final String productName, final Long fieldofficerId, - final String fieldofficerName, final CurrencyData currency) { + final Long clientId, final String clientName, final Long productId, final String productName, final Long fieldOfficerId, + final String fieldOfficerName, final CurrencyData currency) { this.id = id; this.accountNo = accountNo; this.externalId = externalId; @@ -60,15 +60,15 @@ public class PortfolioAccountData implements Serializable { this.clientName = clientName; this.productId = productId; this.productName = productName; - this.fieldOfficerId = fieldofficerId; - this.fieldOfficerName = fieldofficerName; + this.fieldOfficerId = fieldOfficerId; + this.fieldOfficerName = fieldOfficerName; this.currency = currency; this.amtForTransfer = null; } 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 String fieldofficerName, final CurrencyData currency, final BigDecimal amtForTransfer) { + final Long clientId, final String clientName, final Long productId, final String productName, final Long fieldOfficerId, + final String fieldOfficerName, final CurrencyData currency, final BigDecimal amtForTransfer) { this.id = id; this.accountNo = accountNo; this.externalId = externalId; @@ -78,8 +78,8 @@ public class PortfolioAccountData implements Serializable { this.clientName = clientName; this.productId = productId; this.productName = productName; - this.fieldOfficerId = fieldofficerId; - this.fieldOfficerName = fieldofficerName; + this.fieldOfficerId = fieldOfficerId; + this.fieldOfficerName = fieldOfficerName; this.currency = currency; this.amtForTransfer = amtForTransfer; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/service/ChargeWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/service/ChargeWritePlatformServiceJpaRepositoryImpl.java index f5c08a6c4..c17e5d5c5 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/service/ChargeWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/service/ChargeWritePlatformServiceJpaRepositoryImpl.java @@ -71,7 +71,7 @@ public class ChargeWritePlatformServiceJpaRepositoryImpl implements ChargeWriteP public ChargeWritePlatformServiceJpaRepositoryImpl(final PlatformSecurityContext context, final ChargeDefinitionCommandFromApiJsonDeserializer fromApiJsonDeserializer, final ChargeRepository chargeRepository, final LoanProductRepository loanProductRepository, final RoutingDataSource dataSource, - final FineractEntityAccessUtil fineractEntityAccessUtil, final GLAccountRepositoryWrapper glAccountRepository, + final FineractEntityAccessUtil fineractEntityAccessUtil, final GLAccountRepositoryWrapper gLAccountRepository, final TaxGroupRepositoryWrapper taxGroupRepository) { this.context = context; this.fromApiJsonDeserializer = fromApiJsonDeserializer; @@ -80,7 +80,7 @@ public class ChargeWritePlatformServiceJpaRepositoryImpl implements ChargeWriteP this.chargeRepository = chargeRepository; this.loanProductRepository = loanProductRepository; this.fineractEntityAccessUtil = fineractEntityAccessUtil; - this.gLAccountRepository = glAccountRepository; + this.gLAccountRepository = gLAccountRepository; this.taxGroupRepository = taxGroupRepository; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/data/ClientData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/data/ClientData.java index 1f1d0fc93..fce056fde 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/data/ClientData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/data/ClientData.java @@ -127,12 +127,12 @@ final public class ClientData implements Comparable, Serializable { 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, Long staffId,String mobileNo, LocalDate dob,Long clientTypeId,Long genderId, Long clientClassificationId, Boolean isStaff, Collection 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); } @@ -609,4 +609,4 @@ final public class ClientData implements Comparable, Serializable { public Boolean getIsAddressEnabled() { return this.isAddressEnabled; } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanAccountData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanAccountData.java index 744293aa9..a402e4d50 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanAccountData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanAccountData.java @@ -1201,7 +1201,7 @@ public class LoanAccountData { Boolean allowPartialPeriodInterestCalcualtion, final LocalDate expectedFirstRepaymentOnDate, final Integer graceOnPrincipalPayment, final Integer recurringMoratoriumOnPrincipalPeriods, final Integer graceOnInterestPayment, final Integer graceOnInterestCharged, 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 BigDecimal fixedEmiAmont, final BigDecimal outstandingLoanBalance, final Boolean inArrears, final Integer graceOnArrearsAgeing, final Boolean isNPA, final EnumOptionData daysInMonthType, @@ -1262,7 +1262,7 @@ public class LoanAccountData { repaymentFrequencyTypeOptions, repaymentFrequencyNthDayTypeOptions, repaymentFrequencyDayOfWeekTypeOptions, repaymentStrategyOptions, interestRateFrequencyTypeOptions, amortizationTypeOptions, interestTypeOptions, interestCalculationPeriodTypeOptions, fundOptions, chargeOptions, chargeTemplate, loanOfficerOptions, loanPurposeOptions, - loanCollateralOptions, calendarOptions, syncDisbursementWithMeeting, loancounter, loanProductCounter, notes, + loanCollateralOptions, calendarOptions, syncDisbursementWithMeeting, loanCounter, loanProductCounter, notes, accountLinkingOptions, linkedAccount, disbursementData, multiDisburseLoan, canDefineInstallmentAmount, fixedEmiAmont, outstandingLoanBalance, emiAmountVariations, memberVariations, product, inArrears, graceOnArrearsAgeing, overdueCharges, isNPA, daysInMonthType, daysInYearType, isInterestRecalculationEnabled, interestRecalculationData, originalSchedule, diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanTransactionData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanTransactionData.java index 9d2446edb..f9759a0f1 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanTransactionData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/data/LoanTransactionData.java @@ -253,9 +253,9 @@ public class LoanTransactionData { public LoanTransactionData(Long id, LoanTransactionEnumData transactionType, LocalDate date, BigDecimal totalAmount, 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, - penaltyChargesPortion, overPaymentPortion, unrecognizedIncomePortion, null, null, null, null, outstandingLoanBalance, null, + penaltyChargesPortion, overpaymentPortion, unrecognizedIncomePortion, null, null, null, null, outstandingLoanBalance, null, manuallyReversed); } @@ -349,4 +349,4 @@ public class LoanTransactionData { public void setLoanChargePaidByList(Collection loanChargePaidByList) { this.loanChargePaidByList = loanChargePaidByList; } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanInstallmentCharge.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanInstallmentCharge.java index 696423d00..f3cfb4fda 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanInstallmentCharge.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanInstallmentCharge.java @@ -73,8 +73,8 @@ public class LoanInstallmentCharge extends AbstractPersistableCustom implements return this.installment.getInstallmentNumber().compareTo(o.installment.getInstallmentNumber()); } - public LoanInstallmentCharge(final BigDecimal amount, final LoanCharge loanCharge, final LoanRepaymentScheduleInstallment installment) { - this.loancharge = loanCharge; + public LoanInstallmentCharge(final BigDecimal amount, final LoanCharge loancharge, final LoanRepaymentScheduleInstallment installment) { + this.loancharge = loancharge; this.installment = installment; this.amount = amount; this.amountOutstanding = amount; @@ -299,4 +299,4 @@ public class LoanInstallmentCharge extends AbstractPersistableCustom implements } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanOverdueInstallmentCharge.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanOverdueInstallmentCharge.java index cb3d2446c..bbfe1f231 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanOverdueInstallmentCharge.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanOverdueInstallmentCharge.java @@ -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) { - this.loancharge = loanCharge; + this.loancharge = loancharge; this.installment = installment; this.frequencyNumber = frequencyNumber; } @@ -59,4 +59,4 @@ public class LoanOverdueInstallmentCharge extends AbstractPersistableCustom { return this.installment; } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTrancheDisbursementCharge.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTrancheDisbursementCharge.java index 9a309ba2b..b1d861863 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTrancheDisbursementCharge.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTrancheDisbursementCharge.java @@ -41,8 +41,8 @@ public class LoanTrancheDisbursementCharge extends AbstractPersistableCustom { } - public LoanTrancheDisbursementCharge(final LoanCharge loanCharge, final LoanDisbursementDetails loanDisbursementDetails){ - this.loancharge = loanCharge; + public LoanTrancheDisbursementCharge(final LoanCharge loancharge, final LoanDisbursementDetails loanDisbursementDetails){ + this.loancharge = loancharge; this.loanDisbursementDetails = loanDisbursementDetails; } @@ -50,4 +50,4 @@ public class LoanTrancheDisbursementCharge extends AbstractPersistableCustom { return this.loanDisbursementDetails; } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/data/GuarantorData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/data/GuarantorData.java index 64b24ebe1..11fdeac5f 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/data/GuarantorData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/data/GuarantorData.java @@ -77,10 +77,10 @@ public class GuarantorData { private String dateFormat; private String locale; - public static GuarantorData importInstance(Integer guarantorTypeId,Integer clientRelationshipTypeId,Long entityId,String firstName, - String lastName,String addressLine1,String addressLine2,String city,LocalDate dob, String zip, + public static GuarantorData importInstance(Integer guarantorTypeId,Integer clientRelationshipTypeId,Long entityId,String firstname, + String lastname,String addressLine1,String addressLine2,String city,LocalDate dob, String zip, 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); } private GuarantorData(Integer guarantorTypeId,Integer clientRelationshipTypeId,Long entityId,String firstname, @@ -213,4 +213,4 @@ public class GuarantorData { return this.entityId; } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/data/ObligeeData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/data/ObligeeData.java index 79f5560b1..227b09eab 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/data/ObligeeData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/data/ObligeeData.java @@ -33,11 +33,11 @@ public class ObligeeData { private final BigDecimal amountReleased; 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 amountTransferred) { - this.firstName = firstname; - this.lastName = lastname; + this.firstName = firstName; + this.lastName = lastName; this.displayName = displayName; this.accountNumber = accountNumber; this.loanAmount = loanAmount; @@ -46,10 +46,10 @@ public class ObligeeData { 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 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); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/LoanApplicationTerms.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/LoanApplicationTerms.java index 94236301f..1b2db18e2 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/LoanApplicationTerms.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/LoanApplicationTerms.java @@ -232,8 +232,8 @@ public final class LoanApplicationTerms { final BigDecimal principalThresholdForLastInstalment, final Integer installmentAmountInMultiplesOf, final LoanPreClosureInterestCalculationStrategy preClosureInterestCalculationStrategy, final Calendar loanCalendar, BigDecimal approvedAmount, List loanTermVariations, - Boolean isInterestChargedFromDateSameAsDisbursalDateEnabled, final Integer numberOfdays, - boolean isSkipRepaymentOnFirstDayofMonth, final HolidayDetailDTO holidayDetailDTO, final boolean allowCompoundingOnEod, + Boolean isInterestChargedFromDateSameAsDisbursalDateEnabled, final Integer numberOfDays, + boolean isSkipRepaymentOnFirstDayOfMonth, final HolidayDetailDTO holidayDetailDTO, final boolean allowCompoundingOnEod, final boolean isEqualAmortization) { final LoanRescheduleStrategyMethod rescheduleStrategyMethod = null; @@ -248,7 +248,7 @@ public final class LoanApplicationTerms { interestRecalculationCompoundingMethod, restCalendarInstance, recalculationFrequencyType, compoundingCalendarInstance, compoundingFrequencyType, principalThresholdForLastInstalment, installmentAmountInMultiplesOf, preClosureInterestCalculationStrategy, loanCalendar, approvedAmount, loanTermVariations, calendarHistoryDataWrapper, - isInterestChargedFromDateSameAsDisbursalDateEnabled, numberOfdays, isSkipRepaymentOnFirstDayofMonth, holidayDetailDTO, + isInterestChargedFromDateSameAsDisbursalDateEnabled, numberOfDays, isSkipRepaymentOnFirstDayOfMonth, holidayDetailDTO, allowCompoundingOnEod, isEqualAmortization); } @@ -265,7 +265,7 @@ public final class LoanApplicationTerms { final CalendarInstance compoundingCalendarInstance, final RecalculationFrequencyType compoundingFrequencyType, final LoanPreClosureInterestCalculationStrategy loanPreClosureInterestCalculationStrategy, final LoanRescheduleStrategyMethod rescheduleStrategyMethod, BigDecimal approvedAmount, BigDecimal annualNominalInterestRate, - List loanTermVariations, final Integer numberOfdays, final boolean isSkipRepaymentOnFirstDayofMonth, + List loanTermVariations, final Integer numberOfDays, final boolean isSkipRepaymentOnFirstDayOfMonth, final Calendar loanCalendar, final HolidayDetailDTO holidayDetailDTO, final boolean allowCompoundingOnEod) { final CalendarHistoryDataWrapper calendarHistoryDataWrapper = null; @@ -275,7 +275,7 @@ public final class LoanApplicationTerms { principalThresholdForLastInstalment, installmentAmountInMultiplesOf, recalculationFrequencyType, restCalendarInstance, compoundingMethod, compoundingCalendarInstance, compoundingFrequencyType, loanPreClosureInterestCalculationStrategy, 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, @@ -291,8 +291,8 @@ public final class LoanApplicationTerms { final LoanPreClosureInterestCalculationStrategy loanPreClosureInterestCalculationStrategy, final LoanRescheduleStrategyMethod rescheduleStrategyMethod, final Calendar loanCalendar, BigDecimal approvedAmount, BigDecimal annualNominalInterestRate, final List loanTermVariations, - final CalendarHistoryDataWrapper calendarHistoryDataWrapper, final Integer numberOfdays, - final boolean isSkipRepaymentOnFirstDayofMonth, final HolidayDetailDTO holidayDetailDTO, final boolean allowCompoundingOnEod) { + final CalendarHistoryDataWrapper calendarHistoryDataWrapper, final Integer numberOfDays, + final boolean isSkipRepaymentOnFirstDayOfMonth, final HolidayDetailDTO holidayDetailDTO, final boolean allowCompoundingOnEod) { final Integer numberOfRepayments = loanProductRelatedDetail.getNumberOfRepayments(); final Integer repaymentEvery = loanProductRelatedDetail.getRepayEvery(); @@ -328,8 +328,8 @@ public final class LoanApplicationTerms { isInterestRecalculationEnabled, rescheduleStrategyMethod, compoundingMethod, restCalendarInstance, recalculationFrequencyType, compoundingCalendarInstance, compoundingFrequencyType, principalThresholdForLastInstalment, installmentAmountInMultiplesOf, loanPreClosureInterestCalculationStrategy, loanCalendar, approvedAmount, - loanTermVariations, calendarHistoryDataWrapper, isInterestChargedFromDateSameAsDisbursalDateEnabled, numberOfdays, - isSkipRepaymentOnFirstDayofMonth, holidayDetailDTO, allowCompoundingOnEod, isEqualAmortization); + loanTermVariations, calendarHistoryDataWrapper, isInterestChargedFromDateSameAsDisbursalDateEnabled, numberOfDays, + isSkipRepaymentOnFirstDayOfMonth, holidayDetailDTO, allowCompoundingOnEod, isEqualAmortization); } 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 LoanPreClosureInterestCalculationStrategy loanPreClosureInterestCalculationStrategy, final Calendar loanCalendar, BigDecimal approvedAmount, final BigDecimal annualNominalInterestRate, final List loanTermVariations, - Integer numberOfdays, boolean isSkipRepaymentOnFirstDayofMonth, final HolidayDetailDTO holidayDetailDTO, + Integer numberOfDays, boolean isSkipRepaymentOnFirstDayOfMonth, final HolidayDetailDTO holidayDetailDTO, final boolean allowCompoundingOnEod) { final Integer numberOfRepayments = loanProductRelatedDetail.getNumberOfRepayments(); @@ -387,7 +387,7 @@ public final class LoanApplicationTerms { rescheduleStrategyMethod, interestRecalculationCompoundingMethod, restCalendarInstance, recalculationFrequencyType, compoundingCalendarInstance, compoundingFrequencyType, principalThresholdForLastInstalment, installmentAmountInMultiplesOf, loanPreClosureInterestCalculationStrategy, loanCalendar, approvedAmount, loanTermVariations, calendarHistoryDataWrapper, - isInterestChargedFromDateSameAsDisbursalDateEnabled, numberOfdays, isSkipRepaymentOnFirstDayofMonth, holidayDetailDTO, + isInterestChargedFromDateSameAsDisbursalDateEnabled, numberOfDays, isSkipRepaymentOnFirstDayOfMonth, holidayDetailDTO, allowCompoundingOnEod, isEqualAmortization); } @@ -437,7 +437,7 @@ public final class LoanApplicationTerms { final LoanPreClosureInterestCalculationStrategy preClosureInterestCalculationStrategy, final Calendar loanCalendar, BigDecimal approvedAmount, List loanTermVariations, 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) { this.currency = currency; @@ -487,8 +487,8 @@ public final class LoanApplicationTerms { this.principalThresholdForLastInstalment = principalThresholdForLastInstalment; this.installmentAmountInMultiplesOf = installmentAmountInMultiplesOf; this.preClosureInterestCalculationStrategy = preClosureInterestCalculationStrategy; - this.isSkipRepaymentOnFirstDayOfMonth = isSkipRepaymentOnFirstDayofMonth; - this.numberOfDays = numberOfdays; + this.isSkipRepaymentOnFirstDayOfMonth = isSkipRepaymentOnFirstDayOfMonth; + this.numberOfDays = numberOfDays; this.loanCalendar = loanCalendar; this.approvedPrincipal = Money.of(principal.getCurrency(), approvedAmount); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/DepositAccountData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/DepositAccountData.java index 371e34da7..30b82be19 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/DepositAccountData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/DepositAccountData.java @@ -229,7 +229,7 @@ public class DepositAccountData { 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 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 EnumOptionData interestPeriodType, final EnumOptionData interestPostingPeriodType, final EnumOptionData interestCalculationType, final EnumOptionData interestCalculationDaysInYearType, @@ -255,8 +255,8 @@ public class DepositAccountData { this.clientName = clientName; this.depositProductId = productId; this.depositProductName = productName; - this.fieldOfficerId = fieldofficerId; - this.fieldOfficerName = fieldofficerName; + this.fieldOfficerId = fieldOfficerId; + this.fieldOfficerName = fieldOfficerName; this.status = status; this.timeline = timeline; this.currency = currency; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/SavingsAccountData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/SavingsAccountData.java index 9ec2169c0..31e034093 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/SavingsAccountData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/data/SavingsAccountData.java @@ -644,7 +644,7 @@ public class SavingsAccountData implements Serializable { 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 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 BigDecimal nominalAnnualInterestRate, final EnumOptionData interestPeriodType, final EnumOptionData interestPostingPeriodType, final EnumOptionData interestCalculationType, @@ -674,8 +674,8 @@ public class SavingsAccountData implements Serializable { this.clientName = clientName; this.savingsProductId = productId; this.savingsProductName = productName; - this.fieldOfficerId = fieldofficerId; - this.fieldOfficerName = fieldofficerName; + this.fieldOfficerId = fieldOfficerId; + this.fieldOfficerName = fieldOfficerName; this.status = status; this.subStatus = subStatus; this.timeline = timeline; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/registration/domain/SelfServiceRegistration.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/registration/domain/SelfServiceRegistration.java index c20b5d5cc..5be0538a8 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/registration/domain/SelfServiceRegistration.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/registration/domain/SelfServiceRegistration.java @@ -81,10 +81,10 @@ public class SelfServiceRegistration extends AbstractPersistableCustom { 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 password) { - return new SelfServiceRegistration(client, accountNumber, firstname, lastName, mobileNumber, email, authenticationToken, username, + return new SelfServiceRegistration(client, accountNumber, firstName, lastName, mobileNumber, email, authenticationToken, username, password); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/data/AppUserData.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/data/AppUserData.java index fe32dd32e..0d432843e 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/data/AppUserData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/data/AppUserData.java @@ -56,10 +56,10 @@ public class AppUserData { @SuppressWarnings("unused") private Set 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 roleIds, Integer rowIndex){ - return new AppUserData(officeId,staffId,userName,firstName,lastName,email, + return new AppUserData(officeId,staffId,username,firstname,lastname,email, sendPasswordToEmail,passwordNeverExpires,roleIds,rowIndex); } private AppUserData(Long officeId,Long staffId,String username, String firstname, String lastname,