fineract-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From awa...@apache.org
Subject [fineract] branch develop updated: Activate and Enforce new Checkstyle check related to import statement order (FINERACT-821) (#704)
Date Mon, 27 Jan 2020 23:28:19 GMT
This is an automated email from the ASF dual-hosted git repository.

awasum pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git


The following commit(s) were added to refs/heads/develop by this push:
     new 28db242  Activate and Enforce new Checkstyle check related to import statement order (FINERACT-821) (#704)
28db242 is described below

commit 28db242884ad53ec4363b9986b0ac89b15409756
Author: Michael Vorburger ⛑️ <vorburger@apache.org>
AuthorDate: Tue Jan 28 00:28:11 2020 +0100

    Activate and Enforce new Checkstyle check related to import statement order (FINERACT-821) (#704)
    
    * Minor manually done fix up of fineractdev-eclipse-preferences.epf file
    
    This in theory should not change anything about the conventions,
    it's just a first manual clean up of this very old file here.
    
    The few extra new lines are what I found when exporting Preferences.
    
    Related to https://issues.apache.org/jira/browse/FINERACT-821
    
    * fineractdev-eclipse-preferences.epf imported and re-exported in Eclipse.
    
    This in theory should not change anything about the conventions, as
    presumably Eclipse during an Import and re-Export of an EPF just adds
    new settings, and perhaps removes old settings.  I've not actually made
    any manual changes in Preferences in this step.
    
    Related to https://issues.apache.org/jira/browse/FINERACT-821
    
    * fineractdev-eclipse-preferences.epf "import" in line with Checkstyle
    
    The non-import related Code Formatter settings may need further tuning;
    this will be done in future changes; the focus in this round is on
    import.
    
    Related to https://issues.apache.org/jira/browse/FINERACT-821
    
    * Use Eclipse's Source > Organize Import to re-order all import statements
    
    This uses the fineractdev-eclipse-preferences.epf from the previous
    commit, which just so happens ;) to exactly match the expected import
    rules which the next commit is going to enforce using Checkstyle.
    
    This is of course not specific to only Eclipse per se; other IDEs can
    be similarly configured to match these coding conventions; I just happen
    to have used Eclipse.
    
    Related to https://issues.apache.org/jira/browse/FINERACT-821
    
    * Activate and Enforce all Checkstyle import related new checks
    
    and update the README to explain Checkstyle, and the availability of the
    Eclipse Preferences configuration file which matches the import
    code format conventions which are now enforced.
    
    Contributions for a similar preferences file for other IDEs welcome! ;)
    
    Related to https://issues.apache.org/jira/browse/FINERACT-821
---
 README.md                                          |   8 +
 config/fineractdev-eclipse-preferences.epf         | 552 +++++++++++++++++----
 fineract-provider/config/checkstyle/checkstyle.xml |   3 +-
 .../AccountNumberPreferencesTest.java              |  26 +-
 .../integrationtests/AccountTransferTest.java      |  14 +-
 .../AccountingScenarioIntegrationTest.java         |  12 +-
 .../fineract/integrationtests/BatchApiTest.java    |  18 +-
 .../BatchRequestsIntegrationTest.java              |  12 +-
 .../integrationtests/CenterIntegrationTest.java    |  13 +-
 .../fineract/integrationtests/ChargesTest.java     |  12 +-
 .../ClientLoanIntegrationTest.java                 |  26 +-
 .../ClientSavingsIntegrationTest.java              |  30 +-
 .../fineract/integrationtests/ClientTest.java      |  12 +-
 ...ientUndoRejectAndWithdrawalIntegrationTest.java |  17 +-
 .../ConcurrencyIntegrationTest.java                |  12 +-
 .../fineract/integrationtests/CurrenciesTest.java  |   5 +-
 .../integrationtests/CurrencyIntegrationTest.java  |   7 +-
 .../DisbursalAndRepaymentScheduleTest.java         |  25 +-
 .../ExternalServicesConfigurationTest.java         |  12 +-
 .../FinancialActivityAccountsTest.java             |  15 +-
 .../integrationtests/FixedDepositTest.java         |  18 +-
 ...xibleSavingsInterestPostingIntegrationTest.java |  12 +-
 .../integrationtests/FundsIntegrationTest.java     |  19 +-
 ...restChargedFromDateSameAsDisbursalDateTest.java |  12 +-
 .../integrationtests/GlobalConfigurationTest.java  |  12 +-
 .../integrationtests/GroupLoanIntegrationTest.java |  12 +-
 .../GroupSavingsIntegrationTest.java               |  12 +-
 .../fineract/integrationtests/GroupTest.java       |  12 +-
 .../integrationtests/HookIntegrationTest.java      |  19 +-
 .../LoanApplicationApprovalTest.java               |  12 +-
 .../LoanApplicationUndoLastTrancheTest.java        |  15 +-
 .../LoanDisbursalDateValidationTest.java           |  12 +-
 .../LoanDisbursementDetailsIntegrationTest.java    |  14 +-
 .../LoanRepaymentRescheduleAtDisbursementTest.java |  12 +-
 .../LoanRescheduleRequestTest.java                 |  12 +-
 .../LoanReschedulingWithinCenterTest.java          |  24 +-
 ...ithWaiveInterestAndWriteOffIntegrationTest.java |  12 +-
 .../LoanWithdrawnByApplicantIntegrationTest.java   |  12 +-
 ...mDaysBetweenDisbursalAndFirstRepaymentTest.java |  12 +-
 .../integrationtests/NotificationApiTest.java      |   3 +-
 .../integrationtests/OfficeIntegrationTest.java    |  11 +-
 .../PasswordPreferencesIntegrationTest.java        |  12 +-
 .../PaymentTypeIntegrationTest.java                |  12 +-
 .../integrationtests/RecurringDepositTest.java     |  14 +-
 .../fineract/integrationtests/RolesTest.java       |  12 +-
 .../integrationtests/SchedulerJobsTest.java        |  12 +-
 .../integrationtests/SchedulerJobsTestResults.java |  30 +-
 .../SkipRepaymentOnMonthFirstTest.java             |  15 +-
 .../integrationtests/StaffImageApiTest.java        |  11 +-
 .../fineract/integrationtests/StaffTest.java       |  14 +-
 .../integrationtests/SurveyIntegrationTest.java    |   7 +-
 .../fineract/integrationtests/SystemCodeTest.java  |  12 +-
 .../integrationtests/TemplateIntegrationTest.java  |  14 +-
 .../fineract/integrationtests/WorkingDaysTest.java |  12 +-
 .../integrationtests/XBRLIntegrationTest.java      |  12 +-
 .../client/ClientEntityImportHandlerTest.java      |  17 +-
 .../importhandler/loan/LoanImportHandlerTest.java  |  24 +-
 .../office/OfficeImportHandlerTest.java            |  16 +-
 .../savings/SavingsImportHandlerTest.java          |  20 +-
 .../client/ClientEntityWorkbookPopulatorTest.java  |   7 +-
 .../populator/loan/LoanWorkbookPopulatorTest.java  |  14 +-
 .../office/OfficeWorkBookPopulatorTest.java        |   3 +-
 .../savings/SavingsWorkbookPopulateTest.java       |   7 +-
 .../integrationtests/common/BatchHelper.java       |  10 +-
 .../integrationtests/common/CalendarHelper.java    |   3 +-
 .../integrationtests/common/CenterDomain.java      |   3 +-
 .../integrationtests/common/CenterHelper.java      |   9 +-
 .../integrationtests/common/ClientChargesTest.java |  12 +-
 .../integrationtests/common/ClientHelper.java      |  13 +-
 .../integrationtests/common/CurrenciesHelper.java  |   1 -
 .../ExternalServicesConfigurationHelper.java       |   5 +-
 .../common/GlobalConfigurationHelper.java          |   7 +-
 .../integrationtests/common/GroupHelper.java       |   8 +-
 .../integrationtests/common/HolidayHelper.java     |  10 +-
 .../integrationtests/common/HookHelper.java        |   5 +-
 .../integrationtests/common/ImageHelper.java       |   3 +-
 .../integrationtests/common/OfficeHelper.java      |  15 +-
 .../common/PasswordPreferencesHelper.java          |   3 +-
 .../integrationtests/common/PaymentTypeHelper.java |   3 +-
 .../common/ProvisioningIntegrationTest.java        |  14 +-
 .../common/SchedulerJobHelper.java                 |   8 +-
 .../common/StandingInstructionsHelper.java         |   7 +-
 .../integrationtests/common/SurveyHelper.java      |   5 +-
 .../common/TaxComponentHelper.java                 |   6 +-
 .../integrationtests/common/TaxGroupHelper.java    |   7 +-
 .../fineract/integrationtests/common/Utils.java    |  14 +-
 .../integrationtests/common/WorkingDaysHelper.java |   1 -
 .../common/accounting/AccountHelper.java           |   6 +-
 .../accounting/FinancialActivityAccountHelper.java |   6 +-
 .../FinancialActivityAccountsMappingBuilder.java   |   3 +-
 .../common/accounting/GLAccountBuilder.java        |   3 +-
 .../common/accounting/JournalEntryHelper.java      |   8 +-
 .../PeriodicAccrualAccountingHelper.java           |   6 +-
 .../common/charges/ChargesHelper.java              |   8 +-
 .../fixeddeposit/FixedDepositAccountHelper.java    |   9 +-
 .../FixedDepositAccountStatusChecker.java          |   6 +-
 .../fixeddeposit/FixedDepositProductHelper.java    |  13 +-
 .../common/funds/FundsResourceHandler.java         |   4 +-
 .../common/loans/LoanApplicationTestBuilder.java   |   3 +-
 .../common/loans/LoanDisbursementTestBuilder.java  |   4 -
 .../common/loans/LoanProductTestBuilder.java       |   6 +-
 .../loans/LoanRescheduleRequestTestBuilder.java    |   3 +-
 .../common/loans/LoanStatusChecker.java            |   8 +-
 .../common/loans/LoanTransactionHelper.java        |  14 +-
 .../common/organisation/CampaignsHelper.java       |  10 +-
 .../common/organisation/CampaignsTest.java         |  12 +-
 .../common/organisation/CurrencyHelper.java        |  14 +-
 .../organisation/EntityDatatableChecksHelper.java  |   6 +-
 .../EntityDatatableChecksIntegrationTest.java      |  12 +-
 .../common/organisation/StaffHelper.java           |   8 +-
 .../common/provisioning/ProvisioningHelper.java    |   4 +-
 .../ProvisioningTransactionHelper.java             |   6 +-
 .../RecurringDepositAccountHelper.java             |  10 +-
 .../RecurringDepositAccountStatusChecker.java      |   6 +-
 .../RecurringDepositProductHelper.java             |   9 +-
 .../common/savings/AccountTransferHelper.java      |   6 +-
 .../common/savings/SavingsAccountHelper.java       |  21 +-
 .../savings/SavingsApplicationTestBuilder.java     |   1 -
 .../common/savings/SavingsProductHelper.java       |  10 +-
 .../common/savings/SavingsStatusChecker.java       |   6 +-
 .../common/shares/DividendsIntegrationTests.java   |  14 +-
 .../common/shares/ShareAccountHelper.java          |   3 +-
 .../shares/ShareAccountIntegrationTests.java       |  13 +-
 .../shares/ShareAccountTransactionHelper.java      |   3 +-
 .../shares/ShareDividendsTransactionHelper.java    |   6 +-
 .../common/shares/ShareProductHelper.java          |   9 +-
 .../shares/ShareProductTransactionHelper.java      |   6 +-
 .../system/AccountNumberPreferencesHelper.java     |   6 +-
 .../AccountNumberPreferencesTestBuilder.java       |   3 +-
 .../integrationtests/common/system/CodeHelper.java |  10 +-
 .../common/system/DatatableHelper.java             |   8 +-
 .../common/xbrl/XBRLIntegrationTestHelper.java     |   6 +-
 .../interoperation/InteropHelper.java              |   7 +-
 .../interoperation/InteropTest.java                |  19 +-
 .../loanaccount/guarantor/GuarantorHelper.java     |   6 +-
 .../loanaccount/guarantor/GuarantorTest.java       |  12 +-
 .../guarantor/GuarantorTestBuilder.java            |   4 +-
 .../useradministration/roles/RolesHelper.java      |   6 +-
 .../useradministration/users/UserHelper.java       |   1 -
 ...VariableInstallmentsDecliningBalanceHelper.java |   4 +-
 .../VariableInstallmentsFlatHelper.java            |   4 +-
 .../VariableInstallmentsIntegrationTest.java       |  12 +-
 .../VariableIntallmentsTransactionHelper.java      |   6 +-
 .../accrual/api/AccrualAccountingApiResource.java  |  11 +-
 .../accrual/api/AccrualAccountingConstants.java    |   4 -
 .../AccrualAccountingDataValidator.java            |   6 +-
 .../AccrualAccountingWritePlatformServiceImpl.java |   1 -
 .../closure/api/GLClosuresApiResource.java         |  12 +-
 .../closure/api/GLClosuresApiResourceSwagger.java  |   3 -
 .../closure/command/GLClosureCommand.java          |   1 -
 .../accounting/closure/data/GLClosureData.java     |   1 -
 .../accounting/closure/domain/GLClosure.java       |   2 -
 .../exception/GLClosureInvalidDeleteException.java |   1 -
 .../exception/GLClosureInvalidException.java       |   1 -
 .../GLClosureCommandFromApiJsonDeserializer.java   |   6 +-
 .../service/GLClosureReadPlatformService.java      |   1 -
 .../service/GLClosureReadPlatformServiceImpl.java  |   1 -
 ...osureWritePlatformServiceJpaRepositoryImpl.java |   1 -
 .../accounting/common/AccountingConstants.java     |   5 +-
 .../AccountingDropdownReadPlatformService.java     |   1 -
 .../AccountingDropdownReadPlatformServiceImpl.java |   1 -
 .../accounting/common/AccountingEnumerations.java  |   1 -
 .../api/FinancialActivityAccountsApiResource.java  |  13 +-
 ...inancialActivityAccountsApiResourceSwagger.java |   3 -
 .../data/FinancialActivityAccountData.java         |   1 -
 .../domain/FinancialActivityAccount.java           |   1 -
 .../FinancialActivityAccountRepositoryWrapper.java |   1 -
 .../FinancialActivityAccountDataValidator.java     |   6 +-
 ...inancialActivityAccountReadPlatformService.java |   1 -
 ...cialActivityAccountReadPlatformServiceImpl.java |   3 +-
 ...ialActivityAccountWritePlatformServiceImpl.java |   2 -
 .../glaccount/api/GLAccountsApiResource.java       |  17 +-
 .../api/GLAccountsApiResourceSwagger.java          |   5 +-
 .../glaccount/command/GLAccountCommand.java        |   1 -
 .../accounting/glaccount/data/GLAccountData.java   |   7 +-
 .../accounting/glaccount/domain/GLAccount.java     |   2 -
 .../accounting/glaccount/domain/GLAccountType.java |   3 +-
 .../accounting/glaccount/domain/TrialBalance.java  |  10 +-
 .../glaccount/domain/TrialBalanceRepository.java   |   3 +-
 .../domain/TrialBalanceRepositoryWrapper.java      |   3 +-
 .../GLAccountCommandFromApiJsonDeserializer.java   |   6 +-
 .../service/GLAccountReadPlatformService.java      |   1 -
 .../service/GLAccountReadPlatformServiceImpl.java  |   1 -
 ...countWritePlatformServiceJpaRepositoryImpl.java |   5 +-
 .../accounting/journalentry/api/DateParam.java     |   2 -
 .../api/JournalEntriesApiResource.java             |  17 +-
 .../api/JournalEntriesApiResourceSwagger.java      |   1 -
 .../journalentry/command/JournalEntryCommand.java  |   1 -
 .../journalentry/data/ClientTransactionDTO.java    |   1 -
 .../journalentry/data/JournalEntryData.java        |   2 -
 .../data/JournalEntryDataValidator.java            |   4 +-
 .../journalentry/data/LoanTransactionDTO.java      |   1 -
 .../data/OfficeOpeningBalancesData.java            |   1 -
 .../journalentry/data/SavingsTransactionDTO.java   |   1 -
 .../journalentry/data/SharesTransactionDTO.java    |   1 -
 .../journalentry/domain/JournalEntry.java          |   2 -
 .../domain/JournalEntryRepository.java             |   2 -
 .../domain/JournalEntryRepositoryImpl.java         |   2 -
 .../exception/JournalEntryInvalidException.java    |   1 -
 ...JournalEntryCommandFromApiJsonDeserializer.java |  10 +-
 .../service/AccountingProcessorHelper.java         |   1 -
 .../AccrualBasedAccountingProcessorForLoan.java    |   1 -
 ...edAccountingProcessorForClientTransactions.java |   1 -
 .../CashBasedAccountingProcessorForLoan.java       |   1 -
 .../CashBasedAccountingProcessorForSavings.java    |   1 -
 .../CashBasedAccountingProcessorForShares.java     |   1 -
 .../service/JournalEntryReadPlatformService.java   |   1 -
 .../JournalEntryReadPlatformServiceImpl.java       |   1 -
 ...ournalEntryRunningBalanceUpdateServiceImpl.java |   1 -
 .../service/JournalEntryWritePlatformService.java  |   1 -
 ...EntryWritePlatformServiceJpaRepositoryImpl.java |  13 +-
 .../data/ChargeToGLAccountMapper.java              |   3 +-
 .../data/PaymentTypeToGLAccountMapper.java         |   3 +-
 .../domain/ProductToGLAccountMapping.java          |   1 -
 .../ProductToGLAccountMappingRepository.java       |   1 -
 ...tToGLAccountMappingFromApiJsonDeserializer.java |   8 +-
 .../LoanProductToGLAccountMappingHelper.java       |   6 +-
 .../service/ProductToGLAccountMappingHelper.java   |   8 +-
 ...oductToGLAccountMappingReadPlatformService.java |   1 -
 ...tToGLAccountMappingReadPlatformServiceImpl.java |   3 +-
 ...ductToGLAccountMappingWritePlatformService.java |   1 -
 ...ToGLAccountMappingWritePlatformServiceImpl.java |   8 +-
 .../SavingsProductToGLAccountMappingHelper.java    |   6 +-
 .../ShareProductToGLAccountMappingHelper.java      |   6 +-
 .../api/ProvisioningEntriesApiResource.java        |  18 +-
 .../constant/ProvisioningEntriesApiConstants.java  |   4 -
 .../domain/LoanProductProvisioningEntry.java       |   2 -
 .../provisioning/domain/ProvisioningEntry.java     |   4 +-
 .../domain/ProvisioningEntryRepository.java        |   1 -
 .../ProvisioningEntryAlreadyCreatedException.java  |   1 -
 ...ningJournalEntriesCannotbeCreatedException.java |   1 -
 ...visioningEntriesDefinitionJsonDeserializer.java |   6 +-
 .../ProvisioningEntriesReadPlatformService.java    |   1 -
 ...ProvisioningEntriesReadPlatformServiceImpl.java |  17 +-
 ...triesWritePlatformServiceJpaRepositoryImpl.java |   4 +-
 .../rule/api/AccountingRuleApiResource.java        |  12 +-
 .../rule/api/AccountingRuleApiResourceSwagger.java |   5 +-
 .../accounting/rule/data/AccountingRuleData.java   |   1 -
 .../accounting/rule/domain/AccountingRule.java     |   4 +-
 .../accounting/rule/domain/AccountingTagRule.java  |   1 -
 .../AccountingRuleInvalidDeleteException.java      |   1 -
 .../exception/AccountingRuleInvalidException.java  |   1 -
 ...countingRuleCommandFromApiJsonDeserializer.java |   6 +-
 .../service/AccountingRuleReadPlatformService.java |   1 -
 .../AccountingRuleReadPlatformServiceImpl.java     |   1 -
 ...gRuleWritePlatformServiceJpaRepositoryImpl.java |   1 -
 .../fineract/adhocquery/api/AdHocApiResource.java  |   7 +-
 .../apache/fineract/adhocquery/data/AdHocData.java |   7 +-
 .../apache/fineract/adhocquery/domain/AdHoc.java   |   2 -
 .../handler/DeleteAdHocCommandHandler.java         |   2 +-
 .../handler/UpdateAdHocCommandHandler.java         |   2 +-
 .../adhocquery/service/AdHocDataValidator.java     |   6 +-
 .../service/AdHocReadPlatformService.java          |   1 -
 .../service/AdHocReadPlatformServiceImpl.java      |   1 -
 .../AdHocScheduledJobRunnerServiceImpl.java        |   5 +-
 ...AdHocWritePlatformServiceJpaRepositoryImpl.java |   1 -
 .../fineract/batch/api/BatchApiResource.java       |  12 +-
 .../batch/api/BatchApiResourceSwagger.java         |   3 +-
 .../fineract/batch/command/CommandStrategy.java    |   1 -
 .../batch/command/CommandStrategyProvider.java     |   1 -
 .../internal/ActivateClientCommandStrategy.java    |   1 -
 .../command/internal/ApplyLoanCommandStrategy.java |   1 -
 .../internal/ApplySavingsCommandStrategy.java      |   1 -
 .../internal/ApproveLoanCommandStrategy.java       |   1 -
 .../ApproveLoanRescheduleCommandStrategy.java      |   1 -
 .../internal/CollectChargesCommandStrategy.java    |   1 -
 .../internal/CreateChargeCommandStrategy.java      |   1 -
 .../internal/CreateClientCommandStrategy.java      |   1 -
 .../internal/DisburseLoanCommandStrategy.java      |   1 -
 .../command/internal/RepayLoanCommandStrategy.java |   3 +-
 .../command/internal/UnknownCommandStrategy.java   |   1 -
 .../internal/UpdateClientCommandStrategy.java      |   1 -
 .../fineract/batch/exception/ErrorHandler.java     |   5 +-
 .../serialization/BatchRequestJsonHelper.java      |   4 +-
 .../fineract/batch/service/BatchApiService.java    |   2 -
 .../batch/service/BatchApiServiceImpl.java         |   5 +-
 .../fineract/batch/service/ResolutionHelper.java   |  10 +-
 .../fineract/commands/annotation/CommandType.java  |   6 +-
 .../fineract/commands/api/AuditsApiResource.java   |  10 +-
 .../commands/api/MakercheckersApiResource.java     |  10 +-
 .../api/MakercheckersApiResourceSwagger.java       |   5 +-
 .../fineract/commands/data/AuditSearchData.java    |   1 -
 .../fineract/commands/domain/CommandSource.java    |   4 +-
 .../commands/provider/CommandHandlerProvider.java  |   3 +-
 .../commands/service/AuditReadPlatformService.java |   1 -
 .../service/AuditReadPlatformServiceImpl.java      |   8 +-
 ...folioCommandSourceWritePlatformServiceImpl.java |   4 +-
 .../SynchronousCommandProcessingService.java       |   1 -
 .../api/AccountNumberFormatsApiResource.java       |  12 +-
 .../AccountNumberFormatsApiResourceSwagger.java    |   3 +-
 .../data/AccountNumberFormatData.java              |   1 -
 .../data/AccountNumberFormatDataValidator.java     |   8 +-
 .../domain/AccountNumberFormat.java                |   1 -
 .../domain/AccountNumberFormatEnumerations.java    |  10 +-
 .../service/AccountNumberFormatConstants.java      |   4 -
 .../AccountNumberFormatReadPlatformService.java    |   1 -
 ...AccountNumberFormatReadPlatformServiceImpl.java |   3 +-
 ...ormatWritePlatformServiceJpaRepositoryImpl.java |   2 -
 .../bulkimport/api/BulkImportApiResource.java      |   3 -
 .../bulkimport/domain/ImportDocument.java          |   3 -
 .../importhandler/ImportHandlerUtils.java          |  28 +-
 .../importhandler/center/CenterImportHandler.java  |  16 +-
 .../ChartOfAccountsImportHandler.java              |  12 +-
 .../client/ClientEntityImportHandler.java          |   4 +-
 .../client/ClientPersonImportHandler.java          |   4 +-
 .../fixeddeposits/FixedDepositImportHandler.java   |  25 +-
 .../FixedDepositTransactionImportHandler.java      |  14 +-
 .../importhandler/group/GroupImportHandler.java    |  15 +-
 .../guarantor/GuarantorImportHandler.java          |  14 +-
 .../importhandler/helper/ClientIdSerializer.java   |   9 +-
 .../helper/CodeValueDataIdSerializer.java          |   3 +-
 .../helper/CurrencyDateCodeSerializer.java         |   3 +-
 .../importhandler/helper/DateSerializer.java       |   3 +-
 .../helper/EnumOptionDataIdSerializer.java         |   3 +-
 .../helper/EnumOptionDataValueSerializer.java      |   3 +-
 .../importhandler/helper/GroupIdSerializer.java    |   9 +-
 ...vingsAccountTransactionEnumValueSerialiser.java |   3 +-
 .../journalentry/JournalEntriesImportHandler.java  |  15 +-
 .../importhandler/loan/LoanImportHandler.java      |  21 +-
 .../loanrepayment/LoanRepaymentImportHandler.java  |   6 +-
 .../importhandler/office/OfficeImportHandler.java  |  12 +-
 .../RecurringDepositImportHandler.java             |  14 +-
 .../RecurringDepositTransactionImportHandler.java  |  15 +-
 .../savings/SavingsImportHandler.java              |  16 +-
 .../savings/SavingsTransactionImportHandler.java   |  14 +-
 .../sharedaccount/SharedAccountImportHandler.java  |  14 +-
 .../importhandler/staff/StaffImportHandler.java    |  12 +-
 .../importhandler/users/UserImportHandler.java     |  12 +-
 .../populator/AbstractWorkbookPopulator.java       |  17 +-
 .../bulkimport/populator/CenterSheetPopulator.java |   9 +-
 .../bulkimport/populator/ClientSheetPopulator.java |   9 +-
 .../bulkimport/populator/ExtrasSheetPopulator.java |   3 +-
 .../FixedDepositProductSheetPopulator.java         |   3 +-
 .../populator/GlAccountSheetPopulator.java         |   3 +-
 .../bulkimport/populator/GroupSheetPopulator.java  |   9 +-
 .../populator/LoanProductSheetPopulator.java       |   3 +-
 .../bulkimport/populator/OfficeSheetPopulator.java |   5 +-
 .../populator/PersonnelSheetPopulator.java         |   9 +-
 .../RecurringDepositProductSheetPopulator.java     |   3 +-
 .../bulkimport/populator/RoleSheetPopulator.java   |   3 +-
 .../populator/SavingsAccountSheetPopulator.java    |   6 +-
 .../populator/SavingsProductSheetPopulator.java    |   3 +-
 .../populator/SharedProductsSheetPopulator.java    |   9 +-
 .../centers/CentersWorkbookPopulator.java          |  11 +-
 .../chartofaccounts/ChartOfAccountsWorkbook.java   |  17 +-
 .../client/ClientEntityWorkbookPopulator.java      |  11 +-
 .../client/ClientPersonWorkbookPopulator.java      |  11 +-
 .../comparator/LoanComparatorByStatusActive.java   |   3 +-
 .../FixedDepositTransactionWorkbookPopulator.java  |  23 +-
 .../FixedDepositWorkbookPopulator.java             |  18 +-
 .../populator/group/GroupsWorkbookPopulator.java   |  17 +-
 .../guarantor/GuarantorWorkbookPopulator.java      |  18 +-
 .../JournalEntriesWorkbookPopulator.java           |  11 +-
 .../populator/loan/LoanWorkbookPopulator.java      |  22 +-
 .../LoanRepaymentWorkbookPopulator.java            |  21 +-
 .../populator/office/OfficeWorkbookPopulator.java  |  11 +-
 ...curringDepositTransactionWorkbookPopulator.java |  18 +-
 .../RecurringDepositWorkbookPopulator.java         |  18 +-
 .../SavingsTransactionsWorkbookPopulator.java      |  20 +-
 .../savings/SavingsWorkbookPopulator.java          |  19 +-
 .../SharedAccountWorkBookPopulator.java            |  11 +-
 .../populator/staff/StaffWorkbookPopulator.java    |  12 +-
 .../populator/users/UserWorkbookPopulator.java     |  16 +-
 .../service/BulkImportEventListener.java           |   1 -
 .../BulkImportWorkbookPopulatorServiceImpl.java    |  36 +-
 .../service/BulkImportWorkbookService.java         |   7 +-
 .../service/BulkImportWorkbookServiceImpl.java     |  17 +-
 .../infrastructure/cache/CacheApiConstants.java    |   4 -
 .../cache/PlatformCacheConfiguration.java          |   2 +-
 .../infrastructure/cache/api/CacheApiResource.java |  12 +-
 .../cache/command/UpdateCacheCommandHandler.java   |   4 +-
 .../infrastructure/cache/domain/PlatformCache.java |   1 -
 .../cache/service/CacheWritePlatformService.java   |   1 -
 ...CacheWritePlatformServiceJpaRepositoryImpl.java |   1 -
 .../service/RuntimeDelegatingCacheManager.java     |   1 -
 .../campaigns/email/api/EmailApiResource.java      |  26 +-
 .../email/api/EmailCampaignApiResource.java        |  33 +-
 .../email/api/EmailConfigurationApiResource.java   |  22 +-
 .../campaigns/email/data/EmailCampaignData.java    |   2 +-
 .../email/data/EmailCampaignValidator.java         |  14 +-
 .../email/data/EmailConfigurationValidator.java    |  17 +-
 .../campaigns/email/data/EmailData.java            |   5 +-
 .../campaigns/email/data/EmailDataValidator.java   |  29 +-
 .../email/data/EmailMessageWithAttachmentData.java |   1 -
 .../email/data/ScheduledEmailEnumerations.java     |   2 +-
 .../campaigns/email/domain/EmailCampaign.java      |  31 +-
 .../campaigns/email/domain/EmailConfiguration.java |   3 +-
 .../campaigns/email/domain/EmailMessage.java       |  21 +-
 .../email/domain/EmailMessageAssembler.java        |   4 +-
 .../email/domain/EmailMessageRepository.java       |   3 +-
 .../ActivateEmailCampaignCommandHandler.java       |   2 +-
 .../handler/CloseEmailCampaignCommandHandler.java  |   2 +-
 .../handler/CreateEmailCampaignCommandHandler.java |   2 +-
 .../email/handler/CreateEmailCommandHandler.java   |   2 +-
 .../handler/DeleteEmailCampaignCommandHandler.java |   2 +-
 .../email/handler/DeleteEmailCommandHandler.java   |   2 +-
 .../ReactivateEmailCampaignCommandHandler.java     |   2 +-
 .../handler/UpdateEmailCampaignCommandHandler.java |   2 +-
 .../UpdateEmailConfigurationCommandHandler.java    |   3 +-
 .../service/EmailCampaignReadPlatformService.java  |   3 +-
 .../EmailCampaignReadPlatformServiceImpl.java      |  11 +-
 ...ailCampaignWritePlatformCommandHandlerImpl.java |  62 ++-
 .../service/EmailCampaignWritePlatformService.java |   2 +-
 .../EmailConfigurationReadPlatformService.java     |   3 +-
 .../EmailConfigurationReadPlatformServiceImpl.java |  11 +-
 ...EmailConfigurationWritePlatformServiceImpl.java |  16 +-
 .../service/EmailMessageJobEmailServiceImpl.java   |  12 +-
 .../email/service/EmailReadPlatformService.java    |   7 +-
 .../service/EmailReadPlatformServiceImpl.java      |  25 +-
 ...EmailWritePlatformServiceJpaRepositoryImpl.java |  11 +-
 .../campaigns/helper/SmsConfigUtils.java           |   2 -
 .../campaigns/sms/api/SmsCampaignApiResource.java  |  12 +-
 .../sms/constants/SmsCampaignEnumerations.java     |   1 -
 .../campaigns/sms/data/SmsCampaignData.java        |   3 -
 .../campaigns/sms/domain/SmsCampaign.java          |   2 -
 .../sms/domain/SmsCampaignRepository.java          |   1 -
 .../sms/serialization/SmsCampaignValidator.java    |   6 +-
 .../sms/service/SmsCampaignDomainServiceImpl.java  |   2 -
 .../SmsCampaignDropdownReadPlatformService.java    |   1 -
 ...SmsCampaignDropdownReadPlatformServiceImpl.java |   1 -
 .../service/SmsCampaignReadPlatformService.java    |   1 -
 .../SmsCampaignReadPlatformServiceImpl.java        |   1 -
 .../service/SmsCampaignWritePlatformService.java   |   1 -
 .../SmsCampaignWritePlatformServiceJpaImpl.java    |  11 +-
 .../codes/api/CodeValuesApiResource.java           |  14 +-
 .../infrastructure/codes/api/CodesApiResource.java |  12 +-
 .../fineract/infrastructure/codes/domain/Code.java |   2 -
 .../infrastructure/codes/domain/CodeValue.java     |   2 -
 .../CodeCommandFromApiJsonDeserializer.java        |   6 +-
 .../CodeValueCommandFromApiJsonDeserializer.java   |   6 +-
 .../codes/service/CodeReadPlatformService.java     |   1 -
 .../codes/service/CodeReadPlatformServiceImpl.java |   1 -
 .../service/CodeValueReadPlatformService.java      |   1 -
 .../service/CodeValueReadPlatformServiceImpl.java  |   1 -
 ...ValueWritePlatformServiceJpaRepositoryImpl.java |   1 -
 .../CodeWritePlatformServiceJpaRepositoryImpl.java |   2 -
 .../ExternalServicesConfigurationApiResource.java  |  12 +-
 .../api/GlobalConfigurationApiConstant.java        |   4 -
 .../api/GlobalConfigurationApiResource.java        |  21 +-
 .../api/GlobalConfigurationApiResourceSwagger.java |   3 +-
 .../data/GlobalConfigurationDataValidator.java     |  10 +-
 .../domain/ConfigurationDomainService.java         |   1 -
 .../domain/ConfigurationDomainServiceJpa.java      |   1 -
 .../configuration/domain/ExternalService.java      |   1 -
 .../domain/ExternalServicePropertiesPK.java        |   2 -
 .../domain/ExternalServicesProperties.java         |   2 -
 .../domain/GlobalConfigurationProperty.java        |   4 +-
 ...esPropertiesCommandFromApiJsonDeserializer.java |   4 +-
 ...onfigurationCommandFromApiJsonDeserializer.java |   4 +-
 .../ConfigurationReadPlatformServiceImpl.java      |   9 +-
 ...rviceWritePlatformServiceJpaRepositoryImpl.java |   1 -
 ...ernalServicesPropertiesReadPlatformService.java |   1 -
 ...lServicesPropertiesReadPlatformServiceImpl.java |   1 -
 .../ExternalServicesReadPlatformServiceImpl.java   |   1 -
 ...ationWritePlatformServiceJpaRepositoryImpl.java |   1 -
 .../core/api/ApiParameterHelper.java               |   3 -
 .../core/api/ApiRequestParameterHelper.java        |   2 -
 .../core/api/JodaDateTimeAdapter.java              |   6 +-
 .../core/api/JodaLocalDateAdapter.java             |   6 +-
 .../core/api/JodaMonthDayAdapter.java              |   6 +-
 .../infrastructure/core/api/JsonCommand.java       |   8 +-
 .../infrastructure/core/api/JsonQuery.java         |   6 +-
 .../core/api/ParameterListExclusionStrategy.java   |   3 +-
 .../core/api/ParameterListInclusionStrategy.java   |   3 +-
 .../core/boot/ApplicationExitUtil.java             |   2 -
 .../infrastructure/core/boot/JDBCDriverConfig.java |   1 -
 .../core/boot/WebXmlConfiguration.java             |   7 +-
 .../core/boot/WebXmlOauthConfiguration.java        |   6 +-
 .../core/boot/db/DataSourceConfiguration.java      |   1 -
 .../core/boot/db/DataSourceProperties.java         |   1 -
 .../boot/db/TenantDataSourcePortFixService.java    |   1 -
 .../core/data/ApiGlobalErrorResponse.java          |   1 -
 .../core/data/DataValidatorBuilder.java            |  12 +-
 .../data/PaginationParametersDataValidator.java    |   1 -
 .../core/domain/AbstractAuditableCustom.java       |   3 -
 .../core/domain/AbstractPersistableCustom.java     |   2 -
 .../core/domain/AuditorAwareImpl.java              |   3 +-
 .../domain/DefaultPlatformPasswordEncoder.java     |   1 -
 .../infrastructure/core/domain/JdbcSupport.java    |   5 +-
 .../core/domain/MySQLDictionaryCustom.java         |   1 -
 .../PlatformApiDataValidationException.java        |   1 -
 .../AccessDeniedExceptionMapper.java               |   1 -
 .../BadCredentialsExceptionMapper.java             |   1 -
 .../InvalidJsonExceptionMapper.java                |   1 -
 .../InvalidTenantIdentifierExceptionMapper.java    |   1 -
 .../exceptionmapper/JsonSyntaxExceptionMapper.java |   4 +-
 .../MalformedJsonExceptionMapper.java              |   4 +-
 .../NoAuthorizationExceptionMapper.java            |   1 -
 .../PlatformApiDataValidationExceptionMapper.java  |   1 -
 .../PlatformDataIntegrityExceptionMapper.java      |   1 -
 .../PlatformDomainRuleExceptionMapper.java         |   1 -
 .../PlatformInternalServerExceptionMapper.java     |   1 -
 .../PlatformResourceNotFoundExceptionMapper.java   |   1 -
 .../PlatformServiceUnavailableExceptionMapper.java |   1 -
 .../UnAuthenticatedUserExceptionMapper.java        |   1 -
 .../UnrecognizedQueryParamExceptionMapper.java     |   2 -
 .../UnsupportedCommandExceptionMapper.java         |   2 -
 .../UnsupportedParameterExceptionMapper.java       |   2 -
 .../core/filters/ResponseCorsFilter.java           |   5 +-
 .../CommandProcessingResultJsonSerializer.java     |   5 +-
 .../DatatableCommandFromApiJsonDeserializer.java   |   8 +-
 .../serialization/DefaultToApiJsonSerializer.java  |   4 +-
 ...hPrettyPrintingOffJsonSerializerGoogleGson.java |   5 +-
 ...thPrettyPrintingOnJsonSerializerGoogleGson.java |   5 +-
 .../core/serialization/FromJsonHelper.java         |  12 +-
 .../serialization/GoogleGsonSerializerHelper.java  |   8 +-
 .../core/serialization/JsonParserHelper.java       |  10 +-
 .../core/serialization/ToApiJsonSerializer.java    |   1 -
 ...AbandonedConnectionCleanupShutdownListener.java |   1 -
 .../core/service/DataSourceForTenants.java         |   1 -
 .../infrastructure/core/service/DateUtils.java     |   1 -
 .../core/service/PaginationHelper.java             |   1 -
 .../core/service/RoutingDataSource.java            |   2 -
 .../core/service/TenantDatabaseUpgradeService.java |  12 +-
 .../TomcatJdbcDataSourcePerTenantService.java      |   2 -
 .../api/CreditBureauConfigurationAPI.java          |   4 +-
 .../creditbureau/domain/CreditBureau.java          |   2 -
 .../domain/CreditBureauConfiguration.java          |   2 -
 .../domain/CreditBureauLoanProductMapping.java     |   3 +-
 .../domain/OrganisationCreditBureau.java           |   2 -
 ...CreditBureauCommandFromApiJsonDeserializer.java |   7 +-
 ...uLoanProductCommandFromApiJsonDeserializer.java |   6 +-
 ...ureauLoanProductMappingReadPlatformService.java |   1 -
 ...uLoanProductMappingReadPlatformServiceImpl.java |   1 -
 .../CreditBureauMasterReadPlatformService.java     |   1 -
 .../CreditBureauReadConfigurationService.java      |   1 -
 .../CreditBureauReadConfigurationServiceImpl.java  |   1 -
 .../service/CreditBureauReadPlatformService.java   |   1 -
 .../CreditBureauReadPlatformServiceImpl.java       |   1 -
 ...rganisationCreditBureauReadPlatformService.java |   1 -
 ...isationCreditBureauReadPlatformServiceImpl.java |   1 -
 .../dataqueries/api/DataTableApiConstant.java      |   4 -
 .../dataqueries/api/DatatablesApiResource.java     |  12 +-
 .../api/DatatablesApiResourceSwagger.java          |   4 +-
 .../api/EntityDatatableChecksApiResource.java      |  11 +-
 .../EntityDatatableChecksApiResourceSwagger.java   |   5 +-
 .../dataqueries/api/ReportsApiResource.java        |  12 +-
 .../dataqueries/api/ReportsApiResourceSwagger.java |   3 +-
 .../dataqueries/api/RunreportsApiResource.java     |  10 +-
 .../dataqueries/data/DataTableValidator.java       |   8 +-
 .../data/EntityDataTableChecksData.java            |   1 -
 .../data/EntityDataTableChecksTemplateData.java    |   7 +-
 .../data/ResultsetColumnHeaderData.java            |   3 +-
 .../dataqueries/data/StatusEnum.java               |   1 -
 .../dataqueries/domain/EntityDatatableChecks.java  |   1 -
 .../domain/EntityDatatableChecksRepository.java    |   1 -
 .../infrastructure/dataqueries/domain/Report.java  |   7 +-
 .../dataqueries/domain/ReportParameter.java        |   1 -
 .../dataqueries/domain/ReportParameterUsage.java   |   1 -
 .../domain/ReportParameterUsageRepository.java     |   1 -
 .../ReportCommandFromApiJsonDeserializer.java      |   4 +-
 .../EntityDatatableChecksDataValidator.java        |  13 +-
 ...tityDatatableChecksReadPlatformServiceImpl.java |   1 -
 .../service/EntityDatatableChecksReadService.java  |   1 -
 ...ityDatatableChecksWritePlatformServiceImpl.java |  15 +-
 .../dataqueries/service/GenericDataService.java    |   1 -
 .../service/GenericDataServiceImpl.java            |   2 -
 .../dataqueries/service/ReadReportingService.java  |   2 -
 .../service/ReadReportingServiceImpl.java          |  11 +-
 .../service/ReadWriteNonCoreDataService.java       |   1 -
 .../service/ReadWriteNonCoreDataServiceImpl.java   |  23 +-
 .../service/ReportWritePlatformServiceImpl.java    |   7 +-
 .../api/DocumentManagementApiResource.java         |  17 +-
 .../documentmanagement/api/ImagesApiResource.java  |  13 +-
 .../command/DocumentCommandValidator.java          |   1 -
 .../contentrepository/ContentRepository.java       |   1 -
 .../contentrepository/ContentRepositoryUtils.java  |   1 -
 .../FileSystemContentRepository.java               |   4 +-
 .../contentrepository/S3ContentRepository.java     |  28 +-
 .../documentmanagement/data/FileData.java          |   1 -
 .../documentmanagement/data/ImageData.java         |   2 -
 .../documentmanagement/domain/Document.java        |   3 +-
 .../documentmanagement/domain/Image.java           |   1 -
 .../service/DocumentReadPlatformService.java       |   1 -
 .../service/DocumentReadPlatformServiceImpl.java   |   1 -
 .../service/DocumentWritePlatformService.java      |   1 -
 ...umentWritePlatformServiceJpaRepositoryImpl.java |   1 -
 .../service/ImageReadPlatformServiceImpl.java      |   1 -
 .../service/ImageWritePlatformService.java         |   1 -
 ...ImageWritePlatformServiceJpaRepositoryImpl.java |   1 -
 .../api/FineractEntityApiResource.java             |   4 +-
 .../data/FineractEntityDataValidator.java          |  10 +-
 .../entityaccess/domain/FineractEntityAccess.java  |   4 +-
 .../domain/FineractEntityRelation.java             |   2 -
 .../domain/FineractEntityToEntityMapping.java      |   4 +-
 .../service/FineractEntityAccessReadService.java   |   1 -
 .../FineractEntityAccessReadServiceImpl.java       |   3 -
 .../service/FineractEntityAccessUtil.java          |   7 -
 .../FineractEntityAccessWriteServiceImpl.java      |   2 -
 .../gcm/api/DeviceRegistrationApiResource.java     |   7 +-
 .../gcm/domain/DeviceRegistration.java             |   2 -
 .../gcm/domain/DeviceRegistrationData.java         |   1 -
 .../infrastructure/gcm/domain/Message.java         |   1 -
 .../fineract/infrastructure/gcm/domain/Sender.java |  54 +-
 .../DeviceRegistrationReadPlatformService.java     |   1 -
 .../DeviceRegistrationReadPlatformServiceImpl.java |   1 -
 ...DeviceRegistrationWritePlatformServiceImpl.java |   1 -
 .../gcm/service/NotificationSenderService.java     |   1 -
 .../infrastructure/hooks/api/HookApiResource.java  |  12 +-
 .../hooks/api/HookApiResourceSwagger.java          |   3 +-
 .../hooks/data/EventResultSetExtractor.java        |   1 -
 .../infrastructure/hooks/data/HookData.java        |   3 +-
 .../fineract/infrastructure/hooks/domain/Hook.java |  28 +-
 .../hooks/domain/HookConfiguration.java            |   1 -
 .../hooks/domain/HookRepository.java               |   1 -
 .../infrastructure/hooks/domain/HookResource.java  |   1 -
 .../infrastructure/hooks/domain/HookTemplate.java  |   2 -
 .../infrastructure/hooks/domain/Schema.java        |   1 -
 .../hooks/listener/FineractHookListener.java       |   3 +-
 .../hooks/processor/ProcessorHelper.java           |   6 +-
 .../hooks/processor/TwilioHookProcessor.java       |   9 +-
 .../hooks/processor/WebHookProcessor.java          |   9 +-
 .../hooks/processor/WebHookService.java            |   5 +-
 .../hooks/processor/data/SmsProviderData.java      |   1 -
 .../HookCommandFromApiJsonDeserializer.java        |  10 +-
 .../hooks/service/HookReadPlatformService.java     |   1 -
 .../hooks/service/HookReadPlatformServiceImpl.java |  16 +-
 .../HookWritePlatformServiceJpaRepositoryImpl.java |   8 +-
 .../jobs/annotation/CronMethodParser.java          |   1 -
 .../infrastructure/jobs/annotation/CronTarget.java |   1 -
 .../jobs/api/SchedulerApiResource.java             |   9 +-
 .../jobs/api/SchedulerJobApiResource.java          |  12 +-
 .../jobs/api/SchedulerJobApiResourceSwagger.java   |   3 +-
 .../jobs/data/JobDetailDataValidator.java          |   6 +-
 .../infrastructure/jobs/domain/JobParameter.java   |   2 -
 .../jobs/domain/JobParameterRepository.java        |   3 +-
 .../jobs/domain/ScheduledJobDetail.java            |   4 +-
 .../jobs/domain/ScheduledJobDetailRepository.java  |   1 -
 .../jobs/domain/ScheduledJobRunHistory.java        |   2 -
 .../jobs/domain/SchedulerDetail.java               |   1 -
 .../jobs/service/JobRegisterServiceImpl.java       |   3 +-
 .../service/SchedularWritePlatformService.java     |   1 -
 ...dularWritePlatformServiceJpaRepositoryImpl.java |   1 -
 .../jobs/service/SchedulerJobListener.java         |   1 -
 .../service/SchedulerJobRunnerReadService.java     |   1 -
 .../service/SchedulerJobRunnerReadServiceImpl.java |   1 -
 .../jobs/service/SchedulerTriggerListener.java     |   1 -
 .../infrastructure/openjpa/OpenJpaDialect.java     |   2 -
 .../openjpa/OpenJpaVendorAdapter.java              |   1 -
 .../provider/ReportingProcessServiceProvider.java  |   1 -
 .../api/ReportMailingJobApiResource.java           |  11 +-
 .../api/ReportMailingJobApiResourceSwagger.java    |   3 +-
 .../api/ReportMailingJobRunHistoryApiResource.java |  10 +-
 ...portMailingJobRunHistoryApiResourceSwagger.java |   1 -
 .../data/ReportMailingJobData.java                 |   1 -
 .../ReportMailingJobEmailAttachmentFileFormat.java |   5 +-
 ...ortMailingJobStretchyReportParamDateOption.java |   5 +-
 .../reportmailingjob/domain/ReportMailingJob.java  |   2 -
 .../domain/ReportMailingJobConfiguration.java      |   1 -
 .../domain/ReportMailingJobRepository.java         |   1 -
 .../domain/ReportMailingJobRunHistory.java         |   2 -
 .../reportmailingjob/helper/IPv4Helper.java        |   1 -
 ...MailingJobConfigurationReadPlatformService.java |   1 -
 ...ingJobConfigurationReadPlatformServiceImpl.java |   1 -
 .../service/ReportMailingJobEmailServiceImpl.java  |   2 -
 .../ReportMailingJobReadPlatformService.java       |   1 -
 .../ReportMailingJobReadPlatformServiceImpl.java   |   1 -
 ...ailingJobRunHistoryReadPlatformServiceImpl.java |   1 -
 .../ReportMailingJobWritePlatformServiceImpl.java  |   5 +-
 .../util/ReportMailingJobDateUtil.java             |   1 -
 .../validation/ReportMailingJobValidator.java      |   6 +-
 .../security/api/AuthenticationApiResource.java    |  15 +-
 .../api/AuthenticationApiResourceSwagger.java      |   3 +-
 .../security/api/TwoFactorApiResource.java         |   2 -
 .../api/TwoFactorConfigurationApiResource.java     |   2 -
 .../security/api/UserDetailsApiResource.java       |  10 +-
 .../api/UserDetailsApiResourceSwagger.java         |   3 +-
 .../InvalidateTFAccessTokenCommandHandler.java     |   6 +-
 .../UpdateTwoFactorConfigCommandHandler.java       |   1 -
 .../constants/TwoFactorConfigurationConstants.java |   6 +-
 .../security/data/AuthenticatedOauthUserData.java  |   1 -
 .../security/data/AuthenticatedUserData.java       |   1 -
 .../security/data/PlatformRequestLog.java          |   2 -
 .../data/TwoFactorConfigurationValidator.java      |   6 +-
 .../domain/BasicPasswordEncodablePlatformUser.java |   1 -
 .../security/domain/OTPRequestRepository.java      |   1 -
 .../security/domain/TFAccessToken.java             |   2 -
 .../security/domain/TwoFactorConfiguration.java    |   1 -
 .../domain/TwoFactorConfigurationRepository.java   |   1 -
 .../security/exception/ResetPasswordException.java |   1 -
 .../InsecureTwoFactorAuthenticationFilter.java     |   2 -
 .../TenantAwareBasicAuthenticationFilter.java      |   5 -
 .../filter/TenantAwareTenantIdentifierFilter.java  |   2 -
 .../filter/TwoFactorAuthenticationFilter.java      |   2 -
 .../service/BasicAuthTenantDetailsServiceJdbc.java |   2 -
 .../CustomAuthenticationFailureHandler.java        |   2 -
 .../security/service/JdbcTenantDetailsService.java |   2 -
 .../SpringSecurityPlatformSecurityContext.java     |   1 -
 .../security/service/TenantDetailsService.java     |   1 -
 .../service/TwoFactorConfigurationService.java     |   1 -
 .../service/TwoFactorConfigurationServiceImpl.java |   8 +-
 .../security/service/TwoFactorService.java         |   1 -
 .../security/service/TwoFactorServiceImpl.java     |   1 -
 .../service/UUIDAccessTokenGenerationService.java  |   1 -
 .../security/utils/ColumnValidator.java            |   1 -
 .../security/vote/SelfServiceUserAccessVote.java   |   1 -
 .../infrastructure/sms/SmsApiConstants.java        |   4 -
 .../infrastructure/sms/api/SmsApiResource.java     |   4 +-
 .../infrastructure/sms/data/SmsDataValidator.java  |   6 +-
 .../sms/data/SmsMessageApiQueueResourceData.java   |   3 +-
 .../sms/data/SmsMessageApiReportResourceData.java  |   3 +-
 .../infrastructure/sms/domain/SmsMessage.java      |   2 -
 .../sms/domain/SmsMessageAssembler.java            |   3 +-
 .../scheduler/SmsMessageScheduledJobService.java   |   1 -
 .../SmsMessageScheduledJobServiceImpl.java         |  17 +-
 .../sms/service/SmsReadPlatformService.java        |   1 -
 .../sms/service/SmsReadPlatformServiceImpl.java    |   1 -
 .../SmsWritePlatformServiceJpaRepositoryImpl.java  |   1 -
 .../survey/api/LikelihoodApiConstants.java         |   1 -
 .../survey/api/LikelihoodApiResource.java          |   4 +-
 .../survey/api/PovertyLineApiResource.java         |   3 +-
 .../survey/api/SurveyApiResource.java              |  10 +-
 .../survey/api/SurveyApiResourceSwagger.java       |   4 +-
 .../survey/data/LikelihoodDataValidator.java       |  15 +-
 .../infrastructure/survey/domain/Likelihood.java   |   4 +-
 .../survey/domain/LikelihoodRepository.java        |   3 +-
 .../handler/RegisterSurveyCommandHandler.java      |   1 -
 .../survey/service/PovertyLineServiceImpl.java     |   2 -
 .../survey/service/ReadLikelihoodService.java      |   3 +-
 .../survey/service/ReadLikelihoodServiceImpl.java  |   2 -
 .../survey/service/ReadSurveyService.java          |   1 -
 .../survey/service/ReadSurveyServiceImpl.java      |   2 -
 .../survey/service/WriteLikelihoodServiceImpl.java |   1 -
 .../interoperation/api/InteropApiResource.java     |  42 +-
 .../interoperation/api/InteropWrapperBuilder.java  |   8 +-
 .../interoperation/data/ExtensionData.java         |  11 +-
 .../fineract/interoperation/data/GeoCodeData.java  |  11 +-
 .../interoperation/data/InteropAccountData.java    |  19 +-
 .../data/InteropIdentifierAccountResponseData.java |   5 +-
 .../interoperation/data/InteropIdentifierData.java |  17 +-
 .../data/InteropIdentifierRequestData.java         |  14 +-
 .../data/InteropIdentifiersResponseData.java       |   9 +-
 .../data/InteropQuoteRequestData.java              |  27 +-
 .../data/InteropQuoteResponseData.java             |   7 +-
 .../interoperation/data/InteropRequestData.java    |  27 +-
 .../interoperation/data/InteropResponseData.java   |  10 +-
 .../data/InteropTransactionData.java               |  14 +-
 .../data/InteropTransactionRequestData.java        |  22 +-
 .../InteropTransactionRequestResponseData.java     |   7 +-
 .../data/InteropTransactionTypeData.java           |  16 +-
 .../data/InteropTransactionsData.java              |  13 +-
 .../data/InteropTransferRequestData.java           |  25 +-
 .../data/InteropTransferResponseData.java          |   7 +-
 .../fineract/interoperation/data/MoneyData.java    |  19 +-
 .../interoperation/domain/InteropIdentifier.java   |  17 +-
 .../handler/CommitInteropTransferHandler.java      |   6 +-
 .../handler/CreateInteropIdentifierHandler.java    |   5 +-
 .../handler/CreateInteropQuoteHandler.java         |   4 +-
 .../handler/CreateInteropRequestHandler.java       |   5 +-
 .../handler/DeleteInteropIdentifierHandler.java    |   4 +-
 .../handler/PrepareInteropTransferHandler.java     |   6 +-
 .../serialization/InteropDataValidator.java        |   5 +-
 .../interoperation/service/InteropService.java     |  13 +-
 .../interoperation/service/InteropServiceImpl.java |  53 +-
 .../fineract/interoperation/util/InteropUtil.java  |   2 -
 .../fineract/interoperation/util/MathUtil.java     |   7 +-
 .../fineract/mix/api/MixReportApiResource.java     |   7 +-
 .../fineract/mix/api/MixTaxonomyApiResource.java   |   7 +-
 .../mix/api/MixTaxonomyMappingApiResource.java     |   8 +-
 .../fineract/mix/domain/MixTaxonomyMapping.java    |   1 -
 .../MixTaxonomyMappingReadPlatformServiceImpl.java |   1 -
 .../service/MixTaxonomyReadPlatformService.java    |   1 -
 .../MixTaxonomyReadPlatformServiceImpl.java        |   1 -
 .../service/NamespaceReadPlatformServiceImpl.java  |   1 -
 .../apache/fineract/mix/service/XBRLBuilder.java   |   1 -
 .../fineract/mix/service/XBRLResultService.java    |   1 -
 .../mix/service/XBRLResultServiceImpl.java         |   5 +-
 .../notification/api/NotificationApiResource.java  |  18 +-
 .../config/MessagingConfiguration.java             |   1 -
 .../fineract/notification/domain/Notification.java |   3 +-
 .../notification/domain/NotificationMapper.java    |   7 +-
 .../notification/domain/TopicRepository.java       |   1 -
 .../notification/domain/TopicSubscriber.java       |   2 -
 .../domain/TopicSubscriberRepository.java          |   1 -
 .../NotificationEventListener.java                 |  15 +-
 .../eventandlistener/NotificationEventService.java |   9 +-
 .../eventandlistener/SpringEventListener.java      |   1 -
 .../service/NotificationDomainServiceImpl.java     |  17 +-
 ...NotificationGeneratorReadRepositoryWrapper.java |   3 +-
 ...ficationGeneratorReadRepositoryWrapperImpl.java |   3 +-
 .../NotificationMapperReadRepositoryWrapper.java   |   3 +-
 ...otificationMapperReadRepositoryWrapperImpl.java |   3 +-
 .../NotificationReadPlatformServiceImpl.java       |   1 -
 .../NotificationWritePlatformServiceImpl.java      |   9 +-
 .../notification/service/TopicDomainService.java   |   1 -
 .../service/TopicDomainServiceImpl.java            |   1 -
 .../service/TopicReadPlatformServiceImpl.java      |   1 -
 .../TopicSubscriberReadPlatformService.java        |   1 -
 .../holiday/api/HolidaysApiResource.java           |  12 +-
 .../holiday/api/HolidaysApiResourceSwagger.java    |   3 +-
 .../holiday/data/HolidayDataValidator.java         |  10 +-
 .../organisation/holiday/domain/Holiday.java       |   7 +-
 .../holiday/domain/HolidayRepository.java          |   1 -
 .../holiday/domain/HolidayRepositoryWrapper.java   |   1 -
 .../service/HolidayReadPlatformService.java        |   1 -
 .../service/HolidayReadPlatformServiceImpl.java    |   1 -
 .../organisation/holiday/service/HolidayUtil.java  |   1 -
 ...lidayWritePlatformServiceJpaRepositoryImpl.java |   7 +-
 .../monetary/api/CurrenciesApiResource.java        |  12 +-
 .../monetary/api/CurrenciesApiResourceSwagger.java |   3 +-
 .../monetary/domain/ApplicationCurrency.java       |   7 +-
 .../organisation/monetary/domain/Money.java        |   1 -
 .../organisation/monetary/domain/MoneyHelper.java  |   7 +-
 .../CurrencyCommandFromApiJsonDeserializer.java    |   6 +-
 .../service/CurrencyReadPlatformService.java       |   1 -
 .../service/CurrencyReadPlatformServiceImpl.java   |   1 -
 ...rencyWritePlatformServiceJpaRepositoryImpl.java |   1 -
 ...rganisationCurrencyReadPlatformServiceImpl.java |   1 -
 .../office/api/OfficeTransactionsApiResource.java  |   4 +-
 .../office/api/OfficesApiResource.java             |  16 +-
 .../office/api/OfficesApiResourceSwagger.java      |   4 +-
 .../organisation/office/data/OfficeData.java       |   2 -
 .../office/data/OfficeTransactionData.java         |   1 -
 .../organisation/office/domain/Office.java         |   2 -
 .../office/domain/OfficeTransaction.java           |   4 +-
 .../office/domain/OrganisationCurrency.java        |   3 +-
 .../OfficeCommandFromApiJsonDeserializer.java      |   6 +-
 ...eTransactionCommandFromApiJsonDeserializer.java |   6 +-
 .../office/service/OfficeReadPlatformService.java  |   1 -
 .../service/OfficeReadPlatformServiceImpl.java     |   1 -
 ...fficeWritePlatformServiceJpaRepositoryImpl.java |   2 -
 .../api/ProvisioningCategoryApiResource.java       |   7 +-
 .../api/ProvisioningCriteriaApiResource.java       |  12 +-
 .../ProvisioningCriteriaApiResourceSwagger.java    |   3 +-
 .../constants/ProvisioningCriteriaConstants.java   |   4 -
 .../data/ProvisioningCriteriaData.java             |   1 -
 .../domain/LoanProductProvisionCriteria.java       |   1 -
 .../provisioning/domain/ProvisioningCategory.java  |   2 -
 .../provisioning/domain/ProvisioningCriteria.java  |  17 +-
 .../domain/ProvisioningCriteriaDefinition.java     |   3 -
 ...isioningCategoryDefinitionJsonDeserializer.java |   6 +-
 ...isioningCriteriaDefinitionJsonDeserializer.java |  10 +-
 .../ProvisioningCategoryReadPlatformService.java   |   1 -
 ...rovisioningCategoryReadPlatformServiceImpl.java |   1 -
 ...egoryWritePlatformServiceJpaRepositoryImpl.java |   2 -
 .../service/ProvisioningCriteriaAssembler.java     |   9 +-
 .../ProvisioningCriteriaReadPlatformService.java   |   1 -
 ...rovisioningCriteriaReadPlatformServiceImpl.java |   1 -
 ...teriaWritePlatformServiceJpaRepositoryImpl.java |   9 +-
 .../organisation/staff/api/StaffApiResource.java   |  16 +-
 .../staff/data/BulkTransferLoanOfficerData.java    |   1 -
 .../data/StaffAccountSummaryCollectionData.java    |   1 -
 .../organisation/staff/data/StaffData.java         |   5 +-
 .../fineract/organisation/staff/domain/Staff.java  |   2 -
 .../StaffCommandFromApiJsonDeserializer.java       |   6 +-
 .../staff/service/StaffReadPlatformService.java    |   1 -
 .../service/StaffReadPlatformServiceImpl.java      |   1 -
 ...StaffWritePlatformServiceJpaRepositoryImpl.java |   2 -
 .../teller/api/CashierApiResource.java             |  10 +-
 .../organisation/teller/api/TellerApiResource.java |  12 +-
 .../teller/api/TellerApiResourceSwagger.java       |   7 +-
 .../teller/api/TellerJournalApiResource.java       |   7 +-
 .../organisation/teller/data/CashierData.java      |   3 +-
 .../teller/data/CashierTransactionData.java        |   1 -
 .../data/CashierTransactionDataValidator.java      |   1 -
 .../data/CashierTransactionsWithSummaryData.java   |   1 -
 .../organisation/teller/data/TellerData.java       |   7 +-
 .../teller/data/TellerTransactionData.java         |   3 +-
 .../organisation/teller/domain/Cashier.java        |  20 +-
 .../teller/domain/CashierTransaction.java          |  20 +-
 .../organisation/teller/domain/Teller.java         |   4 +-
 .../teller/domain/TellerRepository.java            |   3 +-
 .../teller/domain/TellerTransaction.java           |  14 +-
 .../TellerCommandFromApiJsonDeserializer.java      |   8 +-
 .../TellerManagementReadPlatformService.java       |   5 +-
 .../TellerManagementReadPlatformServiceImpl.java   |  21 +-
 .../service/TellerWritePlatformServiceJpaImpl.java |   4 -
 .../workingdays/api/WorkingDaysApiResource.java    |  11 +-
 .../api/WorkingDaysApiResourceSwagger.java         |   3 +-
 .../workingdays/data/WorkingDayValidator.java      |   6 +-
 .../workingdays/data/WorkingDaysData.java          |   3 +-
 .../workingdays/domain/WorkingDays.java            |  12 +-
 .../domain/WorkingDaysRepositoryWrapper.java       |   1 -
 .../WorkingDaysReadPlatformServiceImpl.java        |   1 -
 ...gDaysWritePlatformServiceJpaRepositoryImpl.java |   6 +-
 .../account/api/AccountTransfersApiConstants.java  |   1 -
 .../account/api/AccountTransfersApiResource.java   |  25 +-
 .../api/AccountTransfersApiResourceSwagger.java    |   1 -
 .../api/StandingInstructionApiConstants.java       |   1 -
 .../api/StandingInstructionApiResource.java        |  32 +-
 .../api/StandingInstructionApiResourceSwagger.java |   1 -
 .../api/StandingInstructionHistoryApiResource.java |  23 +-
 ...andingInstructionHistoryApiResourceSwagger.java |   1 -
 .../portfolio/account/data/AccountTransferDTO.java |   1 -
 .../account/data/AccountTransferData.java          |   7 +-
 .../data/AccountTransfersDataValidator.java        |   6 +-
 .../data/AccountTransfersDetailDataValidator.java  |   3 +-
 .../account/data/PortfolioAccountData.java         |   5 +-
 .../account/data/StandingInstructionDTO.java       |   1 -
 .../account/data/StandingInstructionData.java      |   1 -
 .../data/StandingInstructionDataValidator.java     |   6 +-
 .../account/data/StandingInstructionDuesData.java  |   1 -
 .../data/StandingInstructionHistoryData.java       |   2 -
 .../account/domain/AccountAssociations.java        |   3 +-
 .../account/domain/AccountTransferAssembler.java   |   1 -
 .../domain/AccountTransferDetailAssembler.java     |   4 +-
 .../account/domain/AccountTransferDetails.java     |   4 +-
 .../account/domain/AccountTransferRepository.java  |   1 -
 .../domain/AccountTransferStandingInstruction.java |   4 +-
 .../account/domain/AccountTransferTransaction.java |   4 +-
 .../domain/StandingInstructionAssembler.java       |   1 -
 .../domain/StandingInstructionRepository.java      |   1 -
 .../AccountAssociationsReadPlatformService.java    |   1 -
 ...AccountAssociationsReadPlatformServiceImpl.java |   1 -
 .../AccountTransfersReadPlatformService.java       |   1 -
 .../AccountTransfersReadPlatformServiceImpl.java   |   1 -
 .../AccountTransfersWritePlatformService.java      |   1 -
 .../AccountTransfersWritePlatformServiceImpl.java  |   1 -
 .../PortfolioAccountReadPlatformService.java       |   1 -
 .../PortfolioAccountReadPlatformServiceImpl.java   |   1 -
 ...gInstructionHistoryReadPlatformServiceImpl.java |   1 -
 .../StandingInstructionReadPlatformService.java    |   1 -
 ...StandingInstructionReadPlatformServiceImpl.java |   1 -
 ...tandingInstructionWritePlatformServiceImpl.java |   1 -
 .../data/GuarantorAccountSummaryData.java          |   2 -
 .../data/LoanAccountSummaryData.java               |   1 -
 .../data/SavingsAccountSummaryData.java            |   1 -
 .../data/ShareAccountSummaryData.java              |   3 +-
 .../service/AccountDetailsReadPlatformService.java |   1 -
 ...etailsReadPlatformServiceJpaRepositoryImpl.java |   1 -
 .../accounts/api/AccountsApiResource.java          |  19 +-
 .../accounts/api/AccountsApiResourceSwagger.java   |   1 -
 .../service/AccountReadPlatformService.java        |   1 -
 .../api/EntityFieldConfigurationApiResources.java  |  29 +-
 .../portfolio/address/data/AddressData.java        |   3 +-
 .../fineract/portfolio/address/domain/Address.java |   5 +-
 .../address/domain/FieldConfiguration.java         |   1 -
 .../AddressCommandFromApiJsonDeserializer.java     |   7 +-
 .../service/AddressReadPlatformService.java        |   1 -
 .../service/AddressReadPlatformServiceImpl.java    |   1 -
 .../service/AddressWritePlatformServiceImpl.java   |   6 +-
 .../FieldConfigurationReadPlatformService.java     |   1 -
 .../FieldConfigurationReadPlatformServiceImpl.java |   1 -
 .../calendar/api/CalendarsApiResource.java         |   2 -
 .../portfolio/calendar/data/CalendarData.java      |   9 +-
 .../calendar/data/CalendarHistoryDataWrapper.java  |   1 -
 .../portfolio/calendar/domain/Calendar.java        |   7 -
 .../calendar/domain/CalendarFrequencyType.java     |   1 -
 .../portfolio/calendar/domain/CalendarHistory.java |   4 +-
 .../calendar/domain/CalendarInstance.java          |   1 -
 .../domain/CalendarInstanceRepository.java         |   1 -
 .../calendar/domain/CalendarWeekDaysType.java      |   1 -
 .../CalendarCommandFromApiJsonDeserializer.java    |   6 +-
 .../CalendarDropdownReadPlatformService.java       |   1 -
 .../CalendarDropdownReadPlatformServiceImpl.java   |   1 -
 .../calendar/service/CalendarEnumerations.java     |   1 -
 .../service/CalendarReadPlatformService.java       |   1 -
 .../service/CalendarReadPlatformServiceImpl.java   |   1 -
 .../portfolio/calendar/service/CalendarUtils.java  |   5 +-
 ...endarWritePlatformServiceJpaRepositoryImpl.java |   1 -
 .../portfolio/charge/api/ChargesApiResource.java   |  34 +-
 .../charge/api/ChargesApiResourceSwagger.java      |   1 -
 .../fineract/portfolio/charge/data/ChargeData.java |   3 +-
 .../fineract/portfolio/charge/domain/Charge.java   |  13 +-
 ...geDefinitionCommandFromApiJsonDeserializer.java |   6 +-
 .../service/ChargeDropdownReadPlatformService.java |   1 -
 .../ChargeDropdownReadPlatformServiceImpl.java     |  14 +-
 .../charge/service/ChargeReadPlatformService.java  |   1 -
 .../service/ChargeReadPlatformServiceImpl.java     |  15 +-
 ...hargeWritePlatformServiceJpaRepositoryImpl.java |   2 -
 .../client/api/ClientAddressApiResources.java      |  34 +-
 .../portfolio/client/api/ClientApiConstants.java   |   1 -
 .../client/api/ClientChargesApiResource.java       |  33 +-
 .../api/ClientChargesApiResourceSwagger.java       |   1 -
 .../api/ClientFamilyMembersApiResources.java       |   2 -
 .../client/api/ClientIdentifiersApiResource.java   |  34 +-
 .../api/ClientIdentifiersApiResourceSwagger.java   |   1 -
 .../client/api/ClientTransactionsApiResource.java  |  23 +-
 .../api/ClientTransactionsApiResourceSwagger.java  |   1 -
 .../portfolio/client/api/ClientsApiResource.java   |  17 +-
 .../client/api/ClientsApiResourceSwagger.java      |   1 -
 .../client/command/ClientIdentifierCommand.java    |   2 -
 .../client/command/ClientNoteCommand.java          |   1 -
 .../client/data/ClientApiCollectionConstants.java  |   3 +-
 .../portfolio/client/data/ClientChargeData.java    |   1 -
 .../client/data/ClientChargeDataValidator.java     |   6 +-
 .../fineract/portfolio/client/data/ClientData.java |   7 +-
 .../portfolio/client/data/ClientDataValidator.java |  10 +-
 .../client/data/ClientFamilyMembersData.java       |   5 +-
 .../client/data/ClientIdentifierData.java          |   2 -
 .../portfolio/client/data/ClientNonPersonData.java |   3 +-
 .../portfolio/client/data/ClientTimelineData.java  |   3 +-
 .../client/data/ClientTransactionData.java         |   1 -
 .../client/domain/AccountNumberGenerator.java      |   1 -
 .../fineract/portfolio/client/domain/Client.java   |   2 -
 .../portfolio/client/domain/ClientAddress.java     |   1 -
 .../portfolio/client/domain/ClientCharge.java      |   4 +-
 .../client/domain/ClientChargePaidBy.java          |   2 -
 .../client/domain/ClientEnumerations.java          |   1 -
 .../portfolio/client/domain/ClientIdentifier.java  |   2 -
 .../portfolio/client/domain/ClientNonPerson.java   |  17 +-
 .../client/domain/ClientRepositoryWrapper.java     |   1 -
 .../portfolio/client/domain/ClientTransaction.java |   4 +-
 .../client/domain/ClientTransferDetails.java       |   2 -
 ...FamilyMemberCommandFromApiJsonDeserializer.java |   8 +-
 ...ntIdentifierCommandFromApiJsonDeserializer.java |   7 +-
 .../service/ClientAddressReadPlatformService.java  |   1 -
 .../ClientAddressReadPlatformServiceImpl.java      |   1 -
 .../ClientChargeReadPlatformServiceImpl.java       |   1 -
 ...hargeWritePlatformServiceJpaRepositoryImpl.java |   1 -
 .../ClientFamilyMembersReadPlatformService.java    |   1 -
 ...ClientFamilyMembersReadPlatformServiceImpl.java |   2 -
 ...lientFamilyMembersWritePlatformServiceImpl.java |   8 +-
 .../ClientIdentifierReadPlatformService.java       |   1 -
 .../ClientIdentifierReadPlatformServiceImpl.java   |   2 -
 ...ifierWritePlatformServiceJpaRepositoryImpl.java |   2 -
 .../client/service/ClientReadPlatformService.java  |   1 -
 .../service/ClientReadPlatformServiceImpl.java     |   6 -
 .../ClientTransactionReadPlatformService.java      |   1 -
 .../ClientTransactionReadPlatformServiceImpl.java  |   1 -
 ...ctionWritePlatformServiceJpaRepositoryImpl.java |   1 -
 ...lientWritePlatformServiceJpaRepositoryImpl.java |   6 +-
 .../collateral/api/CollateralsApiResource.java     |  32 +-
 .../api/CollateralsApiResourceSwagger.java         |   1 -
 .../collateral/command/CollateralCommand.java      |   1 -
 .../portfolio/collateral/data/CollateralData.java  |   1 -
 .../collateral/domain/LoanCollateral.java          |   2 -
 .../CollateralCommandFromApiJsonDeserializer.java  |   8 +-
 .../collateral/service/CollateralAssembler.java    |   8 +-
 .../service/CollateralReadPlatformService.java     |   1 -
 .../service/CollateralReadPlatformServiceImpl.java |   1 -
 ...teralWritePlatformServiceJpaRepositoryImpl.java |   1 -
 .../collectionsheet/CollectionSheetConstants.java  |   6 -
 .../api/CollectionSheetApiResourceSwagger.java     |   1 -
 .../api/CollectionSheetApiResourse.java            |  21 +-
 .../command/SingleDisbursalCommand.java            |   1 -
 .../command/SingleRepaymentCommand.java            |   1 -
 .../CollectionSheetTransactionDataValidator.java   |  12 +-
 .../data/IndividualCollectionSheetData.java        |   1 -
 .../IndividualCollectionSheetLoanFlatData.java     |   1 -
 .../collectionsheet/data/JLGClientData.java        |   1 -
 .../data/JLGCollectionSheetData.java               |   2 -
 .../data/JLGCollectionSheetFlatData.java           |   1 -
 .../collectionsheet/data/LoanDueData.java          |   1 -
 .../collectionsheet/data/SavingsDueData.java       |   1 -
 ...ulkDisbursalCommandFromApiJsonDeserializer.java |   8 +-
 ...ulkRepaymentCommandFromApiJsonDeserializer.java |   8 +-
 ...heetGenerateCommandFromApiJsonDeserializer.java |   6 +-
 .../CollectionSheetReadPlatformServiceImpl.java    |   1 -
 ...SheetWritePlatformServiceJpaRepositoryImpl.java |   1 -
 .../common/service/BusinessEventListner.java       |   1 -
 .../service/BusinessEventNotifierService.java      |   3 +-
 .../service/BusinessEventNotifierServiceImpl.java  |   1 -
 .../common/service/CommonEnumerations.java         |   1 -
 .../service/DropdownReadPlatformService.java       |   1 -
 .../service/DropdownReadPlatformServiceImpl.java   |   1 -
 .../api/FloatingRatesApiResource.java              |  33 +-
 .../api/FloatingRatesApiResourceSwagger.java       |   1 -
 .../floatingrates/data/FloatingRateDTO.java        |   1 -
 .../floatingrates/data/FloatingRateData.java       |   5 +-
 .../floatingrates/data/FloatingRatePeriodData.java |   5 +-
 .../floatingrates/domain/FloatingRate.java         |  28 +-
 .../floatingrates/domain/FloatingRatePeriod.java   |   2 -
 .../domain/FloatingRateRepository.java             |   1 -
 .../serialization/FloatingRateDataValidator.java   |  13 +-
 .../FloatingRateWritePlatformServiceImpl.java      |   2 -
 .../service/FloatingRatesReadPlatformService.java  |   1 -
 .../FloatingRatesReadPlatformServiceImpl.java      |   1 -
 .../portfolio/fund/api/FundsApiResource.java       |  31 +-
 .../fineract/portfolio/fund/domain/Fund.java       |   2 -
 .../FundCommandFromApiJsonDeserializer.java        |   6 +-
 .../fund/service/FundReadPlatformService.java      |   1 -
 .../fund/service/FundReadPlatformServiceImpl.java  |   1 -
 .../FundWritePlatformServiceJpaRepositoryImpl.java |   2 -
 .../portfolio/group/api/CentersApiResource.java    |  23 +-
 .../group/api/CentersApiResourceSwagger.java       |   1 -
 .../group/api/GroupingTypesApiConstants.java       |   1 -
 .../portfolio/group/api/GroupsApiResource.java     |  16 +-
 .../group/api/GroupsApiResourceSwagger.java        |   1 -
 .../group/api/GroupsLevelApiResource.java          |   2 -
 .../fineract/portfolio/group/data/CenterData.java  |  11 +-
 .../portfolio/group/data/GroupGeneralData.java     |   9 +-
 .../portfolio/group/data/GroupRoleData.java        |   3 +-
 .../portfolio/group/data/GroupSummary.java         |   3 +-
 .../portfolio/group/data/GroupTimelineData.java    |   3 +-
 .../fineract/portfolio/group/domain/Group.java     |   2 -
 .../portfolio/group/domain/GroupLevel.java         |   1 -
 .../portfolio/group/domain/GroupRepository.java    |   1 -
 .../group/domain/GroupRepositoryWrapper.java       |   3 +-
 .../fineract/portfolio/group/domain/GroupRole.java |   2 -
 .../group/domain/StaffAssignmentHistory.java       |   2 -
 .../serialization/GroupRolesDataValidator.java     |   6 +-
 .../serialization/GroupingTypesDataValidator.java  |   8 +-
 .../group/service/AllGroupTypesDataMapper.java     |   1 -
 .../group/service/CenterReadPlatformService.java   |   1 -
 .../service/CenterReadPlatformServiceImpl.java     |   2 -
 .../service/GroupLevelReadPlatformService.java     |   1 -
 .../service/GroupLevelReadPlatformServiceImpl.java |   1 -
 .../group/service/GroupReadPlatformService.java    |   1 -
 .../service/GroupReadPlatformServiceImpl.java      |   1 -
 .../service/GroupRolesReadPlatformService.java     |   1 -
 .../service/GroupRolesReadPlatformServiceImpl.java |   1 -
 ...RolesWritePlatformServiceJpaRepositoryImpl.java |   1 -
 ...TypesWritePlatformServiceJpaRepositoryImpl.java |  32 +-
 .../InterestRateChartApiConstants.java             |   4 -
 .../InterestRateChartSlabApiConstants.java         |   4 -
 .../api/InterestRateChartSlabsApiResource.java     |  47 +-
 .../InterestRateChartSlabsApiResourceSwagger.java  |   1 -
 .../api/InterestRateChartsApiResource.java         |  45 +-
 .../api/InterestRateChartsApiResourceSwagger.java  |   1 -
 .../data/InterestIncentiveData.java                |   1 -
 .../data/InterestIncentiveDataValidator.java       |   8 +-
 .../data/InterestRateChartData.java                |   1 -
 .../data/InterestRateChartDataValidator.java       |  10 +-
 .../data/InterestRateChartSlabData.java            |   1 -
 .../data/InterestRateChartSlabDataValidator.java   |  10 +-
 .../domain/InterestIncentives.java                 |   2 -
 .../domain/InterestIncentivesFields.java           |   2 -
 .../domain/InterestRateChart.java                  |   9 +-
 .../domain/InterestRateChartFields.java            |   4 +-
 .../domain/InterestRateChartSlab.java              |   9 +-
 .../domain/InterestRateChartSlabComparator.java    |   1 -
 .../domain/InterestRateChartSlabFields.java        |   2 -
 .../incentive/AttributeIncentiveCalculation.java   |   1 -
 .../ClientAttributeIncentiveCalculation.java       |   1 -
 .../interestratechart/incentive/IncentiveDTO.java  |   1 -
 .../service/InterestIncentiveAssembler.java        |   8 +-
 ...terestIncentiveDropdownReadPlatformService.java |   1 -
 ...tIncentivesDropdownReadPlatformServiceImpl.java |   1 -
 .../service/InterestIncentivesEnumerations.java    |   1 -
 .../service/InterestRateChartAssembler.java        |   4 +-
 ...terestRateChartDropdownReadPlatformService.java |   1 -
 ...stRateChartDropdownReadPlatformServiceImpl.java |   1 -
 .../service/InterestRateChartEnumerations.java     |   1 -
 .../InterestRateChartReadPlatformService.java      |   1 -
 .../InterestRateChartReadPlatformServiceImpl.java  |   1 -
 .../service/InterestRateChartSlabAssembler.java    |   8 +-
 .../InterestRateChartSlabReadPlatformService.java  |   1 -
 ...terestRateChartSlabReadPlatformServiceImpl.java |   1 -
 ...tSlabWritePlatformServiceJpaRepositoryImpl.java |   1 -
 ...ChartWritePlatformServiceJpaRepositoryImpl.java |   1 -
 .../loanaccount/api/BulkLoansApiResource.java      |   2 -
 .../loanaccount/api/LoanChargesApiResource.java    |  35 +-
 .../api/LoanChargesApiResourceSwagger.java         |   1 -
 .../api/LoanDisbursementDetailApiResource.java     |   2 -
 .../loanaccount/api/LoanScheduleApiResource.java   |  26 +-
 .../api/LoanScheduleApiResourceSwagger.java        |   1 -
 .../api/LoanTransactionsApiResource.java           |  33 +-
 .../api/LoanTransactionsApiResourceSwagger.java    |   1 -
 .../loanaccount/api/LoansApiResource.java          |  37 +-
 .../loanaccount/api/LoansApiResourceSwagger.java   |   1 -
 .../loanaccount/command/LoanChargeCommand.java     |   1 -
 .../loanaccount/command/LoanUpdateCommand.java     |   1 -
 .../command/UpdateLoanOfficerCommand.java          |   1 -
 .../loanaccount/data/DisbursementData.java         |   2 -
 .../loanaccount/data/HolidayDetailDTO.java         |   1 -
 .../loanaccount/data/LoanAccountData.java          |  11 +-
 .../data/LoanApplicationTimelineData.java          |   1 -
 .../loanaccount/data/LoanApprovalData.java         |   2 -
 .../portfolio/loanaccount/data/LoanChargeData.java |   1 -
 .../data/LoanInstallmentChargeData.java            |   1 -
 .../loanaccount/data/LoanScheduleAccrualData.java  |   1 -
 .../loanaccount/data/LoanSummaryData.java          |   1 -
 .../loanaccount/data/LoanTermVariationsData.java   |   1 -
 .../loanaccount/data/LoanTransactionData.java      |   1 -
 .../data/RepaymentScheduleRelatedLoanData.java     |   1 -
 .../portfolio/loanaccount/domain/Loan.java         |  71 ++-
 .../domain/LoanAccountDomainService.java           |   2 -
 .../domain/LoanAccountDomainServiceJpa.java        |   1 -
 .../portfolio/loanaccount/domain/LoanCharge.java   |   2 -
 .../loanaccount/domain/LoanChargePaidBy.java       |   2 -
 .../domain/LoanDisbursementDetails.java            |   2 -
 .../loanaccount/domain/LoanInstallmentCharge.java  |   2 -
 ...LoanInterestRecalcualtionAdditionalDetails.java |   2 -
 .../domain/LoanInterestRecalculationDetails.java   |   1 -
 .../domain/LoanOfficerAssignmentHistory.java       |   2 -
 .../domain/LoanOverdueInstallmentCharge.java       |   1 -
 .../domain/LoanRepaymentDataComparator.java        |   1 -
 .../domain/LoanRepaymentScheduleInstallment.java   |   2 -
 .../LoanRepaymentScheduleProcessingWrapper.java    |   2 -
 ...paymentScheduleTransactionProcessorFactory.java |   2 +-
 .../loanaccount/domain/LoanRepository.java         |   1 -
 .../loanaccount/domain/LoanRepositoryWrapper.java  |   1 -
 ...oanRescheduleRequestToTermVariationMapping.java |   1 -
 .../portfolio/loanaccount/domain/LoanSummary.java  |   2 -
 .../loanaccount/domain/LoanSummaryWrapper.java     |   1 -
 .../loanaccount/domain/LoanTermVariations.java     |   2 -
 .../loanaccount/domain/LoanTopupDetails.java       |   2 -
 .../loanaccount/domain/LoanTrancheCharge.java      |   1 -
 .../domain/LoanTrancheDisbursementCharge.java      |   1 -
 .../loanaccount/domain/LoanTransaction.java        |   2 -
 .../LoanTransactionToRepaymentScheduleMapping.java |   2 -
 ...tLoanRepaymentScheduleTransactionProcessor.java |   1 -
 .../LoanRepaymentScheduleTransactionProcessor.java |   1 -
 ...eLoanRepaymentScheduleTransactionProcessor.java |   1 -
 ...tLoanRepaymentScheduleTransactionProcessor.java |   1 -
 ...eLoanRepaymentScheduleTransactionProcessor.java |   1 -
 ...yLoanRepaymentScheduleTransactionProcessor.java |   1 -
 ...rLoanRepaymentScheduleTransactionProcessor.java |   1 -
 ...rLoanRepaymentScheduleTransactionProcessor.java |   1 -
 ...ILoanRepaymentScheduleTransactionProcessor.java |   1 -
 .../guarantor/api/GuarantorsApiResource.java       |   6 +-
 .../guarantor/command/GuarantorCommand.java        |   1 -
 .../loanaccount/guarantor/data/GuarantorDTO.java   |   1 -
 .../loanaccount/guarantor/data/GuarantorData.java  |   2 -
 .../guarantor/data/GuarantorFundingData.java       |   1 -
 .../loanaccount/guarantor/domain/Guarantor.java    |  18 +-
 .../guarantor/domain/GuarantorFundingDetails.java  |   4 +-
 .../domain/GuarantorFundingTransaction.java        |   4 +-
 .../GuarantorFundingTransactionRepository.java     |   1 -
 .../guarantor/domain/GuarantorRepository.java      |   1 -
 .../GuarantorCommandFromApiJsonDeserializer.java   |   6 +-
 .../service/GuarantorDomainServiceImpl.java        |   2 -
 .../guarantor/service/GuarantorEnumerations.java   |   1 -
 .../service/GuarantorReadPlatformService.java      |   1 -
 .../service/GuarantorReadPlatformServiceImpl.java  |   1 -
 ...ntorWritePlatformServiceJpaRepositoryIImpl.java |  15 +-
 .../loanschedule/data/LoanScheduleDTO.java         |   1 -
 .../loanschedule/data/LoanScheduleData.java        |   1 -
 .../loanschedule/data/LoanScheduleParams.java      |   1 -
 .../loanschedule/data/LoanSchedulePeriodData.java  |   1 -
 .../domain/AbstractLoanScheduleGenerator.java      |   1 -
 ...liningBalanceInterestLoanScheduleGenerator.java |   1 -
 .../domain/DefaultScheduledDateGenerator.java      |  12 +-
 .../domain/FlatInterestLoanScheduleGenerator.java  |   1 -
 .../loanschedule/domain/LoanApplicationTerms.java  |   1 -
 .../domain/LoanRepaymentScheduleHistory.java       |   4 +-
 .../loanschedule/domain/LoanScheduleGenerator.java |   1 -
 .../loanschedule/domain/LoanScheduleModel.java     |   1 -
 .../LoanScheduleModelDisbursementPeriod.java       |   1 -
 .../domain/LoanScheduleModelPeriod.java            |   1 -
 .../domain/LoanScheduleModelRepaymentPeriod.java   |   1 -
 .../domain/ScheduledDateGenerator.java             |   1 -
 .../service/LoanScheduleAssembler.java             |   9 +-
 ...LoanScheduleCalculationPlatformServiceImpl.java |   1 -
 .../LoanScheduleHistoryReadPlatformService.java    |   1 -
 ...LoanScheduleHistoryReadPlatformServiceImpl.java |   1 -
 .../LoanScheduleHistoryWritePlatformService.java   |   1 -
 ...oanScheduleHistoryWritePlatformServiceImpl.java |   2 -
 .../LoanScheduleWritePlatformServiceImpl.java      |   1 -
 .../api/RescheduleLoansApiResource.java            |   2 -
 .../data/LoanRescheduleRequestData.java            |   1 -
 .../data/LoanRescheduleRequestDataValidator.java   |   6 +-
 .../domain/LoanRescheduleModalPeriod.java          |   1 -
 .../rescheduleloan/domain/LoanRescheduleModel.java |   1 -
 .../domain/LoanRescheduleModelRepaymentPeriod.java |   1 -
 .../domain/LoanRescheduleRequest.java              |   4 +-
 .../LoanReschedulePreviewPlatformServiceImpl.java  |   1 -
 .../LoanRescheduleRequestReadPlatformService.java  |   1 -
 ...anRescheduleRequestReadPlatformServiceImpl.java |   4 +-
 ...nRescheduleRequestWritePlatformServiceImpl.java |   1 -
 ...alculateLoanScheduleQueryFromApiJsonHelper.java |   6 +-
 .../LoanApplicationCommandFromApiJsonHelper.java   |  10 +-
 .../LoanApplicationTransitionApiJsonValidator.java |   6 +-
 .../serialization/LoanEventApiJsonValidator.java   |   6 +-
 .../LoanUpdateCommandFromApiJsonDeserializer.java  |   6 +-
 .../VariableLoanScheduleFromApiJsonValidator.java  |  10 +-
 .../service/BulkLoansReadPlatformServiceImpl.java  |   1 -
 .../service/LoanAccrualPlatformService.java        |   1 -
 .../service/LoanAccrualPlatformServiceImpl.java    |   1 -
 .../service/LoanAccrualWritePlatformService.java   |   1 -
 .../LoanAccrualWritePlatformServiceImpl.java       |   2 -
 ...ationWritePlatformServiceJpaRepositoryImpl.java |  49 +-
 .../service/LoanArrearsAgingServiceImpl.java       |   2 -
 .../loanaccount/service/LoanAssembler.java         |   4 +-
 .../loanaccount/service/LoanChargeAssembler.java   |  15 +-
 .../service/LoanChargeReadPlatformService.java     |   1 -
 .../service/LoanChargeReadPlatformServiceImpl.java |   1 -
 .../service/LoanReadPlatformService.java           |   1 -
 .../service/LoanReadPlatformServiceImpl.java       |   3 +-
 .../loanaccount/service/LoanSchedularService.java  |   4 +-
 .../service/LoanSchedularServiceImpl.java          |  15 +-
 .../loanaccount/service/LoanUtilService.java       |   7 +-
 .../service/LoanWritePlatformService.java          |   1 -
 .../LoanWritePlatformServiceJpaRepositoryImpl.java |   8 +-
 .../service/RecalculateInterestPoster.java         |  13 +-
 .../loanproduct/api/LoanProductsApiResource.java   |  33 +-
 .../api/LoanProductsApiResourceSwagger.java        |   1 -
 .../LoanProductBorrowerCycleVariationData.java     |   5 +-
 .../loanproduct/data/LoanProductData.java          |  15 +-
 .../data/LoanProductInterestRecalculationData.java |   9 +-
 .../portfolio/loanproduct/domain/LoanProduct.java  |  29 +-
 .../domain/LoanProductBorrowerCycleVariations.java |   2 -
 .../domain/LoanProductConfigurableAttributes.java  |  11 +-
 .../domain/LoanProductFloatingRates.java           |   4 +-
 .../domain/LoanProductGuaranteeDetails.java        |   4 +-
 .../LoanProductInterestRecalculationDetails.java   |   4 +-
 .../domain/LoanProductMinMaxConstraints.java       |   2 -
 ...oductMinimumRepaymentScheduleRelatedDetail.java |   1 -
 .../domain/LoanProductRelatedDetail.java           |   2 -
 .../loanproduct/domain/LoanProductRepository.java  |   1 -
 .../domain/LoanProductTrancheDetails.java          |   2 -
 .../LoanProductVariableInstallmentConfig.java      |   4 +-
 .../domain/LoanTransactionProcessingStrategy.java  |   3 +-
 .../domain/RecalculationFrequencyType.java         |   1 -
 .../productmix/api/ProductMixApiResource.java      |   2 -
 .../productmix/data/ProductMixData.java            |   1 -
 .../loanproduct/productmix/domain/ProductMix.java  |   3 +-
 .../productmix/domain/ProductMixRepository.java    |   1 -
 .../serialization/ProductMixDataValidator.java     |   6 +-
 .../service/ProductMixReadPlatformService.java     |   1 -
 .../service/ProductMixReadPlatformServiceImpl.java |   1 -
 ...ctMixWritePlatformServiceJpaRepositoryImpl.java |   1 -
 .../serialization/LoanProductDataValidator.java    |  10 +-
 .../service/LoanDropdownReadPlatformService.java   |   1 -
 .../LoanDropdownReadPlatformServiceImpl.java       |  37 +-
 .../service/LoanProductReadPlatformService.java    |   1 -
 .../LoanProductReadPlatformServiceImpl.java        |   1 -
 ...oductWritePlatformServiceJpaRepositoryImpl.java |   9 +-
 .../portfolio/meeting/MeetingApiConstants.java     |   4 -
 .../portfolio/meeting/api/MeetingsApiResource.java |   2 -
 .../attendance/domain/ClientAttendance.java        |   3 +-
 .../AttendanceDropdownReadPlatformService.java     |   1 -
 .../AttendanceDropdownReadPlatformServiceImpl.java |   1 -
 .../attendance/service/AttendanceEnumerations.java |   1 -
 .../ClientAttendanceReadPlatformService.java       |   1 -
 .../ClientAttendanceReadPlatformServiceImpl.java   |   1 -
 .../portfolio/meeting/data/MeetingData.java        |   1 -
 .../meeting/data/MeetingDataValidator.java         |  10 +-
 .../fineract/portfolio/meeting/domain/Meeting.java |   4 +-
 .../meeting/domain/MeetingRepository.java          |   1 -
 .../service/MeetingReadPlatformService.java        |   1 -
 .../service/MeetingReadPlatformServiceImpl.java    |   1 -
 ...etingWritePlatformServiceJpaRepositoryImpl.java |   8 +-
 .../portfolio/note/api/NotesApiResource.java       |  34 +-
 .../fineract/portfolio/note/domain/Note.java       |   2 -
 .../portfolio/note/domain/NoteRepository.java      |   1 -
 .../NoteCommandFromApiJsonDeserializer.java        |   6 +-
 .../note/service/NoteReadPlatformService.java      |   1 -
 .../note/service/NoteReadPlatformServiceImpl.java  |   1 -
 .../NoteWritePlatformServiceJpaRepositoryImpl.java |   2 -
 .../paymentdetail/PaymentDetailConstants.java      |   4 -
 .../paymentdetail/data/PaymentDetailData.java      |   3 +-
 .../paymentdetail/domain/PaymentDetail.java        |   4 +-
 .../domain/PaymentDetailAssembler.java             |   3 +-
 .../service/PaymentDetailWritePlatformService.java |   1 -
 ...etailWritePlatformServiceJpaRepositoryImpl.java |   1 -
 .../paymenttype/api/PaymentTypeApiResource.java    |  28 +-
 .../paymenttype/data/PaymentTypeData.java          |   3 -
 .../paymenttype/data/PaymentTypeDataValidator.java |   6 +-
 .../portfolio/paymenttype/domain/PaymentType.java  |   4 +-
 .../service/PaymentTypeReadPlatformService.java    |   1 -
 .../PaymentTypeReadPlatformServiceImpl.java        |   1 -
 .../service/PaymentTypeWriteServiceImpl.java       |   1 -
 .../products/api/ProductsApiResource.java          |  24 +-
 .../products/api/ProductsApiResourceSwagger.java   |   1 -
 .../service/ProductReadPlatformService.java        |   1 -
 .../savings/DepositAccountOnClosureType.java       |   1 -
 .../portfolio/savings/DepositsApiConstants.java    |   1 -
 .../portfolio/savings/SavingsApiConstants.java     |   8 -
 ...itAccountOnHoldFundTransactionsApiResource.java |   1 -
 ...FixedDepositAccountTransactionsApiResource.java |   3 -
 .../api/FixedDepositAccountsApiResource.java       |  16 +-
 .../FixedDepositAccountsApiResourceSwagger.java    |   1 -
 .../api/FixedDepositProductsApiResource.java       |  41 +-
 .../FixedDepositProductsApiResourceSwagger.java    |   1 -
 ...rringDepositAccountTransactionsApiResource.java |  33 +-
 ...positAccountTransactionsApiResourceSwagger.java |   1 -
 .../api/RecurringDepositAccountsApiResource.java   |  16 +-
 ...RecurringDepositAccountsApiResourceSwagger.java |   1 -
 .../api/RecurringDepositProductsApiResource.java   |  41 +-
 ...RecurringDepositProductsApiResourceSwagger.java |   1 -
 .../api/SavingsAccountChargesApiResource.java      |  37 +-
 .../SavingsAccountChargesApiResourceSwagger.java   |   1 -
 .../api/SavingsAccountTransactionsApiResource.java |   2 -
 .../savings/api/SavingsAccountsApiResource.java    |  16 +-
 .../api/SavingsAccountsApiResourceSwagger.java     |   1 -
 .../savings/api/SavingsApiSetConstants.java        |   7 +-
 .../savings/api/SavingsProductsApiResource.java    |  40 +-
 .../api/SavingsProductsApiResourceSwagger.java     |   1 -
 .../savings/data/ClosingOfSavingsAccounts.java     |   2 -
 .../portfolio/savings/data/DepositAccountData.java |   1 -
 .../savings/data/DepositAccountDataValidator.java  |  79 ++-
 .../data/DepositAccountInterestIncentiveData.java  |   1 -
 .../data/DepositAccountInterestRateChartData.java  |   1 -
 .../DepositAccountInterestRateChartSlabData.java   |   1 -
 .../data/DepositAccountOnHoldTransactionData.java  |   1 -
 .../DepositAccountTransactionDataValidator.java    |   6 +-
 .../portfolio/savings/data/DepositProductData.java |   1 -
 .../savings/data/DepositProductDataValidator.java  |  14 +-
 .../savings/data/FixedDepositAccountData.java      |   2 -
 .../savings/data/FixedDepositProductData.java      |   1 -
 .../savings/data/RecurringDepositAccountData.java  |   2 -
 .../savings/data/RecurringDepositProductData.java  |   1 -
 .../SavingsAccountApplicationTimelineData.java     |   3 +-
 .../savings/data/SavingsAccountChargeData.java     |   7 +-
 .../data/SavingsAccountChargeDataValidator.java    |   6 +-
 .../savings/data/SavingsAccountConstant.java       |   3 +-
 .../portfolio/savings/data/SavingsAccountData.java |  11 +-
 .../savings/data/SavingsAccountDataValidator.java  |  11 +-
 .../savings/data/SavingsAccountSummaryData.java    |   5 +-
 .../savings/data/SavingsAccountTransactionDTO.java |   1 -
 .../data/SavingsAccountTransactionData.java        |   7 +-
 .../SavingsAccountTransactionDataValidator.java    |  12 +-
 .../data/SavingsAccountTransactionEnumData.java    |   3 +-
 .../portfolio/savings/data/SavingsActivation.java  |   2 -
 .../portfolio/savings/data/SavingsApproval.java    |   2 -
 .../portfolio/savings/data/SavingsProductData.java |  11 +-
 .../savings/data/SavingsProductDataValidator.java  |  24 +-
 .../savings/domain/DepositAccountAssembler.java    |   8 +-
 .../domain/DepositAccountDomainService.java        |   1 -
 .../domain/DepositAccountDomainServiceJpa.java     |   1 -
 .../domain/DepositAccountInterestIncentive.java    |   3 +-
 .../domain/DepositAccountInterestIncentives.java   |   1 -
 .../domain/DepositAccountInterestRateChart.java    |   2 -
 .../DepositAccountInterestRateChartSlabs.java      |   2 -
 .../domain/DepositAccountOnHoldTransaction.java    |  17 +-
 .../DepositAccountOnHoldTransactionRepository.java |   3 +-
 .../domain/DepositAccountRecurringDetail.java      |   2 -
 .../domain/DepositAccountTermAndPreClosure.java    |   2 -
 .../savings/domain/DepositPreClosureDetail.java    |   2 -
 .../domain/DepositProductAmountDetails.java        |   2 -
 .../savings/domain/DepositProductAssembler.java    |   8 +-
 .../domain/DepositProductRecurringDetail.java      |   2 -
 .../domain/DepositProductTermAndPreClosure.java    |   2 -
 .../savings/domain/DepositRecurringDetail.java     |   2 -
 .../savings/domain/DepositTermDetail.java          |   2 -
 .../savings/domain/FixedDepositAccount.java        |   2 -
 .../savings/domain/FixedDepositProduct.java        |   7 +-
 .../savings/domain/RecurringDepositAccount.java    |   2 -
 .../savings/domain/RecurringDepositProduct.java    |   2 -
 .../RecurringDepositScheduleInstallment.java       |   2 -
 .../portfolio/savings/domain/SavingsAccount.java   |   7 +-
 .../savings/domain/SavingsAccountAssembler.java    |   4 +-
 .../savings/domain/SavingsAccountCharge.java       |  32 +-
 .../domain/SavingsAccountChargeAssembler.java      |   8 +-
 .../savings/domain/SavingsAccountChargePaidBy.java |   2 -
 .../domain/SavingsAccountChargeRepository.java     |   1 -
 .../SavingsAccountChargeRepositoryWrapper.java     |   1 -
 .../domain/SavingsAccountDomainService.java        |   1 -
 .../domain/SavingsAccountDomainServiceJpa.java     |  17 +-
 .../savings/domain/SavingsAccountRepository.java   |   1 -
 .../domain/SavingsAccountRepositoryWrapper.java    |   1 -
 .../savings/domain/SavingsAccountSummary.java      |   2 -
 .../savings/domain/SavingsAccountTransaction.java  |   2 -
 .../SavingsAccountTransactionSummaryWrapper.java   |   1 -
 .../SavingsAccountTransactionTaxDetails.java       |   2 -
 .../portfolio/savings/domain/SavingsHelper.java    |   1 -
 .../domain/SavingsOfficerAssignmentHistory.java    |   2 -
 .../portfolio/savings/domain/SavingsProduct.java   |   7 +-
 .../savings/domain/SavingsProductAssembler.java    |  16 +-
 .../domain/SavingsProductChargeAssembler.java      |   8 +-
 .../domain/interest/AnnualCompoundingPeriod.java   |   1 -
 .../domain/interest/BiAnnualCompoundingPeriod.java |   1 -
 .../domain/interest/CompoundInterestHelper.java    |   1 -
 .../savings/domain/interest/CompoundingPeriod.java |   1 -
 .../domain/interest/DailyCompoundingPeriod.java    |   1 -
 .../savings/domain/interest/EndOfDayBalance.java   |   1 -
 .../domain/interest/MonthlyCompoundingPeriod.java  |   1 -
 .../savings/domain/interest/PostingPeriod.java     |   1 -
 .../interest/QuarterlyCompoundingPeriod.java       |   1 -
 .../InsufficientAccountBalanceException.java       |   1 -
 ...ntInterestRateChartReadPlatformServiceImpl.java |   1 -
 ...ntOnHoldTransactionReadPlatformServiceImpl.java |   1 -
 ...untPreMatureCalculationPlatformServiceImpl.java |   4 +-
 .../service/DepositAccountReadPlatformService.java |   1 -
 .../DepositAccountReadPlatformServiceImpl.java     |   2 -
 ...countWritePlatformServiceJpaRepositoryImpl.java |   1 -
 ...ocessWritePlatformServiceJpaRepositoryImpl.java |  37 +-
 .../service/DepositProductReadPlatformService.java |   1 -
 .../DepositProductReadPlatformServiceImpl.java     |   1 -
 .../DepositsDropdownReadPlatformService.java       |   1 -
 .../DepositsDropdownReadPlatformServiceImpl.java   |   1 -
 ...oductWritePlatformServiceJpaRepositoryImpl.java |   2 -
 ...oductWritePlatformServiceJpaRepositoryImpl.java |   2 -
 ...countApplicationTransitionApiJsonValidator.java |   6 +-
 .../SavingsAccountChargeReadPlatformService.java   |   1 -
 ...avingsAccountChargeReadPlatformServiceImpl.java |   1 -
 .../service/SavingsAccountReadPlatformService.java |   1 -
 .../SavingsAccountReadPlatformServiceImpl.java     |   1 -
 .../SavingsAccountWritePlatformService.java        |   1 -
 ...countWritePlatformServiceJpaRepositoryImpl.java |   1 -
 ...ocessWritePlatformServiceJpaRepositoryImpl.java |  19 +-
 .../SavingsDropdownReadPlatformService.java        |   1 -
 .../SavingsDropdownReadPlatformServiceImpl.java    |   1 -
 .../savings/service/SavingsEnumerations.java       |   1 -
 .../service/SavingsProductReadPlatformService.java |   1 -
 .../SavingsProductReadPlatformServiceImpl.java     |   1 -
 ...oductWritePlatformServiceJpaRepositoryImpl.java |   2 -
 .../service/SavingsSchedularServiceImpl.java       |   3 +-
 .../portfolio/search/api/SearchApiResource.java    |  13 +-
 .../search/api/SearchApiResourceSwagger.java       |   3 -
 .../search/data/AdHocQueryDataValidator.java       |   6 +-
 .../search/data/AdHocQuerySearchConditions.java    |   1 -
 .../search/data/AdHocQuerySearchConstants.java     |   4 -
 .../search/data/AdHocSearchQueryData.java          |   1 -
 .../search/service/SearchReadPlatformService.java  |   1 -
 .../service/SearchReadPlatformServiceImpl.java     |   1 -
 .../api/SelfAccountTransferApiResource.java        |  10 +-
 .../api/SelfAccountTransferApiResourceSwagger.java |   1 -
 .../api/SelfBeneficiariesTPTApiConstants.java      |   4 -
 .../api/SelfBeneficiariesTPTApiResource.java       |  34 +-
 .../SelfBeneficiariesTPTApiResourceSwagger.java    |   1 -
 .../data/SelfAccountTransferDataValidator.java     |   4 +-
 .../account/data/SelfBeneficiariesTPTData.java     |   1 -
 .../data/SelfBeneficiariesTPTDataValidator.java    |  12 +-
 .../self/account/domain/SelfBeneficiariesTPT.java  |   3 +-
 .../service/SelfAccountTransferReadService.java    |   1 -
 .../SelfAccountTransferReadServiceImpl.java        |   1 -
 .../SelfBeneficiariesTPTReadPlatformService.java   |   1 -
 ...elfBeneficiariesTPTReadPlatformServiceImpl.java |   1 -
 ...lfBeneficiariesTPTWritePlatformServiceImpl.java |   1 -
 .../self/client/api/SelfClientsApiResource.java    |  17 +-
 .../client/api/SelfClientsApiResourceSwagger.java  |   1 -
 .../self/client/data/SelfClientDataValidator.java  |   2 -
 .../self/loanaccount/api/SelfLoansApiResource.java |  28 +-
 .../api/SelfLoansApiResourceSwagger.java           |   1 -
 .../loanaccount/data/SelfLoansDataValidator.java   |   5 +-
 .../self/pockets/api/PocketApiResource.java        |   9 +-
 .../self/pockets/api/PocketApiResourceSwagger.java |   3 -
 .../pockets/data/PocketAccountMappingData.java     |   1 -
 .../self/pockets/data/PocketDataValidator.java     |   8 +-
 .../portfolio/self/pockets/domain/Pocket.java      |   1 -
 .../self/pockets/domain/PocketAccountMapping.java  |   1 -
 .../domain/PocketAccountMappingRepository.java     |   1 -
 .../PocketAccountMappingRepositoryWrapper.java     |   1 -
 .../service/AccountEntityServiceFactory.java       |   1 -
 .../AccountEntityServiceForShareAccountsImpl.java  |   1 -
 ...ocketAccountMappingReadPlatformServiceImpl.java |   1 -
 .../service/PocketWritePlatformServiceImpl.java    |   8 +-
 .../products/api/SelfLoanProductsApiResource.java  |   5 +-
 .../api/SelfSavingsProductsApiResource.java        |   1 -
 .../products/api/SelfShareProductsApiResource.java |   1 -
 .../api/SelfServiceRegistrationApiResource.java    |   6 +-
 .../domain/SelfServiceRegistration.java            |   2 -
 ...erviceRegistrationWritePlatformServiceImpl.java |   9 +-
 .../self/runreport/SelfRunReportApiResource.java   |   9 +-
 .../runreport/SelfRunReportApiResourceSwagger.java |   3 -
 .../self/savings/api/SelfSavingsApiResource.java   |  10 +-
 .../savings/api/SelfSavingsApiResourceSwagger.java |   1 -
 .../savings/data/SelfSavingsDataValidator.java     |   5 +-
 .../api/SelfAuthenticationApiResource.java         |  17 +-
 .../api/SelfAuthenticationApiResourceSwagger.java  |   1 -
 .../self/security/api/SelfUserApiResource.java     |  25 +-
 .../security/api/SelfUserDetailsApiResource.java   |  19 +-
 .../api/SelfUserDetailsApiResourceSwagger.java     |   1 -
 .../api/SelfShareAccountsApiResource.java          |  10 +-
 .../api/SelfShareAccountsApiResourceSwagger.java   |   3 -
 .../data/SelfShareAccountsDataValidator.java       |   4 +-
 .../self/spm/api/SelfScorecardApiResource.java     |   6 +-
 .../portfolio/self/spm/api/SelfSpmApiResource.java |   6 +-
 .../data/ShareAccountApplicationTimelineData.java  |   3 +-
 .../shareaccounts/data/ShareAccountChargeData.java |   7 +-
 .../shareaccounts/data/ShareAccountData.java       |   7 +-
 .../data/ShareAccountDividendData.java             |   3 +-
 .../data/ShareAccountTransactionData.java          |   5 +-
 .../shareaccounts/domain/ShareAccount.java         |   5 +-
 .../shareaccounts/domain/ShareAccountCharge.java   |   4 -
 .../domain/ShareAccountChargePaidBy.java           |   2 -
 .../domain/ShareAccountDividendDetails.java        |   2 -
 .../domain/ShareAccountTransaction.java            |  14 +-
 .../serialization/ShareAccountDataSerializer.java  |  10 +-
 .../PurchasedSharesReadPlatformService.java        |   1 -
 .../PurchasedSharesReadPlatformServiceImpl.java    |   1 -
 .../ShareAccountChargeReadPlatformService.java     |   1 -
 .../ShareAccountChargeReadPlatformServiceImpl.java |   1 -
 .../service/ShareAccountCommandsServiceImpl.java   |   3 +-
 .../ShareAccountDividendReadPlatformService.java   |   1 -
 ...hareAccountDividendReadPlatformServiceImpl.java |   1 -
 .../service/ShareAccountReadPlatformService.java   |   1 -
 .../ShareAccountReadPlatformServiceImpl.java       |   1 -
 ...countWritePlatformServiceJpaRepositoryImpl.java |   6 +-
 .../api/ShareDividendApiResource.java              |   5 +-
 .../constants/ShareProductApiConstants.java        |   6 -
 .../shareproducts/data/ShareProductData.java       |   1 -
 .../data/ShareProductDividendPayOutData.java       |   1 -
 .../shareproducts/domain/ShareProduct.java         |   3 -
 .../domain/ShareProductDividendPayOutDetails.java  |   2 -
 .../domain/ShareProductMarketPrice.java            |   2 -
 .../serialization/ShareProductDataSerializer.java  |  10 +-
 .../service/ShareProductCommandsServiceImpl.java   |   3 +-
 .../service/ShareProductDividendAssembler.java     |   3 +-
 ...hareProductDividendReadPlatformServiceImpl.java |   1 -
 .../ShareProductDropdownReadPlatformService.java   |   1 -
 ...hareProductDropdownReadPlatformServiceImpl.java |   1 -
 .../ShareProductReadPlatformServiceImpl.java       |   1 -
 ...oductWritePlatformServiceJpaRepositoryImpl.java |   7 +-
 .../portfolio/tax/api/TaxComponentApiResource.java |  27 +-
 .../tax/api/TaxComponentApiResourceSwagger.java    |   1 -
 .../portfolio/tax/api/TaxGroupApiResource.java     |  27 +-
 .../tax/api/TaxGroupApiResourceSwagger.java        |   1 -
 .../portfolio/tax/data/TaxComponentData.java       |   1 -
 .../tax/data/TaxComponentHistoryData.java          |   3 +-
 .../portfolio/tax/data/TaxGroupMappingsData.java   |   3 +-
 .../portfolio/tax/domain/TaxComponent.java         |   2 -
 .../portfolio/tax/domain/TaxComponentHistory.java  |   2 -
 .../fineract/portfolio/tax/domain/TaxGroup.java    |   2 -
 .../portfolio/tax/domain/TaxGroupMappings.java     |   2 -
 .../portfolio/tax/serialization/TaxValidator.java  |  10 +-
 .../portfolio/tax/service/TaxAssembler.java        |   8 +-
 .../tax/service/TaxReadPlatformService.java        |   1 -
 .../tax/service/TaxReadPlatformServiceImpl.java    |   1 -
 .../fineract/portfolio/tax/service/TaxUtils.java   |   1 -
 .../tax/service/TaxWritePlatformServiceImpl.java   |   1 -
 .../transfer/data/TransfersDataValidator.java      |   7 +-
 ...nsferWritePlatformServiceJpaRepositoryImpl.java |  19 +-
 .../service/ScheduledJobRunnerService.java         |   2 -
 .../service/ScheduledJobRunnerServiceImpl.java     |   6 +-
 .../fineract/spm/api/LookupTableApiResource.java   |  23 +-
 .../fineract/spm/api/ScorecardApiResource.java     |  10 +-
 .../apache/fineract/spm/api/SpmApiResource.java    |  15 +-
 .../org/apache/fineract/spm/domain/Component.java  |   8 +-
 .../apache/fineract/spm/domain/LookupTable.java    |   8 +-
 .../org/apache/fineract/spm/domain/Question.java   |  13 +-
 .../org/apache/fineract/spm/domain/Response.java   |   8 +-
 .../org/apache/fineract/spm/domain/Scorecard.java  |  15 +-
 .../org/apache/fineract/spm/domain/Survey.java     |  14 +-
 .../fineract/spm/domain/SurveyValidator.java       |   1 -
 .../spm/repository/LookupTableRepository.java      |   3 +-
 .../spm/repository/ScorecardRepository.java        |   3 +-
 .../fineract/spm/repository/SurveyRepository.java  |   5 +-
 .../fineract/spm/service/LookupTableService.java   |   3 +-
 .../spm/service/ScorecardReadPlatformService.java  |   1 -
 .../service/ScorecardReadPlatformServiceImpl.java  |   1 -
 .../fineract/spm/service/ScorecardService.java     |   4 +-
 .../apache/fineract/spm/service/SpmService.java    |  10 +-
 .../fineract/spm/util/LookupTableMapper.java       |   7 +-
 .../apache/fineract/spm/util/ScorecardMapper.java  |   1 -
 .../org/apache/fineract/spm/util/SurveyMapper.java |   5 +-
 .../template/api/TemplatesApiResource.java         |  12 +-
 .../template/api/TemplatesApiResourcesSwagger.java |   3 +-
 .../fineract/template/data/TemplateData.java       |   1 -
 .../apache/fineract/template/domain/Template.java  |  19 +-
 .../fineract/template/domain/TemplateEntity.java   |   3 +-
 .../template/domain/TemplateEntitySerializer.java  |   1 -
 .../fineract/template/domain/TemplateMapper.java   |   1 -
 .../template/domain/TemplateRepository.java        |   1 -
 .../fineract/template/domain/TemplateType.java     |   3 +-
 .../template/domain/TemplateTypeSerializer.java    |   1 -
 .../template/service/JpaTemplateDomainService.java |   6 +-
 .../template/service/TemplateDomainService.java    |   1 -
 .../template/service/TemplateMergeService.java     |  22 +-
 .../fineract/template/service/TrustModifier.java   |   1 -
 .../api/PasswordPreferencesApiResource.java        |  12 +-
 .../api/PermissionsApiResource.java                |  12 +-
 .../useradministration/api/RolesApiResource.java   |  12 +-
 .../api/RolesApiResourceSwagger.java               |   1 -
 .../useradministration/api/UsersApiResource.java   |  27 +-
 .../api/UsersApiResourceSwagger.java               |   3 +-
 .../useradministration/data/AppUserData.java       |   1 -
 .../data/PasswordPreferencesDataValidator.java     |   6 +-
 .../useradministration/domain/AppUser.java         |   4 +-
 .../domain/AppUserClientMapping.java               |   3 +-
 .../domain/AppUserPreviousPassword.java            |   4 +-
 .../domain/AppUserPreviousPasswordRepository.java  |   1 -
 .../domain/PasswordValidationPolicy.java           |   2 -
 .../useradministration/domain/Permission.java      |   4 +-
 .../fineract/useradministration/domain/Role.java   |   2 -
 .../PermissionsCommandFromApiJsonDeserializer.java |   4 +-
 .../service/AppUserReadPlatformService.java        |   3 +-
 .../service/AppUserReadPlatformServiceImpl.java    |   1 -
 ...pUserWritePlatformServiceJpaRepositoryImpl.java |  18 +-
 ...encesWritePlatformServiceJpaRepositoryImpl.java |   1 -
 ...asswordValidationPolicyReadPlatformService.java |   1 -
 ...ordValidationPolicyReadPlatformServiceImpl.java |   1 -
 .../service/PermissionReadPlatformService.java     |   1 -
 .../service/PermissionReadPlatformServiceImpl.java |   1 -
 ...ssionWritePlatformServiceJpaRepositoryImpl.java |   1 -
 .../service/RoleDataValidator.java                 |   6 +-
 .../service/RoleReadPlatformService.java           |   3 +-
 .../service/RoleReadPlatformServiceImpl.java       |   1 -
 .../RoleWritePlatformServiceJpaRepositoryImpl.java |   2 -
 .../service/UserDataValidator.java                 |   8 +-
 .../org/apache/fineract/batch/BatchBuilder.java    |   2 -
 .../java/org/apache/fineract/common/Utils.java     |  10 +-
 ...TestsWithoutDatabaseAndNoJobsConfiguration.java |   1 -
 .../ReadTaxonomyMappingServiceImplTest.java        |   1 -
 .../mix/report/service/XBRLBuilderTest.java        |  27 +-
 .../org/apache/fineract/notification/Listener.java |   6 +-
 .../apache/fineract/notification/ListenerTest.java |   7 +-
 .../apache/fineract/notification/SenderTest.java   |   7 +-
 .../apache/fineract/notification/StorageTest.java  |  16 +-
 .../apache/fineract/notification/TopicTest.java    |   3 +-
 ...nRepaymentScheduleTransactionProcessorTest.java |   1 -
 ...nRepaymentScheduleTransactionProcessorTest.java |   1 -
 .../LoanProductRelatedDetailTestHelper.java        |   1 -
 .../LoanRepaymentScheduleInstallmentBuilder.java   |   1 -
 .../loanaccount/LoanScheduleTestDataHelper.java    |   1 -
 .../portfolio/loanaccount/MoneyBuilder.java        |   1 -
 .../template/TemplateMergeServiceTest.java         |  14 +-
 1670 files changed, 5003 insertions(+), 5129 deletions(-)

diff --git a/README.md b/README.md
index e845786..e091659 100644
--- a/README.md
+++ b/README.md
@@ -107,6 +107,14 @@ _(Note that in previous versions, the `mysqlserver` environment variable used at
 and the `mysqlserver` environment variable is now no longer supported.)_
 
 
+Checkstyle
+============
+
+This project enforces [its code conventions](fineract-provider/config/checkstyle/checkstyle.xml) using Checkstyle.
+We recommend that you configure your favourite Java IDE to match those conventions.  For Eclipse, you can
+File > Import > General > Preferences our [config/fineractdev-eclipse-preferences.epf](config/fineractdev-eclipse-preferences.epf).
+
+
 Version
 ============
 
diff --git a/config/fineractdev-eclipse-preferences.epf b/config/fineractdev-eclipse-preferences.epf
index 373d3ef..cf37f62 100644
--- a/config/fineractdev-eclipse-preferences.epf
+++ b/config/fineractdev-eclipse-preferences.epf
@@ -1,110 +1,470 @@
-#Fri Nov 23 23:01:54 GMT 2012
-/instance/org.eclipse.jdt.ui/cleanup.always_use_parentheses_in_expressions=false
-/instance/org.eclipse.jdt.ui/cleanup.make_parameters_final=true
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-/instance/org.eclipse.jdt.ui/cleanup.add_serial_version_id=false
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=disabled
+#Mon Jan 27 22:27:46 CET 2020
+\!/=
 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.ondemandthreshold=99
-/instance/org.eclipse.jdt.ui/cleanup.always_use_blocks=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.localPrefixes=
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.localSuffixes=
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.compliance=1.8
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-/instance/org.eclipse.jdt.ui/cleanup.remove_trailing_whitespaces=true
-/instance/org.eclipse.jdt.ui/cleanup.make_private_fields_final=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
-/instance/org.eclipse.jdt.ui/cleanup.add_missing_override_annotations_interface_methods=true
-@org.eclipse.jdt.ui=3.7.1.r371_v20110824-0800
-/instance/org.eclipse.jdt.ui/cleanup.add_missing_nls_tags=false
-/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.ignorelowercasenames=true
-/instance/org.eclipse.jdt.ui/cleanup.remove_private_constructors=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=disabled
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.release=enabled
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.source=1.8
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.align_with_spaces=false
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration=0
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method=1
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch=0
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.format_header=false
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.format_html=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.format_source_code=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.line_length=80
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.compact_else_if=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.continuation_indentation=2
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=false
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_empty_lines=false
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.indentation.size=4
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_not_operator=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_if_empty
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_if_empty
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_if_empty
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_if_empty
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_if_empty
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_if_empty
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_if_empty
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_if_empty
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_if_empty
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_if_empty
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.lineSplit=140
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block=0
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block=0
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block=0
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body=0
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block=0
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.tabulation.char=space
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.tabulation.size=4
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.text_block_indentation=0
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.use_on_off_tags=false
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 /instance/org.eclipse.jdt.ui/cleanup.add_default_serial_version_id=true
-/instance/org.eclipse.jdt.ui/cleanup.use_blocks=true
+/instance/org.eclipse.jdt.ui/cleanup.add_generated_serial_version_id=false
+/instance/org.eclipse.jdt.ui/cleanup.add_missing_annotations=true
+/instance/org.eclipse.jdt.ui/cleanup.add_missing_deprecated_annotations=true
+/instance/org.eclipse.jdt.ui/cleanup.add_missing_methods=true
+/instance/org.eclipse.jdt.ui/cleanup.add_missing_nls_tags=false
+/instance/org.eclipse.jdt.ui/cleanup.add_missing_override_annotations=true
+/instance/org.eclipse.jdt.ui/cleanup.add_missing_override_annotations_interface_methods=true
+/instance/org.eclipse.jdt.ui/cleanup.add_serial_version_id=false
+/instance/org.eclipse.jdt.ui/cleanup.always_use_blocks=true
+/instance/org.eclipse.jdt.ui/cleanup.always_use_parentheses_in_expressions=false
+/instance/org.eclipse.jdt.ui/cleanup.always_use_this_for_non_static_field_access=true
+/instance/org.eclipse.jdt.ui/cleanup.always_use_this_for_non_static_method_access=false
 /instance/org.eclipse.jdt.ui/cleanup.convert_to_enhanced_for_loop=false
-file_export_version=3.0
-/instance/org.eclipse.jdt.ui/formatter_settings_version=12
-/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.exception.name=e
-/instance/org.eclipse.jdt.ui/cleanup.qualify_static_field_accesses_with_declaring_class=false
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.cleanupprofiles=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?>\r\n<profiles version\="2">\r\n<profile kind\="CleanUpProfile" name\="fineractdevprofile" version\="2">\r\n<setting id\="cleanup.remove_unused_private_fields" value\="true"/>\r\n<setting id\="cleanup.always_use_parentheses_in_expressions" value\="false"/>\r\n<setting id\="cleanup.never_use_blocks" value\="false"/>\r\n<setting id\="cleanup.remove_unused_private_methods" [...]
-/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.importorder=java;javax;org;com;
-/instance/org.eclipse.jdt.ui/cleanup_profile=_fineractdevprofile
-/instance/org.eclipse.jdt.ui/cleanup.qualify_static_member_accesses_with_declaring_class=true
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-/instance/org.eclipse.jdt.ui/cleanup.use_parentheses_in_expressions=false
-\!/=
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.compliance=1.6
-/instance/org.eclipse.jdt.ui/cleanup.sort_members=false
-/instance/org.eclipse.jdt.ui/cleanup.use_this_for_non_static_field_access_only_if_necessary=false
-/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.staticondemandthreshold=99
-/instance/org.eclipse.jdt.ui/cleanup.never_use_parentheses_in_expressions=true
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.localSuffixes=
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.localPrefixes=
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+/instance/org.eclipse.jdt.ui/cleanup.correct_indentation=true
+/instance/org.eclipse.jdt.ui/cleanup.format_source_code=true
+/instance/org.eclipse.jdt.ui/cleanup.format_source_code_changes_only=false
+/instance/org.eclipse.jdt.ui/cleanup.make_local_variable_final=true
+/instance/org.eclipse.jdt.ui/cleanup.make_parameters_final=true
+/instance/org.eclipse.jdt.ui/cleanup.make_private_fields_final=true
+/instance/org.eclipse.jdt.ui/cleanup.make_type_abstract_if_missing_method=false
 /instance/org.eclipse.jdt.ui/cleanup.make_variable_declarations_final=true
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.formatterprofiles=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?>\r\n<profiles version\="12">\r\n<profile kind\="CodeFormatterProfile" name\="fineractdevprojectformatter" version\="12">\r\n<setting id\="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value\="insert"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.disabling_tag" value\="@formatter\:off"/>\r\n<setting id\="org.eclipse.jdt.core.formatter.in [...]
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
-/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.keywordthis=true
-/instance/org.eclipse.jdt.ui/cleanup.add_missing_override_annotations=true
-/instance/org.eclipse.jdt.ui/cleanup.remove_unnecessary_nls_tags=true
-/instance/org.eclipse.jdt.ui/formatter_profile=_fineractdevprojectformatter
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+/instance/org.eclipse.jdt.ui/cleanup.never_use_blocks=false
+/instance/org.eclipse.jdt.ui/cleanup.never_use_parentheses_in_expressions=true
 /instance/org.eclipse.jdt.ui/cleanup.organize_imports=true
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.formatterprofiles.version=12
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-@org.eclipse.jdt.core=3.7.1.v_B76_R37x
-/instance/org.eclipse.jdt.ui/cleanup.remove_unused_private_types=true
-/instance/org.eclipse.jdt.ui/cleanup.add_missing_methods=true
-/instance/org.eclipse.jdt.ui/cleanup.remove_unused_imports=true
-/instance/org.eclipse.jdt.ui/cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-/instance/org.eclipse.jdt.ui/cleanup.always_use_this_for_non_static_method_access=false
-/instance/org.eclipse.jdt.ui/cleanup.always_use_this_for_non_static_field_access=true
-/instance/org.eclipse.jdt.ui/cleanup.add_missing_annotations=true
-/instance/org.eclipse.jdt.ui/cleanup.use_this_for_non_static_field_access=true
+/instance/org.eclipse.jdt.ui/cleanup.qualify_static_field_accesses_with_declaring_class=false
 /instance/org.eclipse.jdt.ui/cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+/instance/org.eclipse.jdt.ui/cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+/instance/org.eclipse.jdt.ui/cleanup.qualify_static_member_accesses_with_declaring_class=true
+/instance/org.eclipse.jdt.ui/cleanup.qualify_static_method_accesses_with_declaring_class=false
+/instance/org.eclipse.jdt.ui/cleanup.remove_private_constructors=true
+/instance/org.eclipse.jdt.ui/cleanup.remove_trailing_whitespaces=true
 /instance/org.eclipse.jdt.ui/cleanup.remove_trailing_whitespaces_all=true
-/instance/org.eclipse.jdt.ui/cleanup.never_use_blocks=false
-/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.gettersetter.use.is=true
-/instance/org.eclipse.jdt.ui/cleanup.format_source_code_changes_only=false
-/instance/org.eclipse.jdt.ui/cleanup.remove_unused_private_methods=true
-/instance/org.eclipse.jdt.ui/cleanup.add_generated_serial_version_id=false
 /instance/org.eclipse.jdt.ui/cleanup.remove_trailing_whitespaces_ignore_empty=false
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.source=1.6
-/instance/org.eclipse.jdt.ui/cleanup.use_this_for_non_static_method_access=true
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-/instance/org.eclipse.jdt.ui/cleanup.sort_members_all=false
-/instance/org.eclipse.jdt.ui/cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-/instance/org.eclipse.jdt.ui/cleanup.remove_unused_private_fields=true
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.overrideannotation=true
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-/instance/org.eclipse.jdt.ui/cleanup.qualify_static_method_accesses_with_declaring_class=false
-/instance/org.eclipse.jdt.ui/cleanup_settings_version=2
-/instance/org.eclipse.jdt.ui/cleanup.make_type_abstract_if_missing_method=false
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-/instance/org.eclipse.jdt.ui/cleanup.remove_unused_local_variables=false
-/instance/org.eclipse.jdt.ui/cleanup.make_local_variable_final=true
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-/instance/org.eclipse.jdt.ui/cleanup.format_source_code=true
-/instance/org.eclipse.jdt.ui/cleanup.correct_indentation=true
 /instance/org.eclipse.jdt.ui/cleanup.remove_unnecessary_casts=true
+/instance/org.eclipse.jdt.ui/cleanup.remove_unnecessary_nls_tags=true
+/instance/org.eclipse.jdt.ui/cleanup.remove_unused_imports=true
+/instance/org.eclipse.jdt.ui/cleanup.remove_unused_local_variables=false
+/instance/org.eclipse.jdt.ui/cleanup.remove_unused_private_fields=true
 /instance/org.eclipse.jdt.ui/cleanup.remove_unused_private_members=false
-/instance/org.eclipse.jdt.ui/cleanup.add_missing_deprecated_annotations=true
+/instance/org.eclipse.jdt.ui/cleanup.remove_unused_private_methods=true
+/instance/org.eclipse.jdt.ui/cleanup.remove_unused_private_types=true
+/instance/org.eclipse.jdt.ui/cleanup.sort_members=false
+/instance/org.eclipse.jdt.ui/cleanup.sort_members_all=false
+/instance/org.eclipse.jdt.ui/cleanup.use_blocks=true
 /instance/org.eclipse.jdt.ui/cleanup.use_blocks_only_for_return_and_throw=false
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates/>
+/instance/org.eclipse.jdt.ui/cleanup.use_parentheses_in_expressions=false
+/instance/org.eclipse.jdt.ui/cleanup.use_this_for_non_static_field_access=true
+/instance/org.eclipse.jdt.ui/cleanup.use_this_for_non_static_field_access_only_if_necessary=false
+/instance/org.eclipse.jdt.ui/cleanup.use_this_for_non_static_method_access=true
+/instance/org.eclipse.jdt.ui/cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+/instance/org.eclipse.jdt.ui/cleanup_profile=_fineractdevprofile
+/instance/org.eclipse.jdt.ui/cleanup_settings_version=2
+/instance/org.eclipse.jdt.ui/formatter_profile=_fineractdevprojectformatter
+/instance/org.eclipse.jdt.ui/formatter_settings_version=18
+/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.cleanupprofiles=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?>\r\n<profiles version\="2">\r\n<profile kind\="CleanUpProfile" name\="fineractdevprofile" version\="2">\r\n<setting id\="cleanup.remove_unused_private_fields" value\="true"/>\r\n<setting id\="cleanup.always_use_parentheses_in_expressions" value\="false"/>\r\n<setting id\="cleanup.never_use_blocks" value\="false"/>\r\n<setting id\="cleanup.remove_unused_private_methods" [...]
+/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.exception.name=e
+/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.formatterprofiles=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?>\n<profiles version\="18">\n    <profile kind\="CodeFormatterProfile" name\="fineractdevprojectformatter" version\="18">\n        <setting id\="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value\="insert"/>\n        <setting id\="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value\="insert"/>\n        <setting id\="org.e [...]
+/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.formatterprofiles.version=18
+/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.gettersetter.use.is=true
+/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.ignorelowercasenames=true
+/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.importorder=;
+/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.keywordthis=true
+/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.ondemandthreshold=99
+/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.overrideannotation=true
+/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.staticondemandthreshold=99
+@org.eclipse.jdt.core=3.20.0.v20191203-2131
+@org.eclipse.jdt.ui=3.20.0.v20191203-1301
+file_export_version=3.0
diff --git a/fineract-provider/config/checkstyle/checkstyle.xml b/fineract-provider/config/checkstyle/checkstyle.xml
index 956fd2e..84195db 100644
--- a/fineract-provider/config/checkstyle/checkstyle.xml
+++ b/fineract-provider/config/checkstyle/checkstyle.xml
@@ -49,7 +49,6 @@
   -->
     <module name="TreeWalker">
         <module name="EqualsHashCode"/>
-<!-- TODO Enable many more checks (go about this one by one, step by step, raise separate PRs fixing and then enforcing):
 
         <module name="RedundantImport"/>
         <module name="UnusedImports"/>
@@ -60,6 +59,8 @@
             <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
         </module>
 
+<!-- TODO Enable many more checks (go about this one by one, step by step, raise separate PRs fixing and then enforcing):
+
         <module name="HiddenField">
             <property name="ignoreAbstractMethods" value="true" />
             <property name="ignoreConstructorParameter" value="true" />
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountNumberPreferencesTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountNumberPreferencesTest.java
index 26d4aa6..1bde540 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountNumberPreferencesTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountNumberPreferencesTest.java
@@ -18,10 +18,14 @@
  */
 package org.apache.fineract.integrationtests;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.HashMap;
-
 import org.apache.fineract.integrationtests.common.CenterDomain;
 import org.apache.fineract.integrationtests.common.CenterHelper;
 import org.apache.fineract.integrationtests.common.ClientHelper;
@@ -40,12 +44,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 public class AccountNumberPreferencesTest {
 
     private RequestSpecification requestSpec;
@@ -154,8 +152,7 @@ public class AccountNumberPreferencesTest {
             System.out.println("Successfully deleted account number preference (ID: " + delResponse.get("resourceId") + ")");
         }
         /* Deletion of invalid account preference ID should fail */
-        System.out
-                .println("---------------------------------DELETING ACCOUNT NUMBER PREFERENCE WITH INVALID ID------------------------------------------");
+        System.out.println("---------------------------------DELETING ACCOUNT NUMBER PREFERENCE WITH INVALID ID------------------------------------------");
 
         HashMap<String, Object> deletionError = this.accountNumberPreferencesHelper.deleteAccountNumberPreference(10,
                 this.responseNotFoundError, "");
@@ -211,8 +208,7 @@ public class AccountNumberPreferencesTest {
 
     private void createAccountNumberPreferenceDuplicateData(final String accountType, final String prefixType) {
         /* Creating account Preference with duplicate data should fail */
-        System.out
-                .println("---------------------------------CREATING ACCOUNT NUMBER PREFERENCE WITH DUPLICATE DATA------------------------------------------");
+        System.out.println("---------------------------------CREATING ACCOUNT NUMBER PREFERENCE WITH DUPLICATE DATA------------------------------------------");
 
         HashMap<String, Object> creationError = this.accountNumberPreferencesHelper.createAccountNumberPreferenceWithInvalidData(
                 this.responseForbiddenError, accountType, prefixType, "");
@@ -225,8 +221,7 @@ public class AccountNumberPreferencesTest {
     private void createAccountNumberPreferenceInvalidData(final String accountType, final String prefixType) {
 
         /* Creating account Preference with invalid data should fail */
-        System.out
-                .println("---------------------------------CREATING ACCOUNT NUMBER PREFERENCE WITH INVALID DATA------------------------------------------");
+        System.out.println("---------------------------------CREATING ACCOUNT NUMBER PREFERENCE WITH INVALID DATA------------------------------------------");
 
         HashMap<String, Object> creationError = this.accountNumberPreferencesHelper.createAccountNumberPreferenceWithInvalidData(
                 this.responseValidationError, accountType, prefixType, "");
@@ -253,8 +248,7 @@ public class AccountNumberPreferencesTest {
                 this.responseSpec, this.requestSpec);
 
         /* Update invalid account preference id should fail */
-        System.out
-                .println("---------------------------------UPDATING ACCOUNT NUMBER PREFERENCE WITH INVALID DATA------------------------------------------");
+        System.out.println("---------------------------------UPDATING ACCOUNT NUMBER PREFERENCE WITH INVALID DATA------------------------------------------");
 
         /* Invalid Account Type */
         HashMap<String, Object> updationError = this.accountNumberPreferencesHelper.updateAccountNumberPreference(9999, "101",
@@ -375,7 +369,7 @@ public class AccountNumberPreferencesTest {
 
     private void validateAccountNumberLengthAndStartsWithPrefix(final String accountNumber, String prefix) {
         if (prefix != null) {
-                prefix = prefix.substring(0, Math.min(prefix.length(), 10));
+            prefix = prefix.substring(0, Math.min(prefix.length(), 10));
             Assert.assertEquals(accountNumber.length(), prefix.length() + 9);
             Assert.assertTrue(accountNumber.startsWith(prefix));
         } else {
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountTransferTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountTransferTest.java
index 01399c2..6b50ef7 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountTransferTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountTransferTest.java
@@ -20,19 +20,23 @@ package org.apache.fineract.integrationtests;
 
 import static org.junit.Assert.assertEquals;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.HashMap;
 import java.util.List;
-
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.CommonConstants;
 import org.apache.fineract.integrationtests.common.OfficeHelper;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.accounting.Account;
+import org.apache.fineract.integrationtests.common.accounting.Account.AccountType;
 import org.apache.fineract.integrationtests.common.accounting.AccountHelper;
 import org.apache.fineract.integrationtests.common.accounting.FinancialActivityAccountHelper;
 import org.apache.fineract.integrationtests.common.accounting.JournalEntry;
 import org.apache.fineract.integrationtests.common.accounting.JournalEntryHelper;
-import org.apache.fineract.integrationtests.common.accounting.Account.AccountType;
 import org.apache.fineract.integrationtests.common.loans.LoanApplicationTestBuilder;
 import org.apache.fineract.integrationtests.common.loans.LoanProductTestBuilder;
 import org.apache.fineract.integrationtests.common.loans.LoanStatusChecker;
@@ -46,12 +50,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 /**
  * JUnit Test Cases for Account Transfer for.
  */
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountingScenarioIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountingScenarioIntegrationTest.java
index d720652..be75144 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountingScenarioIntegrationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountingScenarioIntegrationTest.java
@@ -20,6 +20,11 @@ package org.apache.fineract.integrationtests;
 
 import static org.junit.Assert.assertEquals;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
@@ -30,7 +35,6 @@ import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
-
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.CommonConstants;
 import org.apache.fineract.integrationtests.common.SchedulerJobHelper;
@@ -60,12 +64,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 @SuppressWarnings({ "unused", "rawtypes", "unchecked", "static-access" })
 public class AccountingScenarioIntegrationTest {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/BatchApiTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/BatchApiTest.java
index 57f16e5..5816a75 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/BatchApiTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/BatchApiTest.java
@@ -18,12 +18,16 @@
  */
 package org.apache.fineract.integrationtests;
 
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
-
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
 import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
@@ -36,14 +40,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 /**
  * Test class for
  * {@link org.apache.fineract.batch.command.CommandStrategyProvider}. This tests
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/BatchRequestsIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/BatchRequestsIntegrationTest.java
index 4a77522..c647039 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/BatchRequestsIntegrationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/BatchRequestsIntegrationTest.java
@@ -18,9 +18,13 @@
  */
 package org.apache.fineract.integrationtests;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
 import org.apache.fineract.integrationtests.common.BatchHelper;
@@ -33,12 +37,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 /**
  * Test class for testing the integration of Batch API with custom batch
  * requests and various user defined workflow. Like in the case of mifos
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CenterIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CenterIntegrationTest.java
index b1f2b83..059dbbc 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CenterIntegrationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CenterIntegrationTest.java
@@ -18,12 +18,18 @@
  */
 package org.apache.fineract.integrationtests;
 
+import static org.junit.Assert.assertEquals;
+
 import com.google.gson.Gson;
 import com.jayway.restassured.builder.RequestSpecBuilder;
 import com.jayway.restassured.builder.ResponseSpecBuilder;
 import com.jayway.restassured.http.ContentType;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
 import org.apache.fineract.integrationtests.common.CenterDomain;
 import org.apache.fineract.integrationtests.common.CenterHelper;
 import org.apache.fineract.integrationtests.common.OfficeHelper;
@@ -33,13 +39,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-
-import static org.junit.Assert.assertEquals;
-
 public class CenterIntegrationTest {
 
     private RequestSpecification requestSpec;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ChargesTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ChargesTest.java
index d441401..7bb4f39 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ChargesTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ChargesTest.java
@@ -18,21 +18,19 @@
  */
 package org.apache.fineract.integrationtests;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.HashMap;
-
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.charges.ChargesHelper;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 @SuppressWarnings({ "rawtypes" })
 public class ChargesTest {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java
index c6aede4..e7c8c7f 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java
@@ -18,6 +18,8 @@
  */
 package org.apache.fineract.integrationtests;
 
+import static org.junit.Assert.assertEquals;
+
 import com.google.gson.JsonObject;
 import com.jayway.restassured.builder.RequestSpecBuilder;
 import com.jayway.restassured.builder.ResponseSpecBuilder;
@@ -25,10 +27,24 @@ import com.jayway.restassured.http.ContentType;
 import com.jayway.restassured.path.json.JsonPath;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.SchedulerJobHelper;
 import org.apache.fineract.integrationtests.common.Utils;
-import org.apache.fineract.integrationtests.common.accounting.*;
+import org.apache.fineract.integrationtests.common.accounting.Account;
+import org.apache.fineract.integrationtests.common.accounting.AccountHelper;
+import org.apache.fineract.integrationtests.common.accounting.JournalEntry;
+import org.apache.fineract.integrationtests.common.accounting.JournalEntryHelper;
+import org.apache.fineract.integrationtests.common.accounting.PeriodicAccrualAccountingHelper;
 import org.apache.fineract.integrationtests.common.charges.ChargesHelper;
 import org.apache.fineract.integrationtests.common.loans.LoanApplicationTestBuilder;
 import org.apache.fineract.integrationtests.common.loans.LoanProductTestBuilder;
@@ -43,14 +59,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.math.BigDecimal;
-import java.text.DateFormat;
-import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-import static org.junit.Assert.assertEquals;
-
 /**
  * Client Loan Integration Test for checking Loan Application Repayments
  * Schedule, loan charges, penalties, loan repayments and verifying accounting
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java
index ef427da..b3557c6 100755
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java
@@ -18,13 +18,32 @@
  */
 package org.apache.fineract.integrationtests;
 
+import static org.junit.Assert.assertEquals;
+
 import com.jayway.restassured.builder.RequestSpecBuilder;
 import com.jayway.restassured.builder.ResponseSpecBuilder;
 import com.jayway.restassured.http.ContentType;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
 import org.apache.fineract.infrastructure.core.service.DateUtils;
-import org.apache.fineract.integrationtests.common.*;
+import org.apache.fineract.integrationtests.common.ClientHelper;
+import org.apache.fineract.integrationtests.common.CommonConstants;
+import org.apache.fineract.integrationtests.common.SchedulerJobHelper;
+import org.apache.fineract.integrationtests.common.TaxComponentHelper;
+import org.apache.fineract.integrationtests.common.TaxGroupHelper;
+import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.charges.ChargesHelper;
 import org.apache.fineract.integrationtests.common.savings.SavingsAccountHelper;
 import org.apache.fineract.integrationtests.common.savings.SavingsProductHelper;
@@ -37,15 +56,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.math.BigDecimal;
-import java.text.DateFormat;
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-import static org.junit.Assert.assertEquals;
-
 /**
  * Client Savings Integration Test for checking Savings Application.
  */
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientTest.java
index b07a2db..40894e2 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientTest.java
@@ -18,20 +18,18 @@
  */
 package org.apache.fineract.integrationtests;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.HashMap;
-
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 public class ClientTest {
 
     private ResponseSpecification responseSpec;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientUndoRejectAndWithdrawalIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientUndoRejectAndWithdrawalIntegrationTest.java
index 45540e5..6c3ec35 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientUndoRejectAndWithdrawalIntegrationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientUndoRejectAndWithdrawalIntegrationTest.java
@@ -18,26 +18,25 @@
  */
 package org.apache.fineract.integrationtests;
 
+import static org.junit.Assert.assertEquals;
+
 import com.jayway.restassured.builder.RequestSpecBuilder;
 import com.jayway.restassured.builder.ResponseSpecBuilder;
 import com.jayway.restassured.http.ContentType;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
-import org.apache.fineract.integrationtests.common.ClientHelper;
-import org.apache.fineract.integrationtests.common.CommonConstants;
-import org.apache.fineract.integrationtests.common.Utils;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Locale;
-
-import static org.junit.Assert.assertEquals;
+import org.apache.fineract.integrationtests.common.ClientHelper;
+import org.apache.fineract.integrationtests.common.CommonConstants;
+import org.apache.fineract.integrationtests.common.Utils;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 @SuppressWarnings({ "unused" })
 public class ClientUndoRejectAndWithdrawalIntegrationTest {
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ConcurrencyIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ConcurrencyIntegrationTest.java
index 9548dc7..9fdccaa 100755
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ConcurrencyIntegrationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ConcurrencyIntegrationTest.java
@@ -18,13 +18,17 @@
  */
 package org.apache.fineract.integrationtests;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Locale;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.accounting.Account;
@@ -34,12 +38,6 @@ import org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 public class ConcurrencyIntegrationTest {
 
     private ResponseSpecification responseSpec;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CurrenciesTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CurrenciesTest.java
index 08a6c94..a444bc1 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CurrenciesTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CurrenciesTest.java
@@ -23,6 +23,8 @@ import com.jayway.restassured.builder.ResponseSpecBuilder;
 import com.jayway.restassured.http.ContentType;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.util.ArrayList;
+import java.util.Collections;
 import org.apache.fineract.integrationtests.common.CurrenciesHelper;
 import org.apache.fineract.integrationtests.common.CurrencyDomain;
 import org.apache.fineract.integrationtests.common.Utils;
@@ -30,9 +32,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.util.ArrayList;
-import java.util.Collections;
-
 @SuppressWarnings({ "unused", "rawtypes" })
 public class CurrenciesTest {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CurrencyIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CurrencyIntegrationTest.java
index 2468a40..5748a0d 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CurrencyIntegrationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CurrencyIntegrationTest.java
@@ -18,15 +18,14 @@
  */
 package org.apache.fineract.integrationtests;
 
-import org.apache.fineract.integrationtests.common.Utils;
-import org.apache.fineract.integrationtests.common.savings.SavingsAccountHelper;
-import org.junit.Before;
-
 import com.jayway.restassured.builder.RequestSpecBuilder;
 import com.jayway.restassured.builder.ResponseSpecBuilder;
 import com.jayway.restassured.http.ContentType;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import org.apache.fineract.integrationtests.common.Utils;
+import org.apache.fineract.integrationtests.common.savings.SavingsAccountHelper;
+import org.junit.Before;
 
 public class CurrencyIntegrationTest {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/DisbursalAndRepaymentScheduleTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/DisbursalAndRepaymentScheduleTest.java
index 611a9ee..9322561 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/DisbursalAndRepaymentScheduleTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/DisbursalAndRepaymentScheduleTest.java
@@ -21,25 +21,30 @@ package org.apache.fineract.integrationtests;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.HashMap;
-import java.util.List;
-
-import org.apache.fineract.integrationtests.common.*;
-import org.apache.fineract.integrationtests.common.loans.*;
+import org.apache.fineract.integrationtests.common.CalendarHelper;
+import org.apache.fineract.integrationtests.common.ClientHelper;
+import org.apache.fineract.integrationtests.common.GroupHelper;
+import org.apache.fineract.integrationtests.common.LoanRescheduleRequestHelper;
+import org.apache.fineract.integrationtests.common.Utils;
+import org.apache.fineract.integrationtests.common.loans.LoanApplicationTestBuilder;
+import org.apache.fineract.integrationtests.common.loans.LoanProductTestBuilder;
+import org.apache.fineract.integrationtests.common.loans.LoanRescheduleRequestTestBuilder;
+import org.apache.fineract.integrationtests.common.loans.LoanStatusChecker;
+import org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 /**
  * Tests loan schedule change based on group meeting changes and loan
  * rescheduling
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ExternalServicesConfigurationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ExternalServicesConfigurationTest.java
index 3abbcee..6dec611 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ExternalServicesConfigurationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ExternalServicesConfigurationTest.java
@@ -18,21 +18,19 @@
  */
 package org.apache.fineract.integrationtests;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.HashMap;
-
 import org.apache.fineract.integrationtests.common.ExternalServicesConfigurationHelper;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 @SuppressWarnings({ "rawtypes", "unchecked", "static-access" })
 public class ExternalServicesConfigurationTest {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FinancialActivityAccountsTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FinancialActivityAccountsTest.java
index ef2183f..ed32b90 100755
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FinancialActivityAccountsTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FinancialActivityAccountsTest.java
@@ -20,9 +20,13 @@ package org.apache.fineract.integrationtests;
 
 import static org.junit.Assert.assertEquals;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.HashMap;
 import java.util.List;
-
 import org.apache.fineract.accounting.common.AccountingConstants.FINANCIAL_ACTIVITY;
 import org.apache.fineract.accounting.financialactivityaccount.exception.DuplicateFinancialActivityAccountFoundException;
 import org.apache.fineract.accounting.financialactivityaccount.exception.FinancialActivityAccountInvalidException;
@@ -31,18 +35,11 @@ import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.accounting.Account;
 import org.apache.fineract.integrationtests.common.accounting.AccountHelper;
 import org.apache.fineract.integrationtests.common.accounting.FinancialActivityAccountHelper;
-import org.junit.Assert;
-
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 @SuppressWarnings("rawtypes")
 public class FinancialActivityAccountsTest {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FixedDepositTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FixedDepositTest.java
index 49f527d..dd37def 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FixedDepositTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FixedDepositTest.java
@@ -20,20 +20,22 @@ package org.apache.fineract.integrationtests;
 
 import static org.junit.Assert.assertEquals;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
-import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
-
 import org.apache.fineract.accounting.common.AccountingConstants.FINANCIAL_ACTIVITY;
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.CommonConstants;
@@ -42,32 +44,24 @@ import org.apache.fineract.integrationtests.common.TaxComponentHelper;
 import org.apache.fineract.integrationtests.common.TaxGroupHelper;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.accounting.Account;
+import org.apache.fineract.integrationtests.common.accounting.Account.AccountType;
 import org.apache.fineract.integrationtests.common.accounting.AccountHelper;
 import org.apache.fineract.integrationtests.common.accounting.FinancialActivityAccountHelper;
 import org.apache.fineract.integrationtests.common.accounting.JournalEntry;
 import org.apache.fineract.integrationtests.common.accounting.JournalEntryHelper;
-import org.apache.fineract.integrationtests.common.accounting.Account.AccountType;
 import org.apache.fineract.integrationtests.common.fixeddeposit.FixedDepositAccountHelper;
 import org.apache.fineract.integrationtests.common.fixeddeposit.FixedDepositAccountStatusChecker;
 import org.apache.fineract.integrationtests.common.fixeddeposit.FixedDepositProductHelper;
-import org.apache.fineract.integrationtests.common.loans.LoanApplicationTestBuilder;
 import org.apache.fineract.integrationtests.common.savings.SavingsAccountHelper;
 import org.apache.fineract.integrationtests.common.savings.SavingsProductHelper;
 import org.apache.fineract.integrationtests.common.savings.SavingsStatusChecker;
 import org.joda.time.DateTime;
-import org.joda.time.Days;
 import org.joda.time.Months;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 @SuppressWarnings({ "unused", "unchecked", "rawtypes", "static-access" })
 public class FixedDepositTest {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FlexibleSavingsInterestPostingIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FlexibleSavingsInterestPostingIntegrationTest.java
index e6a6514..52baadc 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FlexibleSavingsInterestPostingIntegrationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FlexibleSavingsInterestPostingIntegrationTest.java
@@ -20,10 +20,14 @@ package org.apache.fineract.integrationtests;
 
 import static org.junit.Assert.assertEquals;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map.Entry;
-
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.CommonConstants;
 import org.apache.fineract.integrationtests.common.GlobalConfigurationHelper;
@@ -36,12 +40,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 @SuppressWarnings({ "rawtypes", "unused", "unchecked" })
 public class FlexibleSavingsInterestPostingIntegrationTest {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FundsIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FundsIntegrationTest.java
index 0c2deeb..7dbd9b0 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FundsIntegrationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FundsIntegrationTest.java
@@ -18,11 +18,18 @@
  */
 package org.apache.fineract.integrationtests;
 
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.hasItem;
 import static org.junit.Assert.assertEquals;
 
 import com.google.gson.Gson;
-
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
+import java.util.HashMap;
+import java.util.List;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.funds.FundsHelper;
 import org.apache.fineract.integrationtests.common.funds.FundsResourceHandler;
@@ -30,14 +37,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
-import java.util.*;
-
 /**
  * Funds Integration Test for checking Funds Application.
  */
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GlobalConfigInterestChargedFromDateSameAsDisbursalDateTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GlobalConfigInterestChargedFromDateSameAsDisbursalDateTest.java
index 48b5b8e..7b024b2 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GlobalConfigInterestChargedFromDateSameAsDisbursalDateTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GlobalConfigInterestChargedFromDateSameAsDisbursalDateTest.java
@@ -18,9 +18,13 @@
  */
 package org.apache.fineract.integrationtests;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.HashMap;
-
 import org.apache.fineract.integrationtests.common.GlobalConfigurationHelper;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.junit.After;
@@ -28,12 +32,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 
 public class GlobalConfigInterestChargedFromDateSameAsDisbursalDateTest {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GlobalConfigurationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GlobalConfigurationTest.java
index f978135..c7fadfe 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GlobalConfigurationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GlobalConfigurationTest.java
@@ -18,9 +18,13 @@
  */
 package org.apache.fineract.integrationtests;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.HashMap;
-
 import org.apache.fineract.integrationtests.common.CommonConstants;
 import org.apache.fineract.integrationtests.common.GlobalConfigurationHelper;
 import org.apache.fineract.integrationtests.common.Utils;
@@ -29,12 +33,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 @SuppressWarnings({ "rawtypes", "unchecked", "static-access" })
 public class GlobalConfigurationTest {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupLoanIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupLoanIntegrationTest.java
index e6f6227..7dcd991 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupLoanIntegrationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupLoanIntegrationTest.java
@@ -20,10 +20,14 @@ package org.apache.fineract.integrationtests;
 
 import static org.junit.Assert.assertEquals;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
-
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.GroupHelper;
 import org.apache.fineract.integrationtests.common.Utils;
@@ -33,12 +37,6 @@ import org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 /**
  * Group Loan Integration Test for checking Loan Application Repayment Schedule.
  */
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupSavingsIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupSavingsIntegrationTest.java
index 025d49f..d8d3aeb 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupSavingsIntegrationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupSavingsIntegrationTest.java
@@ -20,6 +20,11 @@ package org.apache.fineract.integrationtests;
 
 import static org.junit.Assert.assertEquals;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -28,7 +33,6 @@ import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
-
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.CommonConstants;
 import org.apache.fineract.integrationtests.common.GroupHelper;
@@ -42,12 +46,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 /**
  * Group Savings Integration Test for checking Savings Application.
  */
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupTest.java
index fc777c2..6284b26 100755
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupTest.java
@@ -21,8 +21,12 @@ package org.apache.fineract.integrationtests;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.HashMap;
-
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.GroupHelper;
 import org.apache.fineract.integrationtests.common.Utils;
@@ -34,12 +38,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 /**
  * Group Test for checking Group: Creation, Activation, Client Association,
  * Updating & Deletion
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/HookIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/HookIntegrationTest.java
index 3762caf..035d40e 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/HookIntegrationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/HookIntegrationTest.java
@@ -18,28 +18,25 @@
  */
 package org.apache.fineract.integrationtests;
 
-import org.junit.Assert;
-
 import static org.junit.Assert.fail;
 
+import com.jayway.restassured.RestAssured;
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.path.json.JsonPath;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.fineract.integrationtests.common.HookHelper;
 import org.apache.fineract.integrationtests.common.OfficeHelper;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.http.conn.HttpHostConnectException;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.path.json.JsonPath;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 public class HookIntegrationTest {
 
     private RequestSpecification requestSpec;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanApplicationApprovalTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanApplicationApprovalTest.java
index 1ef1a20..3678f25 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanApplicationApprovalTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanApplicationApprovalTest.java
@@ -20,10 +20,14 @@ package org.apache.fineract.integrationtests;
 
 import static org.junit.Assert.assertEquals;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.CommonConstants;
 import org.apache.fineract.integrationtests.common.Utils;
@@ -34,12 +38,6 @@ import org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 @SuppressWarnings("rawtypes")
 public class LoanApplicationApprovalTest {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanApplicationUndoLastTrancheTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanApplicationUndoLastTrancheTest.java
index 672972e..b366e1f 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanApplicationUndoLastTrancheTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanApplicationUndoLastTrancheTest.java
@@ -18,13 +18,14 @@
  */
 package org.apache.fineract.integrationtests;
 
-import java.math.BigDecimal;
-
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-
-import org.apache.fineract.integrationtests.LoanApplicationApprovalTest;
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.loans.LoanApplicationTestBuilder;
@@ -35,12 +36,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 @SuppressWarnings("rawtypes")
 public class LoanApplicationUndoLastTrancheTest {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanDisbursalDateValidationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanDisbursalDateValidationTest.java
index 3e793e5..300149e 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanDisbursalDateValidationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanDisbursalDateValidationTest.java
@@ -18,9 +18,13 @@
  */
 package org.apache.fineract.integrationtests;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.HashMap;
 import java.util.List;
-
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.CommonConstants;
 import org.apache.fineract.integrationtests.common.Utils;
@@ -32,12 +36,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 @SuppressWarnings("rawtypes")
 public class LoanDisbursalDateValidationTest {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanDisbursementDetailsIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanDisbursementDetailsIntegrationTest.java
index b5ac265..78fd2d2 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanDisbursementDetailsIntegrationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanDisbursementDetailsIntegrationTest.java
@@ -20,14 +20,16 @@ package org.apache.fineract.integrationtests;
 
 import static org.junit.Assert.assertEquals;
 
-import java.math.BigDecimal;
-import java.math.MathContext;
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.loans.LoanApplicationTestBuilder;
@@ -38,12 +40,6 @@ import org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class LoanDisbursementDetailsIntegrationTest {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanRepaymentRescheduleAtDisbursementTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanRepaymentRescheduleAtDisbursementTest.java
index 4946462..c689faa 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanRepaymentRescheduleAtDisbursementTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanRepaymentRescheduleAtDisbursementTest.java
@@ -20,13 +20,17 @@ package org.apache.fineract.integrationtests;
 
 import static org.junit.Assert.assertEquals;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.accounting.Account;
@@ -37,12 +41,6 @@ import org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 @SuppressWarnings("rawtypes")
 public class LoanRepaymentRescheduleAtDisbursementTest {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanRescheduleRequestTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanRescheduleRequestTest.java
index a7ad483..f150da3 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanRescheduleRequestTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanRescheduleRequestTest.java
@@ -21,8 +21,12 @@ package org.apache.fineract.integrationtests;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.HashMap;
-
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.LoanRescheduleRequestHelper;
 import org.apache.fineract.integrationtests.common.Utils;
@@ -33,12 +37,6 @@ import org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 /**
  * Test the creation, approval and rejection of a loan reschedule request
  **/
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanReschedulingWithinCenterTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanReschedulingWithinCenterTest.java
index c3aa1e2..ce0d7de 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanReschedulingWithinCenterTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanReschedulingWithinCenterTest.java
@@ -21,6 +21,12 @@ package org.apache.fineract.integrationtests;
 
 import static org.junit.Assert.assertEquals;
 
+import com.google.gson.Gson;
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.sql.Timestamp;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -29,10 +35,6 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
 import org.apache.fineract.integrationtests.common.CalendarHelper;
 import org.apache.fineract.integrationtests.common.CenterDomain;
 import org.apache.fineract.integrationtests.common.CenterHelper;
@@ -47,13 +49,9 @@ import org.apache.fineract.integrationtests.common.loans.LoanProductTestBuilder;
 import org.apache.fineract.integrationtests.common.loans.LoanStatusChecker;
 import org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper;
 import org.apache.fineract.integrationtests.common.organisation.StaffHelper;
-
-import com.google.gson.Gson;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 public class LoanReschedulingWithinCenterTest {
 
@@ -337,7 +335,9 @@ public class LoanReschedulingWithinCenterTest {
             builder = builder.withAccountingRulePeriodicAccrual(accounts);
         }
 
-        if (isArrearsBasedOnOriginalSchedule) builder = builder.withArrearsConfiguration();
+        if (isArrearsBasedOnOriginalSchedule) {
+            builder = builder.withArrearsConfiguration();
+        }
 
         final String loanProductJSON = builder.build(chargeId);
         return this.loanTransactionHelper.getLoanProductId(loanProductJSON);
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanWithWaiveInterestAndWriteOffIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanWithWaiveInterestAndWriteOffIntegrationTest.java
index 5258337..06f5f04 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanWithWaiveInterestAndWriteOffIntegrationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanWithWaiveInterestAndWriteOffIntegrationTest.java
@@ -18,8 +18,12 @@
  */
 package org.apache.fineract.integrationtests;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.HashMap;
-
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.loans.LoanApplicationTestBuilder;
@@ -30,12 +34,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 /**
  * Client Loan Integration Test for checking Loan Disbursement with Waive
  * Interest and Write-Off.
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanWithdrawnByApplicantIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanWithdrawnByApplicantIntegrationTest.java
index 4313c39..a6bb998 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanWithdrawnByApplicantIntegrationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanWithdrawnByApplicantIntegrationTest.java
@@ -18,8 +18,12 @@
  */
 package org.apache.fineract.integrationtests;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.HashMap;
-
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.loans.LoanApplicationTestBuilder;
@@ -29,12 +33,6 @@ import org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 @SuppressWarnings("rawtypes")
 public class LoanWithdrawnByApplicantIntegrationTest {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/MinimumDaysBetweenDisbursalAndFirstRepaymentTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/MinimumDaysBetweenDisbursalAndFirstRepaymentTest.java
index f0d6f19..aa68eb9 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/MinimumDaysBetweenDisbursalAndFirstRepaymentTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/MinimumDaysBetweenDisbursalAndFirstRepaymentTest.java
@@ -20,9 +20,13 @@ package org.apache.fineract.integrationtests;
 
 import static org.junit.Assert.assertEquals;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.HashMap;
 import java.util.List;
-
 import org.apache.fineract.integrationtests.common.CalendarHelper;
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.CommonConstants;
@@ -36,12 +40,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 /**
  * Test the creation, approval and rejection of a loan reschedule request
  **/
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/NotificationApiTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/NotificationApiTest.java
index 785dab1..3a49f5e 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/NotificationApiTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/NotificationApiTest.java
@@ -23,14 +23,13 @@ import com.jayway.restassured.builder.ResponseSpecBuilder;
 import com.jayway.restassured.http.ContentType;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.util.HashMap;
 import org.apache.fineract.integrationtests.common.NotificationHelper;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.util.HashMap;
-
 public class NotificationApiTest {
 
     private ResponseSpecification responseSpec;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/OfficeIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/OfficeIntegrationTest.java
index 35029f2..99955bc 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/OfficeIntegrationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/OfficeIntegrationTest.java
@@ -18,6 +18,11 @@
  */
 package org.apache.fineract.integrationtests;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import org.apache.fineract.integrationtests.common.OfficeDomain;
 import org.apache.fineract.integrationtests.common.OfficeHelper;
 import org.apache.fineract.integrationtests.common.Utils;
@@ -25,12 +30,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 public class OfficeIntegrationTest {
 
     private ResponseSpecification responseSpec;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/PasswordPreferencesIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/PasswordPreferencesIntegrationTest.java
index 27729fd..980d2c7 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/PasswordPreferencesIntegrationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/PasswordPreferencesIntegrationTest.java
@@ -20,21 +20,19 @@ package org.apache.fineract.integrationtests;
 
 import static org.junit.Assert.assertEquals;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.HashMap;
 import java.util.List;
-
 import org.apache.fineract.integrationtests.common.CommonConstants;
 import org.apache.fineract.integrationtests.common.PasswordPreferencesHelper;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class PasswordPreferencesIntegrationTest {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/PaymentTypeIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/PaymentTypeIntegrationTest.java
index 4bc07bc..0aa6576 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/PaymentTypeIntegrationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/PaymentTypeIntegrationTest.java
@@ -18,8 +18,12 @@
  */
 package org.apache.fineract.integrationtests;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.HashMap;
-
 import org.apache.fineract.integrationtests.common.PaymentTypeDomain;
 import org.apache.fineract.integrationtests.common.PaymentTypeHelper;
 import org.apache.fineract.integrationtests.common.Utils;
@@ -27,12 +31,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 public class PaymentTypeIntegrationTest {
 
     private ResponseSpecification responseSpec;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/RecurringDepositTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/RecurringDepositTest.java
index fba781b..b88f20b 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/RecurringDepositTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/RecurringDepositTest.java
@@ -20,6 +20,11 @@ package org.apache.fineract.integrationtests;
 
 import static org.junit.Assert.assertEquals;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
@@ -30,7 +35,6 @@ import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
-
 import org.apache.fineract.accounting.common.AccountingConstants.FINANCIAL_ACTIVITY;
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.CommonConstants;
@@ -39,11 +43,11 @@ import org.apache.fineract.integrationtests.common.TaxComponentHelper;
 import org.apache.fineract.integrationtests.common.TaxGroupHelper;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.accounting.Account;
+import org.apache.fineract.integrationtests.common.accounting.Account.AccountType;
 import org.apache.fineract.integrationtests.common.accounting.AccountHelper;
 import org.apache.fineract.integrationtests.common.accounting.FinancialActivityAccountHelper;
 import org.apache.fineract.integrationtests.common.accounting.JournalEntry;
 import org.apache.fineract.integrationtests.common.accounting.JournalEntryHelper;
-import org.apache.fineract.integrationtests.common.accounting.Account.AccountType;
 import org.apache.fineract.integrationtests.common.fixeddeposit.FixedDepositAccountStatusChecker;
 import org.apache.fineract.integrationtests.common.recurringdeposit.RecurringDepositAccountHelper;
 import org.apache.fineract.integrationtests.common.recurringdeposit.RecurringDepositAccountStatusChecker;
@@ -58,12 +62,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 @SuppressWarnings({ "unused", "rawtypes", "unchecked", "static-access" })
 public class RecurringDepositTest {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/RolesTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/RolesTest.java
index 50a9006..a03f8f1 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/RolesTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/RolesTest.java
@@ -21,8 +21,12 @@ package org.apache.fineract.integrationtests;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.HashMap;
-
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.organisation.StaffHelper;
 import org.apache.fineract.integrationtests.useradministration.roles.RolesHelper;
@@ -31,12 +35,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 public class RolesTest {
 
     private ResponseSpecification responseSpec;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SchedulerJobsTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SchedulerJobsTest.java
index 1a374c8..bac4d42 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SchedulerJobsTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SchedulerJobsTest.java
@@ -18,21 +18,19 @@
  */
 package org.apache.fineract.integrationtests;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.HashMap;
-
 import org.apache.fineract.integrationtests.common.SchedulerJobHelper;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 @SuppressWarnings({ "rawtypes", "unchecked", "static-access" })
 public class SchedulerJobsTest {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SchedulerJobsTestResults.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SchedulerJobsTestResults.java
index 90fa502..2700d14 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SchedulerJobsTestResults.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SchedulerJobsTestResults.java
@@ -18,12 +18,30 @@
  */
 package org.apache.fineract.integrationtests;
 
+import static org.junit.Assert.assertEquals;
+
 import com.jayway.restassured.builder.RequestSpecBuilder;
 import com.jayway.restassured.builder.ResponseSpecBuilder;
 import com.jayway.restassured.http.ContentType;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
-import org.apache.fineract.integrationtests.common.*;
+import java.text.DateFormat;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import org.apache.fineract.integrationtests.common.ClientHelper;
+import org.apache.fineract.integrationtests.common.GlobalConfigurationHelper;
+import org.apache.fineract.integrationtests.common.HolidayHelper;
+import org.apache.fineract.integrationtests.common.SchedulerJobHelper;
+import org.apache.fineract.integrationtests.common.StandingInstructionsHelper;
+import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.accounting.Account;
 import org.apache.fineract.integrationtests.common.accounting.AccountHelper;
 import org.apache.fineract.integrationtests.common.accounting.JournalEntry;
@@ -47,16 +65,6 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import java.text.DateFormat;
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.util.*;
-
-import static org.junit.Assert.assertEquals;
-
 @SuppressWarnings({ "unused", "unchecked", "rawtypes", "static-access", "cast" })
 public class SchedulerJobsTestResults {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SkipRepaymentOnMonthFirstTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SkipRepaymentOnMonthFirstTest.java
index d9fb3e0..98a4dc9 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SkipRepaymentOnMonthFirstTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SkipRepaymentOnMonthFirstTest.java
@@ -20,10 +20,15 @@ package org.apache.fineract.integrationtests;
 
 import static org.junit.Assert.assertEquals;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
-
+import junit.framework.Assert;
 import org.apache.fineract.integrationtests.common.CalendarHelper;
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.GlobalConfigurationHelper;
@@ -36,14 +41,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
-import junit.framework.Assert;
-
 @SuppressWarnings({ "static-access", "rawtypes", "unchecked", "deprecation" })
 public class SkipRepaymentOnMonthFirstTest {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/StaffImageApiTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/StaffImageApiTest.java
index 4b285b8..c5bcf74 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/StaffImageApiTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/StaffImageApiTest.java
@@ -18,6 +18,11 @@
  */
 package org.apache.fineract.integrationtests;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import org.apache.fineract.integrationtests.common.ImageHelper;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.accounting.AccountHelper;
@@ -27,12 +32,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 public class StaffImageApiTest {
 
     private RequestSpecification requestSpec;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/StaffTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/StaffTest.java
index d1d2873..6fffb6f 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/StaffTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/StaffTest.java
@@ -18,22 +18,20 @@
  */
 package org.apache.fineract.integrationtests;
 
+import com.google.gson.Gson;
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.HashMap;
 import java.util.List;
-
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.organisation.StaffHelper;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.gson.Gson;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 public class StaffTest {
 
     private RequestSpecification requestSpec;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SurveyIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SurveyIntegrationTest.java
index c728975..fac1e1b 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SurveyIntegrationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SurveyIntegrationTest.java
@@ -18,15 +18,14 @@
  */
 package org.apache.fineract.integrationtests;
 
-import org.apache.fineract.integrationtests.common.Utils;
-import org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper;
-import org.junit.Before;
-
 import com.jayway.restassured.builder.RequestSpecBuilder;
 import com.jayway.restassured.builder.ResponseSpecBuilder;
 import com.jayway.restassured.http.ContentType;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import org.apache.fineract.integrationtests.common.Utils;
+import org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper;
+import org.junit.Before;
 
 /**
  * Client Loan Integration Test for checking Loan Application Repayment
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SystemCodeTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SystemCodeTest.java
index 755c408..a25082c 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SystemCodeTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SystemCodeTest.java
@@ -21,10 +21,14 @@ package org.apache.fineract.integrationtests;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-
 import org.apache.fineract.integrationtests.common.CommonConstants;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.system.CodeHelper;
@@ -33,12 +37,6 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 /**
  * Test for creating, updating, deleting codes and code values
  *
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/TemplateIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/TemplateIntegrationTest.java
index a176c97..47fb805 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/TemplateIntegrationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/TemplateIntegrationTest.java
@@ -18,22 +18,20 @@
  */
 package org.apache.fineract.integrationtests;
 
+import com.google.gson.Gson;
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.HashMap;
-
 import org.apache.fineract.integrationtests.common.Utils;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.google.gson.Gson;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 public class TemplateIntegrationTest {
 
     private final String GET_TEMPLATES_URL = "/fineract-provider/api/v1/templates?tenantIdentifier=default";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/WorkingDaysTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/WorkingDaysTest.java
index 92e3d09..003f26a 100755
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/WorkingDaysTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/WorkingDaysTest.java
@@ -20,9 +20,13 @@ package org.apache.fineract.integrationtests;
 
 import static org.junit.Assert.assertEquals;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.HashMap;
 import java.util.List;
-
 import org.apache.fineract.integrationtests.common.CommonConstants;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.WorkingDaysHelper;
@@ -30,12 +34,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class WorkingDaysTest {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/XBRLIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/XBRLIntegrationTest.java
index 71041b6..1072b91 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/XBRLIntegrationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/XBRLIntegrationTest.java
@@ -20,20 +20,18 @@ package org.apache.fineract.integrationtests;
 
 import static org.junit.Assert.assertEquals;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.HashMap;
-
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.xbrl.XBRLIntegrationTestHelper;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class XBRLIntegrationTest {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/client/ClientEntityImportHandlerTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/client/ClientEntityImportHandlerTest.java
index d1e4048..34f9696 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/client/ClientEntityImportHandlerTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/client/ClientEntityImportHandlerTest.java
@@ -23,6 +23,16 @@ import com.jayway.restassured.builder.ResponseSpecBuilder;
 import com.jayway.restassured.http.ContentType;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
 import org.apache.fineract.infrastructure.bulkimport.constants.ClientEntityConstants;
 import org.apache.fineract.infrastructure.bulkimport.constants.TemplatePopulateImportConstants;
 import org.apache.fineract.infrastructure.bulkimport.data.GlobalEntityType;
@@ -40,13 +50,6 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import java.io.*;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
 public class ClientEntityImportHandlerTest {
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/loan/LoanImportHandlerTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/loan/LoanImportHandlerTest.java
index f4fe177..735c8db 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/loan/LoanImportHandlerTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/loan/LoanImportHandlerTest.java
@@ -23,11 +23,22 @@ import com.jayway.restassured.builder.ResponseSpecBuilder;
 import com.jayway.restassured.http.ContentType;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
 import org.apache.fineract.infrastructure.bulkimport.constants.LoanConstants;
 import org.apache.fineract.infrastructure.bulkimport.constants.TemplatePopulateImportConstants;
-import org.apache.fineract.integrationtests.common.*;
-import org.apache.fineract.integrationtests.common.funds.FundsResourceHandler;
-import org.apache.fineract.integrationtests.common.loans.LoanProductTestBuilder;
+import org.apache.fineract.integrationtests.common.ClientHelper;
+import org.apache.fineract.integrationtests.common.GroupHelper;
+import org.apache.fineract.integrationtests.common.OfficeHelper;
+import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper;
 import org.apache.fineract.integrationtests.common.organisation.StaffHelper;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -39,13 +50,6 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import java.io.*;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
 public class LoanImportHandlerTest {
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/office/OfficeImportHandlerTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/office/OfficeImportHandlerTest.java
index dab3c5b..c58eabf 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/office/OfficeImportHandlerTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/office/OfficeImportHandlerTest.java
@@ -22,12 +22,18 @@ import com.jayway.restassured.builder.RequestSpecBuilder;
 import com.jayway.restassured.builder.ResponseSpecBuilder;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import org.apache.fineract.infrastructure.bulkimport.constants.OfficeConstants;
 import org.apache.fineract.infrastructure.bulkimport.constants.TemplatePopulateImportConstants;
-import org.apache.fineract.infrastructure.bulkimport.populator.AbstractWorkbookPopulator;
 import org.apache.fineract.integrationtests.common.OfficeHelper;
 import org.apache.fineract.integrationtests.common.Utils;
-import org.apache.fineract.organisation.office.domain.Office;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -37,12 +43,6 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import java.io.*;
-import java.lang.reflect.Field;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
 public class OfficeImportHandlerTest {
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/savings/SavingsImportHandlerTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/savings/SavingsImportHandlerTest.java
index 66f7bd7..3381fc9 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/savings/SavingsImportHandlerTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/savings/SavingsImportHandlerTest.java
@@ -23,18 +23,25 @@ import com.jayway.restassured.builder.ResponseSpecBuilder;
 import com.jayway.restassured.http.ContentType;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
-import org.apache.fineract.infrastructure.bulkimport.constants.LoanConstants;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
 import org.apache.fineract.infrastructure.bulkimport.constants.SavingsConstants;
 import org.apache.fineract.infrastructure.bulkimport.constants.TemplatePopulateImportConstants;
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.GroupHelper;
 import org.apache.fineract.integrationtests.common.OfficeHelper;
 import org.apache.fineract.integrationtests.common.Utils;
-import org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper;
 import org.apache.fineract.integrationtests.common.organisation.StaffHelper;
 import org.apache.fineract.integrationtests.common.savings.SavingsAccountHelper;
 import org.apache.fineract.integrationtests.common.savings.SavingsProductHelper;
-import org.apache.fineract.template.domain.Template;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -44,13 +51,6 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import java.io.*;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
 public class SavingsImportHandlerTest {
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/populator/client/ClientEntityWorkbookPopulatorTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/populator/client/ClientEntityWorkbookPopulatorTest.java
index 27e34b7..e3c79e7 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/populator/client/ClientEntityWorkbookPopulatorTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/populator/client/ClientEntityWorkbookPopulatorTest.java
@@ -22,6 +22,9 @@ import com.jayway.restassured.builder.RequestSpecBuilder;
 import com.jayway.restassured.builder.ResponseSpecBuilder;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.io.IOException;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
 import org.apache.fineract.infrastructure.bulkimport.constants.TemplatePopulateImportConstants;
 import org.apache.fineract.infrastructure.bulkimport.data.GlobalEntityType;
 import org.apache.fineract.integrationtests.common.ClientHelper;
@@ -35,10 +38,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import java.io.IOException;
-
 public class ClientEntityWorkbookPopulatorTest {
 
     private ResponseSpecification responseSpec;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/populator/loan/LoanWorkbookPopulatorTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/populator/loan/LoanWorkbookPopulatorTest.java
index b76fac7..00287e7 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/populator/loan/LoanWorkbookPopulatorTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/populator/loan/LoanWorkbookPopulatorTest.java
@@ -23,9 +23,15 @@ import com.jayway.restassured.builder.ResponseSpecBuilder;
 import com.jayway.restassured.http.ContentType;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.io.IOException;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
 import org.apache.fineract.infrastructure.bulkimport.constants.TemplatePopulateImportConstants;
-import org.apache.fineract.infrastructure.bulkimport.data.GlobalEntityType;
-import org.apache.fineract.integrationtests.common.*;
+import org.apache.fineract.integrationtests.common.ClientHelper;
+import org.apache.fineract.integrationtests.common.GroupHelper;
+import org.apache.fineract.integrationtests.common.OfficeHelper;
+import org.apache.fineract.integrationtests.common.PaymentTypeHelper;
+import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.funds.FundsResourceHandler;
 import org.apache.fineract.integrationtests.common.loans.LoanProductTestBuilder;
 import org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper;
@@ -37,10 +43,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import java.io.IOException;
-
 public class LoanWorkbookPopulatorTest {
 
     private ResponseSpecification responseSpec;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/populator/office/OfficeWorkBookPopulatorTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/populator/office/OfficeWorkBookPopulatorTest.java
index b878b48..0615991 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/populator/office/OfficeWorkBookPopulatorTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/populator/office/OfficeWorkBookPopulatorTest.java
@@ -22,6 +22,7 @@ import com.jayway.restassured.builder.RequestSpecBuilder;
 import com.jayway.restassured.builder.ResponseSpecBuilder;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.io.IOException;
 import org.apache.fineract.infrastructure.bulkimport.constants.OfficeConstants;
 import org.apache.fineract.infrastructure.bulkimport.constants.TemplatePopulateImportConstants;
 import org.apache.fineract.integrationtests.common.OfficeHelper;
@@ -33,8 +34,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.io.IOException;
-
 public class OfficeWorkBookPopulatorTest {
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/populator/savings/SavingsWorkbookPopulateTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/populator/savings/SavingsWorkbookPopulateTest.java
index e1aaeb5..4c6304f 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/populator/savings/SavingsWorkbookPopulateTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/populator/savings/SavingsWorkbookPopulateTest.java
@@ -23,6 +23,9 @@ import com.jayway.restassured.builder.ResponseSpecBuilder;
 import com.jayway.restassured.http.ContentType;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.io.IOException;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
 import org.apache.fineract.infrastructure.bulkimport.constants.TemplatePopulateImportConstants;
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.GroupHelper;
@@ -38,10 +41,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import java.io.IOException;
-
 public class SavingsWorkbookPopulateTest {
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/BatchHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/BatchHelper.java
index 0570a7d..0d111ed 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/BatchHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/BatchHelper.java
@@ -18,19 +18,17 @@
  */
 package org.apache.fineract.integrationtests.common;
 
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
 import org.junit.Assert;
 
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 /**
  * Helper class for {@link org.apache.fineract.integrationtests.BatchApiTest}. It
  * takes care of creation of {@code BatchRequest} list and posting this list to
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CalendarHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CalendarHelper.java
index da1f14b..e514b8e 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CalendarHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CalendarHelper.java
@@ -21,11 +21,10 @@ package org.apache.fineract.integrationtests.common;
 import static com.jayway.restassured.path.json.JsonPath.from;
 import static org.junit.Assert.assertEquals;
 
-import java.util.HashMap;
-
 import com.google.gson.Gson;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.util.HashMap;
 
 public class CalendarHelper {
 
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 fdbec38..06d48dc 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
@@ -19,10 +19,9 @@
 package org.apache.fineract.integrationtests.common;
 
 import com.google.gson.Gson;
-import org.apache.fineract.infrastructure.core.service.DateUtils;
-
 import java.util.ArrayList;
 import java.util.HashMap;
+import org.apache.fineract.infrastructure.core.service.DateUtils;
 
 public class CenterDomain implements Comparable<CenterDomain> {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterHelper.java
index 17531d8..6e69a64 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterHelper.java
@@ -18,18 +18,15 @@
  */
 package org.apache.fineract.integrationtests.common;
 
-import java.util.ArrayList;
-
 import static org.junit.Assert.assertEquals;
 
-import java.util.HashMap;
-
-import org.apache.commons.lang3.StringUtils;
-
 import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.util.ArrayList;
+import java.util.HashMap;
+import org.apache.commons.lang3.StringUtils;
 
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class CenterHelper {
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ClientChargesTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ClientChargesTest.java
index 19b3ca5..5754d27 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ClientChargesTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ClientChargesTest.java
@@ -18,21 +18,19 @@
  */
 package org.apache.fineract.integrationtests.common;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
-
 import org.apache.fineract.integrationtests.common.charges.ChargesHelper;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 /**
  *
  * IntegrationTest for ClientCharges.
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ClientHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ClientHelper.java
index 4726214..6a8088e 100755
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ClientHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ClientHelper.java
@@ -20,6 +20,9 @@ package org.apache.fineract.integrationtests.common;
 
 import static org.junit.Assert.assertEquals;
 
+import com.google.gson.Gson;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -27,19 +30,13 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
 import org.apache.fineract.infrastructure.bulkimport.data.GlobalEntityType;
 import org.apache.fineract.integrationtests.common.system.CodeHelper;
-
-import com.google.gson.Gson;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Workbook;
 
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-
 public class ClientHelper {
 
     private final RequestSpecification requestSpec;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CurrenciesHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CurrenciesHelper.java
index f0f57d8..5b4e335 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CurrenciesHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CurrenciesHelper.java
@@ -22,7 +22,6 @@ import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ExternalServicesConfigurationHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ExternalServicesConfigurationHelper.java
index 35011db..843c9f1 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ExternalServicesConfigurationHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ExternalServicesConfigurationHelper.java
@@ -18,12 +18,11 @@
  */
 package org.apache.fineract.integrationtests.common;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-
 import com.google.gson.Gson;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.util.ArrayList;
+import java.util.HashMap;
 
 public class ExternalServicesConfigurationHelper {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/GlobalConfigurationHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/GlobalConfigurationHelper.java
index dffa316..59cdbed 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/GlobalConfigurationHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/GlobalConfigurationHelper.java
@@ -18,14 +18,11 @@
  */
 package org.apache.fineract.integrationtests.common;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Random;
-
 import com.google.gson.Gson;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.util.ArrayList;
+import java.util.HashMap;
 import org.junit.Assert;
 
 @SuppressWarnings({ "unused", "rawtypes" })
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/GroupHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/GroupHelper.java
index ab2a9eb..c9aa956 100755
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/GroupHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/GroupHelper.java
@@ -22,16 +22,14 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import com.google.gson.Gson;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-
 import org.apache.commons.lang3.StringUtils;
 
-import com.google.gson.Gson;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 public class GroupHelper {
 
     private final RequestSpecification requestSpec;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/HolidayHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/HolidayHelper.java
index 14b01c6..8c0cb00 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/HolidayHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/HolidayHelper.java
@@ -18,16 +18,12 @@
  */
 package org.apache.fineract.integrationtests.common;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.apache.fineract.integrationtests.common.Utils;
-
 import com.google.gson.Gson;
-import com.jayway.restassured.specification.RequestSender;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 
 @SuppressWarnings({ "unused", "rawtypes" })
 public class HolidayHelper {
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/HookHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/HookHelper.java
index 5796751..f2a9b20 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/HookHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/HookHelper.java
@@ -20,13 +20,12 @@ package org.apache.fineract.integrationtests.common;
 
 import static org.junit.Assert.assertEquals;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-
 import com.google.gson.Gson;
 import com.jayway.restassured.builder.ResponseSpecBuilder;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.util.ArrayList;
+import java.util.HashMap;
 
 public class HookHelper {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ImageHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ImageHelper.java
index c076740..613f763 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ImageHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ImageHelper.java
@@ -18,10 +18,9 @@
  */
 package org.apache.fineract.integrationtests.common;
 
-import org.apache.http.HttpHeaders;
-
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import org.apache.http.HttpHeaders;
 
 public class ImageHelper {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/OfficeHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/OfficeHelper.java
index cd72f2b..5895ad3 100755
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/OfficeHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/OfficeHelper.java
@@ -18,22 +18,19 @@
  */
 package org.apache.fineract.integrationtests.common;
 
+import com.google.common.reflect.TypeToken;
+import com.google.gson.Gson;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
-
-import com.google.common.reflect.TypeToken;
-import com.google.gson.Gson;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Workbook;
-
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Workbook;
 
 public class OfficeHelper {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/PasswordPreferencesHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/PasswordPreferencesHelper.java
index 6149ecc..defeb69 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/PasswordPreferencesHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/PasswordPreferencesHelper.java
@@ -18,11 +18,10 @@
  */
 package org.apache.fineract.integrationtests.common;
 
-import java.util.HashMap;
-
 import com.google.gson.Gson;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.util.HashMap;
 
 public class PasswordPreferencesHelper {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/PaymentTypeHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/PaymentTypeHelper.java
index e4ce208..9f207db 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/PaymentTypeHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/PaymentTypeHelper.java
@@ -20,12 +20,11 @@ package org.apache.fineract.integrationtests.common;
 
 import static org.junit.Assert.assertEquals;
 
-import java.util.HashMap;
-
 import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.util.HashMap;
 
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class PaymentTypeHelper {
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ProvisioningIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ProvisioningIntegrationTest.java
index c8bbd02..9eccc90 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ProvisioningIntegrationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ProvisioningIntegrationTest.java
@@ -18,6 +18,12 @@
  */
 package org.apache.fineract.integrationtests.common;
 
+import com.google.gson.Gson;
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -26,7 +32,6 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.fineract.integrationtests.common.accounting.Account;
 import org.apache.fineract.integrationtests.common.accounting.AccountHelper;
 import org.apache.fineract.integrationtests.common.loans.LoanApplicationTestBuilder;
@@ -40,13 +45,6 @@ import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.gson.Gson;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class ProvisioningIntegrationTest {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/SchedulerJobHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/SchedulerJobHelper.java
index 882e14d..6c2505f 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/SchedulerJobHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/SchedulerJobHelper.java
@@ -18,15 +18,13 @@
  */
 package org.apache.fineract.integrationtests.common;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import org.junit.Assert;
-
 import com.google.gson.Gson;
 import com.jayway.restassured.builder.ResponseSpecBuilder;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.util.ArrayList;
+import java.util.HashMap;
+import org.junit.Assert;
 
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class SchedulerJobHelper {
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/StandingInstructionsHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/StandingInstructionsHelper.java
index d0b1942..1cc39e3 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/StandingInstructionsHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/StandingInstructionsHelper.java
@@ -18,14 +18,11 @@
  */
 package org.apache.fineract.integrationtests.common;
 
-import java.util.HashMap;
-import java.util.List;
-
-import org.apache.fineract.integrationtests.common.Utils;
-
 import com.google.gson.Gson;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.util.HashMap;
+import java.util.List;
 
 @SuppressWarnings({"unused", "rawtypes", "unchecked" })
 public class StandingInstructionsHelper {
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/SurveyHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/SurveyHelper.java
index 2fb2b09..b4865ab 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/SurveyHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/SurveyHelper.java
@@ -18,14 +18,13 @@
  */
 package org.apache.fineract.integrationtests.common;
 
+import static org.junit.Assert.assertEquals;
+
 import com.google.gson.Gson;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
-
 import java.util.HashMap;
 
-import static org.junit.Assert.assertEquals;
-
 public class SurveyHelper {
 
     private static final String FULFIL_SURVEY_URL = "/fineract-provider/api/v1/survey/ppi_kenya_2009/clientId?" + Utils.TENANT_IDENTIFIER;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/TaxComponentHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/TaxComponentHelper.java
index 80c3690..b368a9a 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/TaxComponentHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/TaxComponentHelper.java
@@ -18,13 +18,11 @@
  */
 package org.apache.fineract.integrationtests.common;
 
-import java.util.HashMap;
-
-import org.apache.fineract.integrationtests.common.accounting.Account;
-
 import com.google.gson.Gson;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.util.HashMap;
+import org.apache.fineract.integrationtests.common.accounting.Account;
 
 public class TaxComponentHelper {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/TaxGroupHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/TaxGroupHelper.java
index f0faa0f..72562e8 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/TaxGroupHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/TaxGroupHelper.java
@@ -18,15 +18,14 @@
  */
 package org.apache.fineract.integrationtests.common;
 
+import com.google.gson.Gson;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 
-import com.google.gson.Gson;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 public class TaxGroupHelper {
 
     private static final String CREATE_TAX_COMPONENT_URL = "/fineract-provider/api/v1/taxes/group?" + Utils.TENANT_IDENTIFIER;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java
index 68142e0..2530b44 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java
@@ -24,6 +24,12 @@ import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 
+import com.jayway.restassured.RestAssured;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.path.json.JsonPath;
+import com.jayway.restassured.response.Response;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.io.File;
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -32,14 +38,6 @@ import java.util.Calendar;
 import java.util.Locale;
 import java.util.Random;
 import java.util.TimeZone;
-
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.path.json.JsonPath;
-import com.jayway.restassured.response.Response;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.conn.HttpHostConnectException;
 import org.joda.time.DateTimeZone;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/WorkingDaysHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/WorkingDaysHelper.java
index f352c9d..0f6841d 100755
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/WorkingDaysHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/WorkingDaysHelper.java
@@ -21,7 +21,6 @@ package org.apache.fineract.integrationtests.common;
 import com.google.gson.Gson;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
-
 import java.util.HashMap;
 import java.util.Random;
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/AccountHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/AccountHelper.java
index d83ead3..4b9effe 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/AccountHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/AccountHelper.java
@@ -18,14 +18,12 @@
  */
 package org.apache.fineract.integrationtests.common.accounting;
 
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.HashMap;
-
 import org.apache.fineract.integrationtests.common.Utils;
 
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 @SuppressWarnings("rawtypes")
 public class AccountHelper {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/FinancialActivityAccountHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/FinancialActivityAccountHelper.java
index ae20cda..0901e90 100755
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/FinancialActivityAccountHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/FinancialActivityAccountHelper.java
@@ -18,14 +18,12 @@
  */
 package org.apache.fineract.integrationtests.common.accounting;
 
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.HashMap;
 import java.util.List;
-
 import org.apache.fineract.integrationtests.common.Utils;
 
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 @SuppressWarnings("rawtypes")
 public class FinancialActivityAccountHelper {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/FinancialActivityAccountsMappingBuilder.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/FinancialActivityAccountsMappingBuilder.java
index 2436330..b0f59d6 100755
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/FinancialActivityAccountsMappingBuilder.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/FinancialActivityAccountsMappingBuilder.java
@@ -18,9 +18,8 @@
  */
 package org.apache.fineract.integrationtests.common.accounting;
 
-import java.util.HashMap;
-
 import com.google.gson.Gson;
+import java.util.HashMap;
 
 public class FinancialActivityAccountsMappingBuilder {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/GLAccountBuilder.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/GLAccountBuilder.java
index be8f27f..0c9189f 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/GLAccountBuilder.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/GLAccountBuilder.java
@@ -19,10 +19,9 @@
 package org.apache.fineract.integrationtests.common.accounting;
 
 import com.google.gson.Gson;
-import org.apache.fineract.integrationtests.common.Utils;
-
 import java.util.Calendar;
 import java.util.HashMap;
+import org.apache.fineract.integrationtests.common.Utils;
 
 public class GLAccountBuilder {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/JournalEntryHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/JournalEntryHelper.java
index 6bd4579..59276a8 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/JournalEntryHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/JournalEntryHelper.java
@@ -18,19 +18,15 @@
  */
 package org.apache.fineract.integrationtests.common.accounting;
 
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.HashMap;
-
 import org.apache.fineract.integrationtests.common.Utils;
 import org.junit.Assert;
 
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 @SuppressWarnings("rawtypes")
 public class JournalEntryHelper {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/PeriodicAccrualAccountingHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/PeriodicAccrualAccountingHelper.java
index 843f8e0..9284fc7 100755
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/PeriodicAccrualAccountingHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/PeriodicAccrualAccountingHelper.java
@@ -18,13 +18,11 @@
  */
 package org.apache.fineract.integrationtests.common.accounting;
 
-import java.util.HashMap;
-
-import org.apache.fineract.integrationtests.common.Utils;
-
 import com.google.gson.Gson;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.util.HashMap;
+import org.apache.fineract.integrationtests.common.Utils;
 
 public class PeriodicAccrualAccountingHelper {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/charges/ChargesHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/charges/ChargesHelper.java
index f94592e..0e5a638 100755
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/charges/ChargesHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/charges/ChargesHelper.java
@@ -18,15 +18,13 @@
  */
 package org.apache.fineract.integrationtests.common.charges;
 
+import com.google.gson.Gson;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.HashMap;
-
 import org.apache.fineract.integrationtests.common.CommonConstants;
 import org.apache.fineract.integrationtests.common.Utils;
-
-import com.google.gson.Gson;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
 import org.apache.fineract.portfolio.charge.domain.ChargeTimeType;
 
 @SuppressWarnings({ "rawtypes", "unchecked" })
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositAccountHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositAccountHelper.java
index 64bd4c8..045e00a 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositAccountHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositAccountHelper.java
@@ -18,18 +18,15 @@
  */
 package org.apache.fineract.integrationtests.common.fixeddeposit;
 
+import com.google.gson.Gson;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.HashMap;
-import java.util.List;
-
 import org.apache.fineract.integrationtests.common.CommonConstants;
 import org.apache.fineract.integrationtests.common.Utils;
 
-import com.google.gson.Gson;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 @SuppressWarnings({ "unused", "rawtypes" })
 public class FixedDepositAccountHelper {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositAccountStatusChecker.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositAccountStatusChecker.java
index fad699d..81bda5f 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositAccountStatusChecker.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositAccountStatusChecker.java
@@ -20,14 +20,12 @@ package org.apache.fineract.integrationtests.common.fixeddeposit;
 
 import static org.junit.Assert.assertTrue;
 
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.HashMap;
-
 import org.apache.fineract.integrationtests.common.Utils;
 import org.junit.Assert;
 
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 @SuppressWarnings("rawtypes")
 public class FixedDepositAccountStatusChecker {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositProductHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositProductHelper.java
index d917cbc..6e90499 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositProductHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositProductHelper.java
@@ -18,23 +18,16 @@
  */
 package org.apache.fineract.integrationtests.common.fixeddeposit;
 
-import static org.junit.Assert.assertEquals;
-
+import com.google.gson.Gson;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.fineract.integrationtests.common.CommonConstants;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.accounting.Account;
-import org.apache.fineract.integrationtests.common.accounting.Account.AccountType;
-import org.apache.fineract.integrationtests.common.savings.SavingsProductHelper;
-
-import com.google.gson.Gson;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
 
 @SuppressWarnings({ "unused", "rawtypes" })
 public class FixedDepositProductHelper {
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/funds/FundsResourceHandler.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/funds/FundsResourceHandler.java
index 5d605fc..bd3e278 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/funds/FundsResourceHandler.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/funds/FundsResourceHandler.java
@@ -22,11 +22,9 @@ import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
-
-import org.apache.fineract.integrationtests.common.Utils;
-
 import java.util.HashMap;
 import java.util.List;
+import org.apache.fineract.integrationtests.common.Utils;
 
 public class FundsResourceHandler {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanApplicationTestBuilder.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanApplicationTestBuilder.java
index b88c30b..b00fabc 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanApplicationTestBuilder.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanApplicationTestBuilder.java
@@ -18,12 +18,11 @@
  */
 package org.apache.fineract.integrationtests.common.loans;
 
+import com.google.gson.Gson;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-import com.google.gson.Gson;
-
 public class LoanApplicationTestBuilder {
 
     private static final String DAYS = "0";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanDisbursementTestBuilder.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanDisbursementTestBuilder.java
index 192de1f..6ba7362 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanDisbursementTestBuilder.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanDisbursementTestBuilder.java
@@ -18,10 +18,6 @@
  */
 package org.apache.fineract.integrationtests.common.loans;
 
-import static org.junit.Assert.assertEquals;
-
-import java.util.HashMap;
-
 public class LoanDisbursementTestBuilder {
 
     String dueDate = null;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanProductTestBuilder.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanProductTestBuilder.java
index 41014e7..9dbaa9a 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanProductTestBuilder.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanProductTestBuilder.java
@@ -18,17 +18,15 @@
  */
 package org.apache.fineract.integrationtests.common.loans;
 
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.accounting.Account;
 
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-
 public class LoanProductTestBuilder {
 
     private static final String LOCALE = "en_GB";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanRescheduleRequestTestBuilder.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanRescheduleRequestTestBuilder.java
index 0c8124f..a445416 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanRescheduleRequestTestBuilder.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanRescheduleRequestTestBuilder.java
@@ -18,9 +18,8 @@
  */
 package org.apache.fineract.integrationtests.common.loans;
 
-import java.util.HashMap;
-
 import com.google.gson.Gson;
+import java.util.HashMap;
 
 public class LoanRescheduleRequestTestBuilder {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanStatusChecker.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanStatusChecker.java
index 72d9ce8..e870745 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanStatusChecker.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanStatusChecker.java
@@ -18,16 +18,14 @@
  */
 package org.apache.fineract.integrationtests.common.loans;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertEquals;
-
-import java.util.HashMap;
-
-import org.apache.fineract.integrationtests.common.Utils;
 
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.util.HashMap;
+import org.apache.fineract.integrationtests.common.Utils;
 
 @SuppressWarnings("rawtypes")
 public class LoanStatusChecker {
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanTransactionHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanTransactionHelper.java
index 854787c..82f144e 100755
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanTransactionHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanTransactionHelper.java
@@ -21,6 +21,9 @@ package org.apache.fineract.integrationtests.common.loans;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import com.google.gson.Gson;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -28,21 +31,14 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-
-import org.apache.fineract.infrastructure.bulkimport.data.GlobalEntityType;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
 import org.apache.fineract.integrationtests.common.CommonConstants;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.joda.time.LocalDate;
 
-import com.google.gson.Gson;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class LoanTransactionHelper {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/CampaignsHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/CampaignsHelper.java
index c45077a..17fdb83 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/CampaignsHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/CampaignsHelper.java
@@ -22,21 +22,19 @@ import static com.jayway.restassured.RestAssured.given;
 import static com.jayway.restassured.path.json.JsonPath.from;
 import static org.junit.Assert.assertEquals;
 
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.report.ReportData;
 import org.joda.time.LocalDateTime;
 import org.springframework.util.Assert;
 
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 public class CampaignsHelper {
 
     private final RequestSpecification requestSpec;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/CampaignsTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/CampaignsTest.java
index 16bb88c..2a94140 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/CampaignsTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/CampaignsTest.java
@@ -20,21 +20,19 @@ package org.apache.fineract.integrationtests.common.organisation;
 
 import static org.junit.Assert.assertEquals;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.HashMap;
-
 import org.apache.fineract.integrationtests.common.CommonConstants;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 @Ignore
 public class CampaignsTest {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/CurrencyHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/CurrencyHelper.java
index f6b0462..288d322 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/CurrencyHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/CurrencyHelper.java
@@ -18,23 +18,21 @@
  */
 package org.apache.fineract.integrationtests.common.organisation;
 
+import static com.jayway.restassured.RestAssured.given;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.fineract.integrationtests.common.Utils;
 import org.springframework.util.Assert;
 
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
-import static com.jayway.restassured.RestAssured.given;
-
 public class CurrencyHelper {
 
     private static final String CURRENCY_URL = "/fineract-provider/api/v1/currencies?" + Utils.TENANT_IDENTIFIER;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/EntityDatatableChecksHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/EntityDatatableChecksHelper.java
index 80d774a..91fb0e9 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/EntityDatatableChecksHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/EntityDatatableChecksHelper.java
@@ -18,13 +18,11 @@
  */
 package org.apache.fineract.integrationtests.common.organisation;
 
-import java.util.HashMap;
-
-import org.apache.fineract.integrationtests.common.Utils;
-
 import com.google.gson.Gson;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.util.HashMap;
+import org.apache.fineract.integrationtests.common.Utils;
 
 public class EntityDatatableChecksHelper {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/EntityDatatableChecksIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/EntityDatatableChecksIntegrationTest.java
index cb17289..d51db9f 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/EntityDatatableChecksIntegrationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/EntityDatatableChecksIntegrationTest.java
@@ -21,10 +21,14 @@ package org.apache.fineract.integrationtests.common.organisation;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.CommonConstants;
 import org.apache.fineract.integrationtests.common.GroupHelper;
@@ -39,12 +43,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 /**
  * Entity Datatable Checks Integration Test for checking Creation, Deletion and
  * Retrieval of Entity-Datatable Check
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/StaffHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/StaffHelper.java
index 7bf687e..ae58793 100755
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/StaffHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/StaffHelper.java
@@ -18,16 +18,14 @@
  */
 package org.apache.fineract.integrationtests.common.organisation;
 
+import com.google.gson.Gson;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
-
 import org.apache.fineract.integrationtests.common.Utils;
 
-import com.google.gson.Gson;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 public class StaffHelper {
 
     private static final String TRANSFER_STAFF_URL = "/fineract-provider/api/v1/groups";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/provisioning/ProvisioningHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/provisioning/ProvisioningHelper.java
index 7d11d94..69f0d5f 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/provisioning/ProvisioningHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/provisioning/ProvisioningHelper.java
@@ -18,18 +18,16 @@
  */
 package org.apache.fineract.integrationtests.common.provisioning;
 
+import com.google.gson.Gson;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Random;
-
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.accounting.Account;
 
-import com.google.gson.Gson;
-
 public class ProvisioningHelper {
 
     public final static Map createProvisioingCriteriaJson(ArrayList<Integer> loanProducts, ArrayList categories, Account liability,
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/provisioning/ProvisioningTransactionHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/provisioning/ProvisioningTransactionHelper.java
index 4baed87..580c94f 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/provisioning/ProvisioningTransactionHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/provisioning/ProvisioningTransactionHelper.java
@@ -18,14 +18,12 @@
  */
 package org.apache.fineract.integrationtests.common.provisioning;
 
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.Map;
-
 import org.apache.fineract.integrationtests.common.Utils;
 
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 
 public class ProvisioningTransactionHelper {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositAccountHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositAccountHelper.java
index 905b424..e7896c8 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositAccountHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositAccountHelper.java
@@ -18,21 +18,17 @@
  */
 package org.apache.fineract.integrationtests.common.recurringdeposit;
 
+import com.google.gson.Gson;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Locale;
-
 import org.apache.fineract.integrationtests.common.CommonConstants;
 import org.apache.fineract.integrationtests.common.Utils;
-import org.apache.fineract.integrationtests.common.fixeddeposit.FixedDepositAccountHelper;
-
-import com.google.gson.Gson;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
 
 @SuppressWarnings({ "unused", "rawtypes" })
 public class RecurringDepositAccountHelper {
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositAccountStatusChecker.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositAccountStatusChecker.java
index 51bcf77..c5093b4 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositAccountStatusChecker.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositAccountStatusChecker.java
@@ -20,14 +20,12 @@ package org.apache.fineract.integrationtests.common.recurringdeposit;
 
 import static org.junit.Assert.assertTrue;
 
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.HashMap;
-
 import org.apache.fineract.integrationtests.common.Utils;
 import org.junit.Assert;
 
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 @SuppressWarnings("rawtypes")
 public class RecurringDepositAccountStatusChecker {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositProductHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositProductHelper.java
index d83c939..d5b7219 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositProductHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositProductHelper.java
@@ -18,18 +18,15 @@
  */
 package org.apache.fineract.integrationtests.common.recurringdeposit;
 
+import com.google.gson.Gson;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.accounting.Account;
-import org.apache.fineract.integrationtests.common.fixeddeposit.FixedDepositProductHelper;
-
-import com.google.gson.Gson;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
 
 @SuppressWarnings({ "unused", "rawtypes" })
 public class RecurringDepositProductHelper {
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/AccountTransferHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/AccountTransferHelper.java
index c348b4f..00cb311 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/AccountTransferHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/AccountTransferHelper.java
@@ -18,13 +18,11 @@
  */
 package org.apache.fineract.integrationtests.common.savings;
 
-import java.util.HashMap;
-
-import org.apache.fineract.integrationtests.common.Utils;
-
 import com.google.gson.Gson;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.util.HashMap;
+import org.apache.fineract.integrationtests.common.Utils;
 
 public class AccountTransferHelper {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsAccountHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsAccountHelper.java
index a8cd381..d520c28 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsAccountHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsAccountHelper.java
@@ -21,21 +21,24 @@ package org.apache.fineract.integrationtests.common.savings;
 import com.google.gson.Gson;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
-import org.apache.fineract.integrationtests.common.CommonConstants;
-import org.apache.fineract.integrationtests.common.Utils;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.junit.Assert;
-
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import org.apache.fineract.integrationtests.common.CommonConstants;
+import org.apache.fineract.integrationtests.common.Utils;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.junit.Assert;
 
 @SuppressWarnings({ "rawtypes" })
 public class SavingsAccountHelper {
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsApplicationTestBuilder.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsApplicationTestBuilder.java
index 80425a8..4ec4eb4 100755
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsApplicationTestBuilder.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsApplicationTestBuilder.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.integrationtests.common.savings;
 
 import com.google.gson.Gson;
-
 import java.util.HashMap;
 import java.util.List;
 
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 8af62fe..fc852b5 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
@@ -20,18 +20,14 @@ package org.apache.fineract.integrationtests.common.savings;
 
 import static org.junit.Assert.assertEquals;
 
+import com.google.gson.Gson;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
-
-import org.apache.fineract.integrationtests.common.CommonConstants;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.accounting.Account;
-import org.apache.fineract.integrationtests.common.accounting.Account.AccountType;
-
-import com.google.gson.Gson;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
 
 @SuppressWarnings("unused")
 public class SavingsProductHelper {
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsStatusChecker.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsStatusChecker.java
index dfaed2c..7dbdaaa 100755
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsStatusChecker.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsStatusChecker.java
@@ -20,12 +20,10 @@ package org.apache.fineract.integrationtests.common.savings;
 
 import static org.junit.Assert.assertTrue;
 
-import java.util.HashMap;
-
-import org.apache.fineract.integrationtests.common.Utils;
-
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.util.HashMap;
+import org.apache.fineract.integrationtests.common.Utils;
 
 @SuppressWarnings("rawtypes")
 public class SavingsStatusChecker {
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/DividendsIntegrationTests.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/DividendsIntegrationTests.java
index 06e6088..7ba3f7e 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/DividendsIntegrationTests.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/DividendsIntegrationTests.java
@@ -18,6 +18,12 @@
  */
 package org.apache.fineract.integrationtests.common.shares;
 
+import com.google.gson.Gson;
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -26,7 +32,6 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.savings.SavingsAccountHelper;
@@ -34,13 +39,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.gson.Gson;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 
 public class DividendsIntegrationTests {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareAccountHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareAccountHelper.java
index d39839c..f924c68 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareAccountHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareAccountHelper.java
@@ -18,13 +18,12 @@
  */
 package org.apache.fineract.integrationtests.common.shares;
 
+import com.google.gson.Gson;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.google.gson.Gson;
-
 
 public class ShareAccountHelper {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareAccountIntegrationTests.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareAccountIntegrationTests.java
index 676b364..836d1ce 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareAccountIntegrationTests.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareAccountIntegrationTests.java
@@ -24,6 +24,14 @@ import com.jayway.restassured.builder.ResponseSpecBuilder;
 import com.jayway.restassured.http.ContentType;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import org.apache.fineract.infrastructure.core.service.DateUtils;
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.Utils;
@@ -31,13 +39,8 @@ import org.apache.fineract.integrationtests.common.charges.ChargesHelper;
 import org.apache.fineract.integrationtests.common.savings.SavingsAccountHelper;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
 public class ShareAccountIntegrationTests {
 
     private RequestSpecification requestSpec;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareAccountTransactionHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareAccountTransactionHelper.java
index 90213bc..9162447 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareAccountTransactionHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareAccountTransactionHelper.java
@@ -20,9 +20,8 @@ package org.apache.fineract.integrationtests.common.shares;
 
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
-import org.apache.fineract.integrationtests.common.Utils;
-
 import java.util.Map;
+import org.apache.fineract.integrationtests.common.Utils;
 
 public class ShareAccountTransactionHelper {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareDividendsTransactionHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareDividendsTransactionHelper.java
index eadf9d7..ee7ab06 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareDividendsTransactionHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareDividendsTransactionHelper.java
@@ -18,12 +18,10 @@
  */
 package org.apache.fineract.integrationtests.common.shares;
 
-import java.util.Map;
-
-import org.apache.fineract.integrationtests.common.Utils;
-
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.util.Map;
+import org.apache.fineract.integrationtests.common.Utils;
 
 
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareProductHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareProductHelper.java
index 0ccedfc..f6b82e8 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareProductHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareProductHelper.java
@@ -19,17 +19,16 @@
 package org.apache.fineract.integrationtests.common.shares;
 
 import com.google.gson.Gson;
-import org.apache.fineract.infrastructure.core.service.DateUtils;
-import org.apache.fineract.integrationtests.common.Utils;
-import org.joda.time.LocalDate;
-import org.junit.Assert;
-
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.apache.fineract.infrastructure.core.service.DateUtils;
+import org.apache.fineract.integrationtests.common.Utils;
+import org.joda.time.LocalDate;
+import org.junit.Assert;
 
 
 public class ShareProductHelper {
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareProductTransactionHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareProductTransactionHelper.java
index 4f42576..d1e5b63 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareProductTransactionHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareProductTransactionHelper.java
@@ -18,12 +18,10 @@
  */
 package org.apache.fineract.integrationtests.common.shares;
 
-import java.util.Map;
-
-import org.apache.fineract.integrationtests.common.Utils;
-
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.util.Map;
+import org.apache.fineract.integrationtests.common.Utils;
 
 
 public class ShareProductTransactionHelper {
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/system/AccountNumberPreferencesHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/system/AccountNumberPreferencesHelper.java
index 0efe77f..11bc4d0 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/system/AccountNumberPreferencesHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/system/AccountNumberPreferencesHelper.java
@@ -18,14 +18,12 @@
  */
 package org.apache.fineract.integrationtests.common.system;
 
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.HashMap;
-
 import org.apache.fineract.integrationtests.common.Utils;
 
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 public class AccountNumberPreferencesHelper {
 
     private final RequestSpecification requestSpec;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/system/AccountNumberPreferencesTestBuilder.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/system/AccountNumberPreferencesTestBuilder.java
index 6d499a5..33f1258 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/system/AccountNumberPreferencesTestBuilder.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/system/AccountNumberPreferencesTestBuilder.java
@@ -18,9 +18,8 @@
  */
 package org.apache.fineract.integrationtests.common.system;
 
-import java.util.HashMap;
-
 import com.google.gson.Gson;
+import java.util.HashMap;
 
 public class AccountNumberPreferencesTestBuilder {
     private String clientAccountType = "1";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/system/CodeHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/system/CodeHelper.java
index 6fe58d7..bddfcd7 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/system/CodeHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/system/CodeHelper.java
@@ -20,16 +20,14 @@ package org.apache.fineract.integrationtests.common.system;
 
 import static com.jayway.restassured.RestAssured.given;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.apache.fineract.integrationtests.common.Utils;
-
 import com.google.gson.Gson;
 import com.jayway.restassured.path.json.JsonPath;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import org.apache.fineract.integrationtests.common.Utils;
 
 public class CodeHelper {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/system/DatatableHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/system/DatatableHelper.java
index b9494e1..b97b387 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/system/DatatableHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/system/DatatableHelper.java
@@ -20,16 +20,14 @@ package org.apache.fineract.integrationtests.common.system;
 
 import static org.junit.Assert.assertEquals;
 
+import com.google.gson.Gson;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-
 import org.apache.fineract.integrationtests.common.Utils;
 
-import com.google.gson.Gson;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 public class DatatableHelper {
 
     private final RequestSpecification requestSpec;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/xbrl/XBRLIntegrationTestHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/xbrl/XBRLIntegrationTestHelper.java
index 6a24996..5f8b334 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/xbrl/XBRLIntegrationTestHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/xbrl/XBRLIntegrationTestHelper.java
@@ -18,14 +18,12 @@
  */
 package org.apache.fineract.integrationtests.common.xbrl;
 
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.HashMap;
-
 import org.apache.fineract.integrationtests.common.Utils;
 
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 @SuppressWarnings("rawtypes")
 public class XBRLIntegrationTestHelper {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/interoperation/InteropHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/interoperation/InteropHelper.java
index 19afa1f..8838bd8 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/interoperation/InteropHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/interoperation/InteropHelper.java
@@ -22,6 +22,9 @@ import com.google.gson.Gson;
 import com.jayway.restassured.path.json.JsonPath;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.UUID;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.interoperation.domain.InteropAmountType;
 import org.apache.fineract.interoperation.domain.InteropIdentifierType;
@@ -33,10 +36,6 @@ import org.apache.fineract.interoperation.util.InteropUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.UUID;
-
 @SuppressWarnings({ "rawtypes" })
 public class InteropHelper {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/interoperation/InteropTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/interoperation/InteropTest.java
index 4b48e1a..35dbb3c 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/interoperation/InteropTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/interoperation/InteropTest.java
@@ -18,6 +18,9 @@
  */
 package org.apache.fineract.integrationtests.interoperation;
 
+import static org.apache.fineract.integrationtests.common.savings.SavingsAccountHelper.ACCOUNT_TYPE_INDIVIDUAL;
+import static org.apache.fineract.integrationtests.interoperation.InteropHelper.PARAM_ACCOUNT_BALANCE;
+
 import com.jayway.restassured.builder.RequestSpecBuilder;
 import com.jayway.restassured.builder.ResponseSpecBuilder;
 import com.jayway.restassured.http.ContentType;
@@ -25,6 +28,12 @@ import com.jayway.restassured.internal.path.ObjectConverter;
 import com.jayway.restassured.path.json.JsonPath;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.math.BigDecimal;
+import java.math.MathContext;
+import java.math.RoundingMode;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.accounting.Account;
@@ -46,16 +55,6 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.math.BigDecimal;
-import java.math.MathContext;
-import java.math.RoundingMode;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import static org.apache.fineract.integrationtests.common.savings.SavingsAccountHelper.ACCOUNT_TYPE_INDIVIDUAL;
-import static org.apache.fineract.integrationtests.interoperation.InteropHelper.PARAM_ACCOUNT_BALANCE;
-
 public class InteropTest {
 
     private final static Logger log = LoggerFactory.getLogger(InteropTest.class);
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/loanaccount/guarantor/GuarantorHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/loanaccount/guarantor/GuarantorHelper.java
index 75e279c..a4cfa5f 100755
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/loanaccount/guarantor/GuarantorHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/loanaccount/guarantor/GuarantorHelper.java
@@ -18,15 +18,13 @@
  */
 package org.apache.fineract.integrationtests.loanaccount.guarantor;
 
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.HashMap;
 import java.util.List;
-
 import org.apache.fineract.integrationtests.common.CommonConstants;
 import org.apache.fineract.integrationtests.common.Utils;
 
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 public class GuarantorHelper {
 
     private static final String LOAN_URL = "/fineract-provider/api/v1/loans/";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/loanaccount/guarantor/GuarantorTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/loanaccount/guarantor/GuarantorTest.java
index b070791..5702b55 100755
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/loanaccount/guarantor/GuarantorTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/loanaccount/guarantor/GuarantorTest.java
@@ -22,6 +22,11 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -29,7 +34,6 @@ import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
-
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.CommonConstants;
 import org.apache.fineract.integrationtests.common.Utils;
@@ -42,12 +46,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 public class GuarantorTest {
 
     private ResponseSpecification responseSpec;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/loanaccount/guarantor/GuarantorTestBuilder.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/loanaccount/guarantor/GuarantorTestBuilder.java
index 30144ed..f82ea9a 100755
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/loanaccount/guarantor/GuarantorTestBuilder.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/loanaccount/guarantor/GuarantorTestBuilder.java
@@ -18,12 +18,10 @@
  */
 package org.apache.fineract.integrationtests.loanaccount.guarantor;
 
+import com.google.gson.Gson;
 import java.util.HashMap;
-
 import org.apache.fineract.integrationtests.common.Utils;
 
-import com.google.gson.Gson;
-
 public class GuarantorTestBuilder {
 
     private static final String GUARANTOR_TYPE_CUSTOMER = "1";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/useradministration/roles/RolesHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/useradministration/roles/RolesHelper.java
index 72cf27d..5ad049e 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/useradministration/roles/RolesHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/useradministration/roles/RolesHelper.java
@@ -18,13 +18,11 @@
  */
 package org.apache.fineract.integrationtests.useradministration.roles;
 
-import java.util.HashMap;
-
-import org.apache.fineract.integrationtests.common.Utils;
-
 import com.google.gson.Gson;
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
+import java.util.HashMap;
+import org.apache.fineract.integrationtests.common.Utils;
 
 public class RolesHelper {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/useradministration/users/UserHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/useradministration/users/UserHelper.java
index ea5b4c8..2dc586c 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/useradministration/users/UserHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/useradministration/users/UserHelper.java
@@ -20,7 +20,6 @@ package org.apache.fineract.integrationtests.useradministration.users;
 
 import com.jayway.restassured.specification.RequestSpecification;
 import com.jayway.restassured.specification.ResponseSpecification;
-
 import org.apache.fineract.integrationtests.common.Utils;
 
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/variableinstallments/VariableInstallmentsDecliningBalanceHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/variableinstallments/VariableInstallmentsDecliningBalanceHelper.java
index 30cdcd3..cfdb9bc 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/variableinstallments/VariableInstallmentsDecliningBalanceHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/variableinstallments/VariableInstallmentsDecliningBalanceHelper.java
@@ -18,6 +18,7 @@
  */
 package org.apache.fineract.integrationtests.variableinstallments;
 
+import com.google.gson.Gson;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -26,13 +27,10 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.fineract.integrationtests.common.accounting.Account;
 import org.apache.fineract.integrationtests.common.loans.LoanApplicationTestBuilder;
 import org.apache.fineract.integrationtests.common.loans.LoanProductTestBuilder;
 
-import com.google.gson.Gson;
-
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class VariableInstallmentsDecliningBalanceHelper {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/variableinstallments/VariableInstallmentsFlatHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/variableinstallments/VariableInstallmentsFlatHelper.java
index 1190a4a..e39f6f1 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/variableinstallments/VariableInstallmentsFlatHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/variableinstallments/VariableInstallmentsFlatHelper.java
@@ -18,6 +18,7 @@
  */
 package org.apache.fineract.integrationtests.variableinstallments;
 
+import com.google.gson.Gson;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -26,13 +27,10 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.fineract.integrationtests.common.accounting.Account;
 import org.apache.fineract.integrationtests.common.loans.LoanApplicationTestBuilder;
 import org.apache.fineract.integrationtests.common.loans.LoanProductTestBuilder;
 
-import com.google.gson.Gson;
-
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class VariableInstallmentsFlatHelper {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/variableinstallments/VariableInstallmentsIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/variableinstallments/VariableInstallmentsIntegrationTest.java
index 35d4561..89ac2f2 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/variableinstallments/VariableInstallmentsIntegrationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/variableinstallments/VariableInstallmentsIntegrationTest.java
@@ -18,10 +18,14 @@
  */
 package org.apache.fineract.integrationtests.variableinstallments;
 
+import com.jayway.restassured.builder.RequestSpecBuilder;
+import com.jayway.restassured.builder.ResponseSpecBuilder;
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.fineract.integrationtests.common.ClientHelper;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.loans.LoanStatusChecker;
@@ -30,12 +34,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.builder.ResponseSpecBuilder;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class VariableInstallmentsIntegrationTest {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/variableinstallments/VariableIntallmentsTransactionHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/variableinstallments/VariableIntallmentsTransactionHelper.java
index a3942a2..dd067f9 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/variableinstallments/VariableIntallmentsTransactionHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/variableinstallments/VariableIntallmentsTransactionHelper.java
@@ -18,14 +18,12 @@
  */
 package org.apache.fineract.integrationtests.variableinstallments;
 
+import com.jayway.restassured.specification.RequestSpecification;
+import com.jayway.restassured.specification.ResponseSpecification;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.fineract.integrationtests.common.Utils;
 
-import com.jayway.restassured.specification.RequestSpecification;
-import com.jayway.restassured.specification.ResponseSpecification;
-
 
 @SuppressWarnings("rawtypes")
 public class VariableIntallmentsTransactionHelper {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/accrual/api/AccrualAccountingApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/accrual/api/AccrualAccountingApiResource.java
index 76e5a0c..c4195ce 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/accrual/api/AccrualAccountingApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/accrual/api/AccrualAccountingApiResource.java
@@ -18,13 +18,20 @@
  */
 package org.apache.fineract.accounting.accrual.api;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.SwaggerDefinition;
+import io.swagger.annotations.Tag;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
-
-import io.swagger.annotations.*;
 // import org.apache.fineract.accounting.accrual.swagger.runaccuralPost;
 import org.apache.fineract.commands.domain.CommandWrapper;
 import org.apache.fineract.commands.service.CommandWrapperBuilder;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/accrual/api/AccrualAccountingConstants.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/accrual/api/AccrualAccountingConstants.java
index 62b3c6b..196b03f 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/accrual/api/AccrualAccountingConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/accrual/api/AccrualAccountingConstants.java
@@ -18,10 +18,6 @@
  */
 package org.apache.fineract.accounting.accrual.api;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
 public class AccrualAccountingConstants {
 
     public static final String accrueTillParamName = "tillDate";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/accrual/serialization/AccrualAccountingDataValidator.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/accrual/serialization/AccrualAccountingDataValidator.java
index 6524b2c..bea4a22 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/accrual/serialization/AccrualAccountingDataValidator.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/accrual/serialization/AccrualAccountingDataValidator.java
@@ -21,6 +21,8 @@ package org.apache.fineract.accounting.accrual.serialization;
 import static org.apache.fineract.accounting.accrual.api.AccrualAccountingConstants.PERIODIC_ACCRUAL_ACCOUNTING_RESOURCE_NAME;
 import static org.apache.fineract.accounting.accrual.api.AccrualAccountingConstants.accrueTillParamName;
 
+import com.google.gson.JsonElement;
+import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -28,7 +30,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.fineract.accounting.accrual.api.AccrualAccountingConstants;
 import org.apache.fineract.infrastructure.core.data.ApiParameterError;
@@ -43,9 +44,6 @@ import org.joda.time.LocalDate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.google.gson.JsonElement;
-import com.google.gson.reflect.TypeToken;
-
 /**
  * Implementation of {@link FromApiJsonDeserializer} for
  * {@link GuarantorCommand}'s.
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/accrual/service/AccrualAccountingWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/accrual/service/AccrualAccountingWritePlatformServiceImpl.java
index f77a405..7f42124 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/accrual/service/AccrualAccountingWritePlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/accrual/service/AccrualAccountingWritePlatformServiceImpl.java
@@ -24,7 +24,6 @@ import static org.apache.fineract.accounting.accrual.api.AccrualAccountingConsta
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.fineract.accounting.accrual.serialization.AccrualAccountingDataValidator;
 import org.apache.fineract.infrastructure.core.api.JsonCommand;
 import org.apache.fineract.infrastructure.core.data.ApiParameterError;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/api/GLClosuresApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/api/GLClosuresApiResource.java
index 404a9ec..78fd491 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/api/GLClosuresApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/api/GLClosuresApiResource.java
@@ -18,11 +18,19 @@
  */
 package org.apache.fineract.accounting.closure.api;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.SwaggerDefinition;
+import io.swagger.annotations.Tag;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
@@ -35,8 +43,6 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.UriInfo;
-
-import io.swagger.annotations.*;
 import org.apache.fineract.accounting.closure.data.GLClosureData;
 import org.apache.fineract.accounting.closure.service.GLClosureReadPlatformService;
 import org.apache.fineract.commands.domain.CommandWrapper;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/api/GLClosuresApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/api/GLClosuresApiResourceSwagger.java
index 704eb76..4ec02bd 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/api/GLClosuresApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/api/GLClosuresApiResourceSwagger.java
@@ -22,9 +22,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.joda.time.LocalDate;
 
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-
 final class GLClosuresApiResourceSwagger {
     private GLClosuresApiResourceSwagger() {
         // don't allow to instantiate; use only for live API documentation
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/command/GLClosureCommand.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/command/GLClosureCommand.java
index dddd634..6c6d26b 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/command/GLClosureCommand.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/command/GLClosureCommand.java
@@ -20,7 +20,6 @@ package org.apache.fineract.accounting.closure.command;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.fineract.accounting.closure.api.GLClosureJsonInputParams;
 import org.apache.fineract.infrastructure.core.data.ApiParameterError;
 import org.apache.fineract.infrastructure.core.data.DataValidatorBuilder;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/data/GLClosureData.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/data/GLClosureData.java
index 93b7565..c5e3cb4 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/data/GLClosureData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/data/GLClosureData.java
@@ -20,7 +20,6 @@ package org.apache.fineract.accounting.closure.data;
 
 import java.util.ArrayList;
 import java.util.Collection;
-
 import org.apache.fineract.organisation.office.data.OfficeData;
 import org.joda.time.LocalDate;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/domain/GLClosure.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/domain/GLClosure.java
index 233b6da..7e029b8 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/domain/GLClosure.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/domain/GLClosure.java
@@ -21,7 +21,6 @@ package org.apache.fineract.accounting.closure.domain;
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Map;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
@@ -30,7 +29,6 @@ import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.UniqueConstraint;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.fineract.accounting.closure.api.GLClosureJsonInputParams;
 import org.apache.fineract.infrastructure.core.api.JsonCommand;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/exception/GLClosureInvalidDeleteException.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/exception/GLClosureInvalidDeleteException.java
index 233a99f..ee27086 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/exception/GLClosureInvalidDeleteException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/exception/GLClosureInvalidDeleteException.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.accounting.closure.exception;
 
 import java.util.Date;
-
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/exception/GLClosureInvalidException.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/exception/GLClosureInvalidException.java
index 130ea24..4befc5b 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/exception/GLClosureInvalidException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/exception/GLClosureInvalidException.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.accounting.closure.exception;
 
 import java.util.Date;
-
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/serialization/GLClosureCommandFromApiJsonDeserializer.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/serialization/GLClosureCommandFromApiJsonDeserializer.java
index e9d71e3..d662f56 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/serialization/GLClosureCommandFromApiJsonDeserializer.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/serialization/GLClosureCommandFromApiJsonDeserializer.java
@@ -18,10 +18,11 @@
  */
 package org.apache.fineract.accounting.closure.serialization;
 
+import com.google.gson.JsonElement;
+import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.fineract.accounting.closure.api.GLClosureJsonInputParams;
 import org.apache.fineract.accounting.closure.command.GLClosureCommand;
@@ -34,9 +35,6 @@ import org.joda.time.LocalDate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.google.gson.JsonElement;
-import com.google.gson.reflect.TypeToken;
-
 /**
  * Implementation of {@link FromApiJsonDeserializer} for
  * {@link GuarantorCommand}'s.
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/service/GLClosureReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/service/GLClosureReadPlatformService.java
index 2c329ef..7caa6ce 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/service/GLClosureReadPlatformService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/service/GLClosureReadPlatformService.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.accounting.closure.service;
 
 import java.util.List;
-
 import org.apache.fineract.accounting.closure.data.GLClosureData;
 
 public interface GLClosureReadPlatformService {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/service/GLClosureReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/service/GLClosureReadPlatformServiceImpl.java
index 91c4e6e..5f652aa 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/service/GLClosureReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/service/GLClosureReadPlatformServiceImpl.java
@@ -22,7 +22,6 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.List;
-
 import org.apache.fineract.accounting.closure.data.GLClosureData;
 import org.apache.fineract.accounting.closure.exception.GLClosureNotFoundException;
 import org.apache.fineract.infrastructure.core.domain.JdbcSupport;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/service/GLClosureWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/service/GLClosureWritePlatformServiceJpaRepositoryImpl.java
index 53b8f6e..74c92a7 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/service/GLClosureWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/service/GLClosureWritePlatformServiceJpaRepositoryImpl.java
@@ -20,7 +20,6 @@ package org.apache.fineract.accounting.closure.service;
 
 import java.util.Date;
 import java.util.Map;
-
 import org.apache.fineract.accounting.closure.api.GLClosureJsonInputParams;
 import org.apache.fineract.accounting.closure.command.GLClosureCommand;
 import org.apache.fineract.accounting.closure.domain.GLClosure;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingConstants.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingConstants.java
index b34aeb2..6e5e378 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingConstants.java
@@ -18,13 +18,12 @@
  */
 package org.apache.fineract.accounting.common;
 
-import org.apache.fineract.accounting.financialactivityaccount.data.FinancialActivityData;
-import org.apache.fineract.accounting.glaccount.domain.GLAccountType;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.apache.fineract.accounting.financialactivityaccount.data.FinancialActivityData;
+import org.apache.fineract.accounting.glaccount.domain.GLAccountType;
 
 public class AccountingConstants {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingDropdownReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingDropdownReadPlatformService.java
index 9c0f682..d7301a8 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingDropdownReadPlatformService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingDropdownReadPlatformService.java
@@ -20,7 +20,6 @@ package org.apache.fineract.accounting.common;
 
 import java.util.List;
 import java.util.Map;
-
 import org.apache.fineract.accounting.glaccount.data.GLAccountData;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingDropdownReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingDropdownReadPlatformServiceImpl.java
index 66ce192..fde72cd 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingDropdownReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingDropdownReadPlatformServiceImpl.java
@@ -21,7 +21,6 @@ package org.apache.fineract.accounting.common;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.fineract.accounting.glaccount.data.GLAccountData;
 import org.apache.fineract.accounting.glaccount.domain.GLAccountType;
 import org.apache.fineract.accounting.glaccount.domain.GLAccountUsage;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingEnumerations.java
index 562a88b..de19dea 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingEnumerations.java
@@ -20,7 +20,6 @@ package org.apache.fineract.accounting.common;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.fineract.accounting.glaccount.domain.GLAccountType;
 import org.apache.fineract.accounting.glaccount.domain.GLAccountUsage;
 import org.apache.fineract.accounting.journalentry.domain.JournalEntryType;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResource.java
index 6538fdc..b25fa7a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResource.java
@@ -18,8 +18,16 @@
  */
 package org.apache.fineract.accounting.financialactivityaccount.api;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.SwaggerDefinition;
+import io.swagger.annotations.Tag;
 import java.util.List;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
@@ -31,10 +39,7 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.UriInfo;
-
-import io.swagger.annotations.*;
 import org.apache.fineract.accounting.financialactivityaccount.data.FinancialActivityAccountData;
-import org.apache.fineract.accounting.financialactivityaccount.data.FinancialActivityData;
 import org.apache.fineract.accounting.financialactivityaccount.service.FinancialActivityAccountReadPlatformService;
 import org.apache.fineract.commands.domain.CommandWrapper;
 import org.apache.fineract.commands.service.CommandWrapperBuilder;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResourceSwagger.java
index 3a725ca..8d7c0b4 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResourceSwagger.java
@@ -23,9 +23,6 @@ import io.swagger.annotations.ApiModelProperty;
 import org.apache.fineract.accounting.financialactivityaccount.data.FinancialActivityData;
 import org.apache.fineract.accounting.glaccount.data.GLAccountData;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * Created by sanyam on 24/7/17.
  */
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/data/FinancialActivityAccountData.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/data/FinancialActivityAccountData.java
index 72994eb..599fa8c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/data/FinancialActivityAccountData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/data/FinancialActivityAccountData.java
@@ -20,7 +20,6 @@ package org.apache.fineract.accounting.financialactivityaccount.data;
 
 import java.util.List;
 import java.util.Map;
-
 import org.apache.fineract.accounting.glaccount.data.GLAccountData;
 
 public class FinancialActivityAccountData {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/domain/FinancialActivityAccount.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/domain/FinancialActivityAccount.java
index 3f87468..6527993 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/domain/FinancialActivityAccount.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/domain/FinancialActivityAccount.java
@@ -24,7 +24,6 @@ import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
-
 import org.apache.fineract.accounting.glaccount.domain.GLAccount;
 import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/domain/FinancialActivityAccountRepositoryWrapper.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/domain/FinancialActivityAccountRepositoryWrapper.java
index 60ad08b..cac544c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/domain/FinancialActivityAccountRepositoryWrapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/domain/FinancialActivityAccountRepositoryWrapper.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.accounting.financialactivityaccount.domain;
 
 import java.util.List;
-
 import org.apache.fineract.accounting.financialactivityaccount.exception.FinancialActivityAccountNotFoundException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/serialization/FinancialActivityAccountDataValidator.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/serialization/FinancialActivityAccountDataValidator.java
index 810de31..e63a2cb 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/serialization/FinancialActivityAccountDataValidator.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/serialization/FinancialActivityAccountDataValidator.java
@@ -18,12 +18,13 @@
  */
 package org.apache.fineract.accounting.financialactivityaccount.serialization;
 
+import com.google.gson.JsonElement;
+import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.fineract.accounting.common.AccountingConstants.FINANCIAL_ACTIVITY;
 import org.apache.fineract.accounting.financialactivityaccount.api.FinancialActivityAccountsJsonInputParams;
@@ -35,9 +36,6 @@ import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.google.gson.JsonElement;
-import com.google.gson.reflect.TypeToken;
-
 @Component
 public final class FinancialActivityAccountDataValidator {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/service/FinancialActivityAccountReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/service/FinancialActivityAccountReadPlatformService.java
index 9e0c70e..13424f0 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/service/FinancialActivityAccountReadPlatformService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/service/FinancialActivityAccountReadPlatformService.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.accounting.financialactivityaccount.service;
 
 import java.util.List;
-
 import org.apache.fineract.accounting.financialactivityaccount.data.FinancialActivityAccountData;
 
 public interface FinancialActivityAccountReadPlatformService {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/service/FinancialActivityAccountReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/service/FinancialActivityAccountReadPlatformServiceImpl.java
index d7ef819..929743b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/service/FinancialActivityAccountReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/service/FinancialActivityAccountReadPlatformServiceImpl.java
@@ -22,9 +22,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
-
-import org.apache.fineract.accounting.common.AccountingDropdownReadPlatformService;
 import org.apache.fineract.accounting.common.AccountingConstants.FINANCIAL_ACTIVITY;
+import org.apache.fineract.accounting.common.AccountingDropdownReadPlatformService;
 import org.apache.fineract.accounting.financialactivityaccount.data.FinancialActivityAccountData;
 import org.apache.fineract.accounting.financialactivityaccount.data.FinancialActivityData;
 import org.apache.fineract.accounting.financialactivityaccount.exception.FinancialActivityAccountNotFoundException;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/service/FinancialActivityAccountWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/service/FinancialActivityAccountWritePlatformServiceImpl.java
index 5d4aa2a..e9c23ed 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/service/FinancialActivityAccountWritePlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/service/FinancialActivityAccountWritePlatformServiceImpl.java
@@ -20,9 +20,7 @@ package org.apache.fineract.accounting.financialactivityaccount.service;
 
 import java.util.HashMap;
 import java.util.Map;
-
 import javax.persistence.PersistenceException;
-
 import org.apache.commons.lang.exception.ExceptionUtils;
 import org.apache.fineract.accounting.common.AccountingConstants.FINANCIAL_ACTIVITY;
 import org.apache.fineract.accounting.financialactivityaccount.api.FinancialActivityAccountsJsonInputParams;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/api/GLAccountsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/api/GLAccountsApiResource.java
index e5669f3..b80c1fd 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/api/GLAccountsApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/api/GLAccountsApiResource.java
@@ -18,13 +18,23 @@
  */
 package org.apache.fineract.accounting.glaccount.api;
 
+import com.sun.jersey.core.header.FormDataContentDisposition;
+import com.sun.jersey.multipart.FormDataParam;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.SwaggerDefinition;
+import io.swagger.annotations.Tag;
 import java.io.InputStream;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
@@ -38,11 +48,6 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
-
-import io.swagger.annotations.*;
-import io.swagger.models.parameters.HeaderParameter;
-import com.sun.jersey.core.header.FormDataContentDisposition;
-import com.sun.jersey.multipart.FormDataParam;
 import org.apache.fineract.accounting.common.AccountingConstants;
 import org.apache.fineract.accounting.common.AccountingDropdownReadPlatformService;
 import org.apache.fineract.accounting.glaccount.data.GLAccountData;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/api/GLAccountsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/api/GLAccountsApiResourceSwagger.java
index e546d6e..1408aac 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/api/GLAccountsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/api/GLAccountsApiResourceSwagger.java
@@ -20,13 +20,12 @@ package org.apache.fineract.accounting.glaccount.api;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.Collection;
+import java.util.List;
 import org.apache.fineract.accounting.glaccount.data.GLAccountData;
 import org.apache.fineract.infrastructure.codes.data.CodeValueData;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 
-import java.util.Collection;
-import java.util.List;
-
 /**
  * Created by sanyam on 24/7/17.
  */
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/command/GLAccountCommand.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/command/GLAccountCommand.java
index 94ad2af..4c8b9ef 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/command/GLAccountCommand.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/command/GLAccountCommand.java
@@ -20,7 +20,6 @@ package org.apache.fineract.accounting.glaccount.command;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.fineract.accounting.glaccount.api.GLAccountJsonInputParams;
 import org.apache.fineract.accounting.glaccount.domain.GLAccountType;
 import org.apache.fineract.accounting.glaccount.domain.GLAccountUsage;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/data/GLAccountData.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/data/GLAccountData.java
index 6065162..6cc43e0 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/data/GLAccountData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/data/GLAccountData.java
@@ -18,16 +18,15 @@
  */
 package org.apache.fineract.accounting.glaccount.data;
 
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
 import org.apache.fineract.accounting.common.AccountingEnumerations;
 import org.apache.fineract.accounting.glaccount.domain.GLAccountType;
 import org.apache.fineract.accounting.glaccount.domain.GLAccountUsage;
 import org.apache.fineract.infrastructure.codes.data.CodeValueData;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.List;
-
 /**
  * Immutable object representing a General Ledger Account
  *
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 b68cd4a..ceaa681 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
@@ -22,7 +22,6 @@ import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
@@ -31,7 +30,6 @@ import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
-
 import org.apache.commons.lang.BooleanUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.fineract.accounting.glaccount.api.GLAccountJsonInputParams;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/GLAccountType.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/GLAccountType.java
index 438faf6..e826f5f 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/GLAccountType.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/GLAccountType.java
@@ -18,10 +18,9 @@
  */
 package org.apache.fineract.accounting.glaccount.domain;
 
-import org.apache.fineract.infrastructure.core.data.EnumOptionData;
-
 import java.util.HashMap;
 import java.util.Map;
+import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 
 public enum GLAccountType {
     ASSET(1, "accountType.asset"), LIABILITY(2, "accountType.liability"), EQUITY(3, "accountType.equity"), INCOME(4, "accountType.income"), EXPENSE(
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/TrialBalance.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/TrialBalance.java
index 173a488..8e9543a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/TrialBalance.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/TrialBalance.java
@@ -20,13 +20,15 @@
 package org.apache.fineract.accounting.glaccount.domain;
 
 
-import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom;
-
-
-import javax.persistence.*;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Objects;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom;
 
 @Entity
 @Table(name = "m_trial_balance")
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/TrialBalanceRepository.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/TrialBalanceRepository.java
index 455986c..e5827ba 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/TrialBalanceRepository.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/TrialBalanceRepository.java
@@ -18,13 +18,12 @@
  */
 package org.apache.fineract.accounting.glaccount.domain;
 
+import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
-import java.util.List;
-
 public interface TrialBalanceRepository extends JpaRepository<TrialBalance, Long>, JpaSpecificationExecutor<TrialBalance> {
 
     @Query(value = "select * from m_trial_balance where office_id=:officeId and account_id=:accountId and closing_balance is null order by created_date, entry_date", nativeQuery = true)
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/TrialBalanceRepositoryWrapper.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/TrialBalanceRepositoryWrapper.java
index 06b0a00..262f299 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/TrialBalanceRepositoryWrapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/TrialBalanceRepositoryWrapper.java
@@ -18,12 +18,11 @@
  */
 package org.apache.fineract.accounting.glaccount.domain;
 
+import java.util.List;
 import org.apache.fineract.accounting.trialbalance.exception.TrialBalanceNotFoundException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 @Service
 public class TrialBalanceRepositoryWrapper {
     private  final TrialBalanceRepository repository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/serialization/GLAccountCommandFromApiJsonDeserializer.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/serialization/GLAccountCommandFromApiJsonDeserializer.java
index 76f588b..7c5d4aa 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/serialization/GLAccountCommandFromApiJsonDeserializer.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/serialization/GLAccountCommandFromApiJsonDeserializer.java
@@ -18,10 +18,11 @@
  */
 package org.apache.fineract.accounting.glaccount.serialization;
 
+import com.google.gson.JsonElement;
+import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.fineract.accounting.glaccount.api.GLAccountJsonInputParams;
 import org.apache.fineract.accounting.glaccount.command.GLAccountCommand;
@@ -33,9 +34,6 @@ import org.apache.fineract.portfolio.loanaccount.guarantor.command.GuarantorComm
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.google.gson.JsonElement;
-import com.google.gson.reflect.TypeToken;
-
 /**
  * Implementation of {@link FromApiJsonDeserializer} for
  * {@link GuarantorCommand}'s.
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/service/GLAccountReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/service/GLAccountReadPlatformService.java
index 0e983d0..62dcd38 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/service/GLAccountReadPlatformService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/service/GLAccountReadPlatformService.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.accounting.glaccount.service;
 
 import java.util.List;
-
 import org.apache.fineract.accounting.glaccount.data.GLAccountData;
 import org.apache.fineract.accounting.glaccount.data.GLAccountDataForLookup;
 import org.apache.fineract.accounting.glaccount.domain.GLAccountType;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/service/GLAccountReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/service/GLAccountReadPlatformServiceImpl.java
index 26ad0e2..6fee07f 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/service/GLAccountReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/service/GLAccountReadPlatformServiceImpl.java
@@ -22,7 +22,6 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.List;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.fineract.accounting.common.AccountingEnumerations;
 import org.apache.fineract.accounting.glaccount.data.GLAccountData;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/service/GLAccountWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/service/GLAccountWritePlatformServiceJpaRepositoryImpl.java
index 3a7088a..de32ad1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/service/GLAccountWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/service/GLAccountWritePlatformServiceJpaRepositoryImpl.java
@@ -20,7 +20,6 @@ package org.apache.fineract.accounting.glaccount.service;
 
 import java.util.List;
 import java.util.Map;
-
 import org.apache.fineract.accounting.common.AccountingConstants;
 import org.apache.fineract.accounting.glaccount.api.GLAccountJsonInputParams;
 import org.apache.fineract.accounting.glaccount.command.GLAccountCommand;
@@ -30,12 +29,12 @@ import org.apache.fineract.accounting.glaccount.domain.GLAccountType;
 import org.apache.fineract.accounting.glaccount.exception.GLAccountDisableException;
 import org.apache.fineract.accounting.glaccount.exception.GLAccountDuplicateException;
 import org.apache.fineract.accounting.glaccount.exception.GLAccountInvalidDeleteException;
+import org.apache.fineract.accounting.glaccount.exception.GLAccountInvalidDeleteException.GL_ACCOUNT_INVALID_DELETE_REASON;
 import org.apache.fineract.accounting.glaccount.exception.GLAccountInvalidParentException;
 import org.apache.fineract.accounting.glaccount.exception.GLAccountInvalidUpdateException;
+import org.apache.fineract.accounting.glaccount.exception.GLAccountInvalidUpdateException.GL_ACCOUNT_INVALID_UPDATE_REASON;
 import org.apache.fineract.accounting.glaccount.exception.GLAccountNotFoundException;
 import org.apache.fineract.accounting.glaccount.exception.InvalidParentGLAccountHeadException;
-import org.apache.fineract.accounting.glaccount.exception.GLAccountInvalidDeleteException.GL_ACCOUNT_INVALID_DELETE_REASON;
-import org.apache.fineract.accounting.glaccount.exception.GLAccountInvalidUpdateException.GL_ACCOUNT_INVALID_UPDATE_REASON;
 import org.apache.fineract.accounting.glaccount.serialization.GLAccountCommandFromApiJsonDeserializer;
 import org.apache.fineract.accounting.journalentry.domain.JournalEntry;
 import org.apache.fineract.accounting.journalentry.domain.JournalEntryRepository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/DateParam.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/DateParam.java
index 690b99f..40081c9 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/DateParam.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/DateParam.java
@@ -20,9 +20,7 @@ package org.apache.fineract.accounting.journalentry.api;
 
 import java.util.Date;
 import java.util.Locale;
-
 import javax.ws.rs.WebApplicationException;
-
 import org.apache.fineract.infrastructure.core.serialization.JsonParserHelper;
 import org.joda.time.LocalDate;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntriesApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntriesApiResource.java
index dc36585..7bd53ec 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntriesApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntriesApiResource.java
@@ -18,12 +18,22 @@
  */
 package org.apache.fineract.accounting.journalentry.api;
 
+import com.sun.jersey.core.header.FormDataContentDisposition;
+import com.sun.jersey.multipart.FormDataParam;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.SwaggerDefinition;
+import io.swagger.annotations.Tag;
 import java.io.InputStream;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
@@ -35,13 +45,8 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
-
-import io.swagger.annotations.*;
-import com.sun.jersey.core.header.FormDataContentDisposition;
-import com.sun.jersey.multipart.FormDataParam;
 import org.apache.commons.lang.StringUtils;
 import org.apache.fineract.accounting.journalentry.command.JournalEntryCommand;
-import org.apache.fineract.accounting.journalentry.command.SingleDebitOrCreditEntryCommand;
 import org.apache.fineract.accounting.journalentry.data.JournalEntryAssociationParametersData;
 import org.apache.fineract.accounting.journalentry.data.JournalEntryData;
 import org.apache.fineract.accounting.journalentry.data.OfficeOpeningBalancesData;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntriesApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntriesApiResourceSwagger.java
index 981615e..de91a85 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntriesApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntriesApiResourceSwagger.java
@@ -20,7 +20,6 @@ package org.apache.fineract.accounting.journalentry.api;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.joda.time.LocalDate;
 
 /**
  * Created by sanyam on 25/7/17.
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/command/JournalEntryCommand.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/command/JournalEntryCommand.java
index 1941bcc..8640c7a 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/command/JournalEntryCommand.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/command/JournalEntryCommand.java
@@ -21,7 +21,6 @@ package org.apache.fineract.accounting.journalentry.command;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.fineract.accounting.journalentry.api.JournalEntryJsonInputParams;
 import org.apache.fineract.infrastructure.core.data.ApiParameterError;
 import org.apache.fineract.infrastructure.core.data.DataValidatorBuilder;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/ClientTransactionDTO.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/ClientTransactionDTO.java
index 0165ecb..5e5bfc1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/ClientTransactionDTO.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/ClientTransactionDTO.java
@@ -21,7 +21,6 @@ package org.apache.fineract.accounting.journalentry.data;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
-
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 import org.apache.fineract.portfolio.client.domain.ClientTransactionType;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/JournalEntryData.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/JournalEntryData.java
index 0388d8d..295bf92 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/JournalEntryData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/JournalEntryData.java
@@ -20,9 +20,7 @@ package org.apache.fineract.accounting.journalentry.data;
 
 import java.math.BigDecimal;
 import java.util.List;
-
 import org.apache.fineract.accounting.glaccount.data.GLAccountData;
-import org.apache.fineract.infrastructure.bulkimport.constants.TemplatePopulateImportConstants;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 import org.apache.fineract.organisation.monetary.data.CurrencyData;
 import org.joda.time.LocalDate;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/JournalEntryDataValidator.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/JournalEntryDataValidator.java
index a97b393..1d14658 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/JournalEntryDataValidator.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/JournalEntryDataValidator.java
@@ -18,6 +18,7 @@
  */
 package org.apache.fineract.accounting.journalentry.data;
 
+import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,7 +26,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.fineract.accounting.journalentry.api.JournalEntryJsonInputParams;
 import org.apache.fineract.infrastructure.core.api.JsonCommand;
 import org.apache.fineract.infrastructure.core.data.ApiParameterError;
@@ -35,8 +35,6 @@ import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.google.gson.reflect.TypeToken;
-
 @Component
 public class JournalEntryDataValidator {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/LoanTransactionDTO.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/LoanTransactionDTO.java
index 3b77236..e6d8b62 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/LoanTransactionDTO.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/LoanTransactionDTO.java
@@ -21,7 +21,6 @@ package org.apache.fineract.accounting.journalentry.data;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
-
 import org.apache.fineract.portfolio.loanaccount.data.LoanTransactionEnumData;
 
 public class LoanTransactionDTO {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/OfficeOpeningBalancesData.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/OfficeOpeningBalancesData.java
index 495aaac..9333fce 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/OfficeOpeningBalancesData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/OfficeOpeningBalancesData.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.accounting.journalentry.data;
 
 import java.util.List;
-
 import org.apache.fineract.accounting.glaccount.data.GLAccountData;
 import org.joda.time.LocalDate;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/SavingsTransactionDTO.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/SavingsTransactionDTO.java
index 567ef2d..d0405ee 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/SavingsTransactionDTO.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/SavingsTransactionDTO.java
@@ -21,7 +21,6 @@ package org.apache.fineract.accounting.journalentry.data;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
-
 import org.apache.fineract.portfolio.savings.data.SavingsAccountTransactionEnumData;
 
 public class SavingsTransactionDTO {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/SharesTransactionDTO.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/SharesTransactionDTO.java
index a4871bd..0b54027 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/SharesTransactionDTO.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/data/SharesTransactionDTO.java
@@ -21,7 +21,6 @@ package org.apache.fineract.accounting.journalentry.data;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
-
 import org.apache.fineract.portfolio.shareaccounts.data.ShareAccountTransactionEnumData;
 
 public class SharesTransactionDTO {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/domain/JournalEntry.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/domain/JournalEntry.java
index dda72fb..666c47a 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/domain/JournalEntry.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/domain/JournalEntry.java
@@ -20,7 +20,6 @@ package org.apache.fineract.accounting.journalentry.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
@@ -29,7 +28,6 @@ import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.fineract.accounting.glaccount.domain.GLAccount;
 import org.apache.fineract.infrastructure.core.domain.AbstractAuditableCustom;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/domain/JournalEntryRepository.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/domain/JournalEntryRepository.java
index 0a19408..c12fa9d 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/domain/JournalEntryRepository.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/domain/JournalEntryRepository.java
@@ -18,9 +18,7 @@
  */
 package org.apache.fineract.accounting.journalentry.domain;
 
-import java.util.Date;
 import java.util.List;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/domain/JournalEntryRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/domain/JournalEntryRepositoryImpl.java
index c755555..b0b4adb 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/domain/JournalEntryRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/domain/JournalEntryRepositoryImpl.java
@@ -19,10 +19,8 @@
 package org.apache.fineract.accounting.journalentry.domain;
 
 import java.util.List;
-
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
-
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/exception/JournalEntryInvalidException.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/exception/JournalEntryInvalidException.java
index 85ee0f2..750b73e 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/exception/JournalEntryInvalidException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/exception/JournalEntryInvalidException.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.accounting.journalentry.exception;
 
 import java.util.Date;
-
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/serialization/JournalEntryCommandFromApiJsonDeserializer.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/serialization/JournalEntryCommandFromApiJsonDeserializer.java
index 625554d..0a2277c 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/serialization/JournalEntryCommandFromApiJsonDeserializer.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/serialization/JournalEntryCommandFromApiJsonDeserializer.java
@@ -18,13 +18,16 @@
  */
 package org.apache.fineract.accounting.journalentry.serialization;
 
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.math.BigDecimal;
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.fineract.accounting.journalentry.api.JournalEntryJsonInputParams;
 import org.apache.fineract.accounting.journalentry.command.JournalEntryCommand;
@@ -37,11 +40,6 @@ import org.joda.time.LocalDate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.reflect.TypeToken;
-
 /**
  * Implementation of {@link FromApiJsonDeserializer} for
  * {@link JournalEntryCommand}'s.
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccountingProcessorHelper.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccountingProcessorHelper.java
index 891f72d..542d8e8 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccountingProcessorHelper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccountingProcessorHelper.java
@@ -24,7 +24,6 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.fineract.accounting.closure.domain.GLClosure;
 import org.apache.fineract.accounting.closure.domain.GLClosureRepository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java
index 235c5d2..2923ca0 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java
@@ -25,7 +25,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-
 import org.apache.fineract.accounting.closure.domain.GLClosure;
 import org.apache.fineract.accounting.common.AccountingConstants.ACCRUAL_ACCOUNTS_FOR_LOAN;
 import org.apache.fineract.accounting.common.AccountingConstants.CASH_ACCOUNTS_FOR_LOAN;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForClientTransactions.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForClientTransactions.java
index e237dc4..4f24069 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForClientTransactions.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForClientTransactions.java
@@ -20,7 +20,6 @@ package org.apache.fineract.accounting.journalentry.service;
 
 import java.math.BigDecimal;
 import java.util.Date;
-
 import org.apache.fineract.accounting.closure.domain.GLClosure;
 import org.apache.fineract.accounting.journalentry.data.ClientTransactionDTO;
 import org.apache.fineract.organisation.office.domain.Office;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForLoan.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForLoan.java
index 10742a9..3606426 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForLoan.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForLoan.java
@@ -22,7 +22,6 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-
 import org.apache.fineract.accounting.closure.domain.GLClosure;
 import org.apache.fineract.accounting.common.AccountingConstants.CASH_ACCOUNTS_FOR_LOAN;
 import org.apache.fineract.accounting.common.AccountingConstants.FINANCIAL_ACTIVITY;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForSavings.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForSavings.java
index e077444..d201fcf 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForSavings.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForSavings.java
@@ -21,7 +21,6 @@ package org.apache.fineract.accounting.journalentry.service;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
-
 import org.apache.fineract.accounting.closure.domain.GLClosure;
 import org.apache.fineract.accounting.common.AccountingConstants.CASH_ACCOUNTS_FOR_SAVINGS;
 import org.apache.fineract.accounting.common.AccountingConstants.FINANCIAL_ACTIVITY;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForShares.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForShares.java
index 4ef608d..0d0ef80 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForShares.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/CashBasedAccountingProcessorForShares.java
@@ -21,7 +21,6 @@ package org.apache.fineract.accounting.journalentry.service;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
-
 import org.apache.fineract.accounting.closure.domain.GLClosure;
 import org.apache.fineract.accounting.common.AccountingConstants.CASH_ACCOUNTS_FOR_SHARES;
 import org.apache.fineract.accounting.journalentry.data.ChargePaymentDTO;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryReadPlatformService.java
index b151e82..9ba0631 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryReadPlatformService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryReadPlatformService.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.accounting.journalentry.service;
 
 import java.util.Date;
-
 import org.apache.fineract.accounting.journalentry.data.JournalEntryAssociationParametersData;
 import org.apache.fineract.accounting.journalentry.data.JournalEntryData;
 import org.apache.fineract.accounting.journalentry.data.OfficeOpeningBalancesData;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryReadPlatformServiceImpl.java
index d47210f..faf0ad1 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryReadPlatformServiceImpl.java
@@ -27,7 +27,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.fineract.accounting.common.AccountingEnumerations;
 import org.apache.fineract.accounting.financialactivityaccount.domain.FinancialActivityAccount;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryRunningBalanceUpdateServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryRunningBalanceUpdateServiceImpl.java
index d08e5c7..96ce8b7 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryRunningBalanceUpdateServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryRunningBalanceUpdateServiceImpl.java
@@ -26,7 +26,6 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.fineract.accounting.common.AccountingEnumerations;
 import org.apache.fineract.accounting.glaccount.domain.GLAccountType;
 import org.apache.fineract.accounting.journalentry.api.JournalEntryJsonInputParams;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryWritePlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryWritePlatformService.java
index 261a0a3..4ed5fcf 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryWritePlatformService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryWritePlatformService.java
@@ -21,7 +21,6 @@ package org.apache.fineract.accounting.journalentry.service;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Map;
-
 import org.apache.fineract.accounting.provisioning.domain.ProvisioningEntry;
 import org.apache.fineract.infrastructure.core.api.JsonCommand;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryWritePlatformServiceJpaRepositoryImpl.java
index e1a1437..4ea4951 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryWritePlatformServiceJpaRepositoryImpl.java
@@ -18,6 +18,16 @@
  */
 package org.apache.fineract.accounting.journalentry.service;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import org.apache.commons.lang.StringUtils;
 import org.apache.fineract.accounting.closure.domain.GLClosure;
 import org.apache.fineract.accounting.closure.domain.GLClosureRepository;
@@ -75,9 +85,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.math.BigDecimal;
-import java.util.*;
-
 @Service
 public class JournalEntryWritePlatformServiceJpaRepositoryImpl implements JournalEntryWritePlatformService {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/data/ChargeToGLAccountMapper.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/data/ChargeToGLAccountMapper.java
index 06edf51..f0717e8 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/data/ChargeToGLAccountMapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/data/ChargeToGLAccountMapper.java
@@ -18,11 +18,10 @@
  */
 package org.apache.fineract.accounting.producttoaccountmapping.data;
 
+import java.io.Serializable;
 import org.apache.fineract.accounting.glaccount.data.GLAccountData;
 import org.apache.fineract.portfolio.charge.data.ChargeData;
 
-import java.io.Serializable;
-
 public class ChargeToGLAccountMapper implements Serializable {
 
     @SuppressWarnings("unused")
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/data/PaymentTypeToGLAccountMapper.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/data/PaymentTypeToGLAccountMapper.java
index 2f16185..7021caa 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/data/PaymentTypeToGLAccountMapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/data/PaymentTypeToGLAccountMapper.java
@@ -18,11 +18,10 @@
  */
 package org.apache.fineract.accounting.producttoaccountmapping.data;
 
+import java.io.Serializable;
 import org.apache.fineract.accounting.glaccount.data.GLAccountData;
 import org.apache.fineract.portfolio.paymenttype.data.PaymentTypeData;
 
-import java.io.Serializable;
-
 public class PaymentTypeToGLAccountMapper implements Serializable {
 
     @SuppressWarnings("unused")
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/domain/ProductToGLAccountMapping.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/domain/ProductToGLAccountMapping.java
index 78a5b4d..d67cdf3 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/domain/ProductToGLAccountMapping.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/domain/ProductToGLAccountMapping.java
@@ -24,7 +24,6 @@ import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
-
 import org.apache.fineract.accounting.glaccount.domain.GLAccount;
 import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom;
 import org.apache.fineract.portfolio.charge.domain.Charge;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/domain/ProductToGLAccountMappingRepository.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/domain/ProductToGLAccountMappingRepository.java
index 0882c7b..eec140a 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/domain/ProductToGLAccountMappingRepository.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/domain/ProductToGLAccountMappingRepository.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.accounting.producttoaccountmapping.domain;
 
 import java.util.List;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/serialization/ProductToGLAccountMappingFromApiJsonDeserializer.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/serialization/ProductToGLAccountMappingFromApiJsonDeserializer.java
index 78acef6..4dc45aa 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/serialization/ProductToGLAccountMappingFromApiJsonDeserializer.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/serialization/ProductToGLAccountMappingFromApiJsonDeserializer.java
@@ -22,15 +22,15 @@ import static org.apache.fineract.portfolio.savings.SavingsApiConstants.SAVINGS_
 import static org.apache.fineract.portfolio.savings.SavingsApiConstants.accountingRuleParamName;
 import static org.apache.fineract.portfolio.savings.SavingsApiConstants.isDormancyTrackingActiveParamName;
 
+import com.google.gson.JsonElement;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
-
 import org.apache.commons.lang.StringUtils;
-import org.apache.fineract.accounting.common.AccountingConstants.SHARES_PRODUCT_ACCOUNTING_PARAMS;
-import org.apache.fineract.accounting.common.AccountingRuleType;
 import org.apache.fineract.accounting.common.AccountingConstants.LOAN_PRODUCT_ACCOUNTING_PARAMS;
 import org.apache.fineract.accounting.common.AccountingConstants.SAVINGS_PRODUCT_ACCOUNTING_PARAMS;
+import org.apache.fineract.accounting.common.AccountingConstants.SHARES_PRODUCT_ACCOUNTING_PARAMS;
+import org.apache.fineract.accounting.common.AccountingRuleType;
 import org.apache.fineract.accounting.glaccount.domain.GLAccount;
 import org.apache.fineract.accounting.producttoaccountmapping.service.ProductToGLAccountMappingWritePlatformService;
 import org.apache.fineract.infrastructure.core.data.ApiParameterError;
@@ -44,8 +44,6 @@ import org.apache.fineract.portfolio.shareproducts.constants.ShareProductApiCons
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.google.gson.JsonElement;
-
 /**
  * TODO Vishwas find a better approach for validation
  *
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/LoanProductToGLAccountMappingHelper.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/LoanProductToGLAccountMappingHelper.java
index 79ce0f5..29673f2 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/LoanProductToGLAccountMappingHelper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/LoanProductToGLAccountMappingHelper.java
@@ -18,13 +18,13 @@
  */
 package org.apache.fineract.accounting.producttoaccountmapping.service;
 
+import com.google.gson.JsonElement;
 import java.util.HashMap;
 import java.util.Map;
-
-import org.apache.fineract.accounting.common.AccountingRuleType;
 import org.apache.fineract.accounting.common.AccountingConstants.ACCRUAL_ACCOUNTS_FOR_LOAN;
 import org.apache.fineract.accounting.common.AccountingConstants.CASH_ACCOUNTS_FOR_LOAN;
 import org.apache.fineract.accounting.common.AccountingConstants.LOAN_PRODUCT_ACCOUNTING_PARAMS;
+import org.apache.fineract.accounting.common.AccountingRuleType;
 import org.apache.fineract.accounting.glaccount.domain.GLAccountRepository;
 import org.apache.fineract.accounting.glaccount.domain.GLAccountRepositoryWrapper;
 import org.apache.fineract.accounting.glaccount.domain.GLAccountType;
@@ -37,8 +37,6 @@ import org.apache.fineract.portfolio.paymenttype.domain.PaymentTypeRepositoryWra
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.google.gson.JsonElement;
-
 @Component
 public class LoanProductToGLAccountMappingHelper extends ProductToGLAccountMappingHelper {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingHelper.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingHelper.java
index 79bc991..7ed58b0 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingHelper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingHelper.java
@@ -18,13 +18,15 @@
  */
 package org.apache.fineract.accounting.producttoaccountmapping.service;
 
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.fineract.accounting.common.AccountingConstants.CASH_ACCOUNTS_FOR_LOAN;
 import org.apache.fineract.accounting.common.AccountingConstants.LOAN_PRODUCT_ACCOUNTING_PARAMS;
 import org.apache.fineract.accounting.glaccount.domain.GLAccount;
@@ -45,10 +47,6 @@ import org.apache.fineract.portfolio.paymenttype.domain.PaymentTypeRepositoryWra
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-
 @Component
 public class ProductToGLAccountMappingHelper {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingReadPlatformService.java
index 8e791a2..f1d4229 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingReadPlatformService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingReadPlatformService.java
@@ -20,7 +20,6 @@ package org.apache.fineract.accounting.producttoaccountmapping.service;
 
 import java.util.List;
 import java.util.Map;
-
 import org.apache.fineract.accounting.producttoaccountmapping.data.ChargeToGLAccountMapper;
 import org.apache.fineract.accounting.producttoaccountmapping.data.PaymentTypeToGLAccountMapper;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingReadPlatformServiceImpl.java
index 3141a95..4ed1ae3 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingReadPlatformServiceImpl.java
@@ -24,8 +24,6 @@ import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-
-import org.apache.fineract.accounting.common.AccountingRuleType;
 import org.apache.fineract.accounting.common.AccountingConstants.ACCRUAL_ACCOUNTS_FOR_LOAN;
 import org.apache.fineract.accounting.common.AccountingConstants.CASH_ACCOUNTS_FOR_LOAN;
 import org.apache.fineract.accounting.common.AccountingConstants.CASH_ACCOUNTS_FOR_SAVINGS;
@@ -33,6 +31,7 @@ import org.apache.fineract.accounting.common.AccountingConstants.CASH_ACCOUNTS_F
 import org.apache.fineract.accounting.common.AccountingConstants.LOAN_PRODUCT_ACCOUNTING_DATA_PARAMS;
 import org.apache.fineract.accounting.common.AccountingConstants.SAVINGS_PRODUCT_ACCOUNTING_DATA_PARAMS;
 import org.apache.fineract.accounting.common.AccountingConstants.SHARES_PRODUCT_ACCOUNTING_PARAMS;
+import org.apache.fineract.accounting.common.AccountingRuleType;
 import org.apache.fineract.accounting.glaccount.data.GLAccountData;
 import org.apache.fineract.accounting.producttoaccountmapping.data.ChargeToGLAccountMapper;
 import org.apache.fineract.accounting.producttoaccountmapping.data.PaymentTypeToGLAccountMapper;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingWritePlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingWritePlatformService.java
index c471a13..5b0f58f 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingWritePlatformService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingWritePlatformService.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.accounting.producttoaccountmapping.service;
 
 import java.util.Map;
-
 import org.apache.fineract.infrastructure.core.api.JsonCommand;
 import org.apache.fineract.portfolio.savings.DepositAccountType;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingWritePlatformServiceImpl.java
index 82eff12..4fdf309 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingWritePlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingWritePlatformServiceImpl.java
@@ -21,18 +21,18 @@ package org.apache.fineract.accounting.producttoaccountmapping.service;
 import static org.apache.fineract.portfolio.savings.SavingsApiConstants.accountingRuleParamName;
 import static org.apache.fineract.portfolio.savings.SavingsApiConstants.isDormancyTrackingActiveParamName;
 
+import com.google.gson.JsonElement;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
-
-import org.apache.fineract.accounting.common.AccountingConstants.SHARES_PRODUCT_ACCOUNTING_PARAMS;
-import org.apache.fineract.accounting.common.AccountingRuleType;
 import org.apache.fineract.accounting.common.AccountingConstants.ACCRUAL_ACCOUNTS_FOR_LOAN;
 import org.apache.fineract.accounting.common.AccountingConstants.CASH_ACCOUNTS_FOR_LOAN;
 import org.apache.fineract.accounting.common.AccountingConstants.CASH_ACCOUNTS_FOR_SAVINGS;
 import org.apache.fineract.accounting.common.AccountingConstants.CASH_ACCOUNTS_FOR_SHARES;
 import org.apache.fineract.accounting.common.AccountingConstants.LOAN_PRODUCT_ACCOUNTING_PARAMS;
 import org.apache.fineract.accounting.common.AccountingConstants.SAVINGS_PRODUCT_ACCOUNTING_PARAMS;
+import org.apache.fineract.accounting.common.AccountingConstants.SHARES_PRODUCT_ACCOUNTING_PARAMS;
+import org.apache.fineract.accounting.common.AccountingRuleType;
 import org.apache.fineract.accounting.producttoaccountmapping.serialization.ProductToGLAccountMappingFromApiJsonDeserializer;
 import org.apache.fineract.infrastructure.core.api.JsonCommand;
 import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
@@ -41,8 +41,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.google.gson.JsonElement;
-
 @Service
 public class ProductToGLAccountMappingWritePlatformServiceImpl implements ProductToGLAccountMappingWritePlatformService {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/SavingsProductToGLAccountMappingHelper.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/SavingsProductToGLAccountMappingHelper.java
index 5f1dc5e..e3fb81a 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/SavingsProductToGLAccountMappingHelper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/SavingsProductToGLAccountMappingHelper.java
@@ -18,12 +18,12 @@
  */
 package org.apache.fineract.accounting.producttoaccountmapping.service;
 
+import com.google.gson.JsonElement;
 import java.util.HashMap;
 import java.util.Map;
-
-import org.apache.fineract.accounting.common.AccountingRuleType;
 import org.apache.fineract.accounting.common.AccountingConstants.CASH_ACCOUNTS_FOR_SAVINGS;
 import org.apache.fineract.accounting.common.AccountingConstants.SAVINGS_PRODUCT_ACCOUNTING_PARAMS;
+import org.apache.fineract.accounting.common.AccountingRuleType;
 import org.apache.fineract.accounting.glaccount.domain.GLAccountRepository;
 import org.apache.fineract.accounting.glaccount.domain.GLAccountRepositoryWrapper;
 import org.apache.fineract.accounting.glaccount.domain.GLAccountType;
@@ -36,8 +36,6 @@ import org.apache.fineract.portfolio.paymenttype.domain.PaymentTypeRepositoryWra
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.google.gson.JsonElement;
-
 @Component
 public class SavingsProductToGLAccountMappingHelper extends ProductToGLAccountMappingHelper {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ShareProductToGLAccountMappingHelper.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ShareProductToGLAccountMappingHelper.java
index 8ed0767..7337f95 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ShareProductToGLAccountMappingHelper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ShareProductToGLAccountMappingHelper.java
@@ -18,12 +18,12 @@
  */
 package org.apache.fineract.accounting.producttoaccountmapping.service;
 
+import com.google.gson.JsonElement;
 import java.util.HashMap;
 import java.util.Map;
-
-import org.apache.fineract.accounting.common.AccountingRuleType;
 import org.apache.fineract.accounting.common.AccountingConstants.CASH_ACCOUNTS_FOR_SHARES;
 import org.apache.fineract.accounting.common.AccountingConstants.SHARES_PRODUCT_ACCOUNTING_PARAMS;
+import org.apache.fineract.accounting.common.AccountingRuleType;
 import org.apache.fineract.accounting.glaccount.domain.GLAccountRepository;
 import org.apache.fineract.accounting.glaccount.domain.GLAccountRepositoryWrapper;
 import org.apache.fineract.accounting.glaccount.domain.GLAccountType;
@@ -36,8 +36,6 @@ import org.apache.fineract.portfolio.paymenttype.domain.PaymentTypeRepositoryWra
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.google.gson.JsonElement;
-
 @Component
 public class ShareProductToGLAccountMappingHelper extends ProductToGLAccountMappingHelper {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/api/ProvisioningEntriesApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/api/ProvisioningEntriesApiResource.java
index 4fb8459..7a408d5 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/api/ProvisioningEntriesApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/api/ProvisioningEntriesApiResource.java
@@ -18,6 +18,18 @@
  */
 package org.apache.fineract.accounting.provisioning.api;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.SwaggerDefinition;
+import io.swagger.annotations.Tag;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
@@ -28,8 +40,6 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.UriInfo;
-
-import io.swagger.annotations.*;
 import org.apache.fineract.accounting.provisioning.constant.ProvisioningEntriesApiConstants;
 import org.apache.fineract.accounting.provisioning.data.LoanProductProvisioningEntryData;
 import org.apache.fineract.accounting.provisioning.data.ProvisioningEntryData;
@@ -49,10 +59,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
 @Path("/provisioningentries")
 @Component
 @Scope("singleton")
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/constant/ProvisioningEntriesApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/constant/ProvisioningEntriesApiConstants.java
index 165a947..80d2be6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/constant/ProvisioningEntriesApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/constant/ProvisioningEntriesApiConstants.java
@@ -18,10 +18,6 @@
  */
 package org.apache.fineract.accounting.provisioning.constant;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
 public interface ProvisioningEntriesApiConstants {
 
     public final static String JSON_DATE_PARAM = "date" ;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/domain/LoanProductProvisioningEntry.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/domain/LoanProductProvisioningEntry.java
index 8ad80ef..f31474a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/domain/LoanProductProvisioningEntry.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/domain/LoanProductProvisioningEntry.java
@@ -20,13 +20,11 @@ package org.apache.fineract.accounting.provisioning.domain;
 
 import java.math.BigDecimal;
 import java.util.Objects;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
-
 import org.apache.fineract.accounting.glaccount.domain.GLAccount;
 import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom;
 import org.apache.fineract.organisation.office.domain.Office;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/domain/ProvisioningEntry.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/domain/ProvisioningEntry.java
index e671504..ca83c1c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/domain/ProvisioningEntry.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/domain/ProvisioningEntry.java
@@ -22,7 +22,6 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
-
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -33,9 +32,8 @@ import javax.persistence.OneToOne;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
-
-import org.apache.fineract.useradministration.domain.AppUser;
 import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom;
+import org.apache.fineract.useradministration.domain.AppUser;
 
 @Entity
 @Table(name = "m_provisioning_history")
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/domain/ProvisioningEntryRepository.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/domain/ProvisioningEntryRepository.java
index 2e69d88..cd4395e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/domain/ProvisioningEntryRepository.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/domain/ProvisioningEntryRepository.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.accounting.provisioning.domain;
 
 import java.util.Date;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/exception/ProvisioningEntryAlreadyCreatedException.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/exception/ProvisioningEntryAlreadyCreatedException.java
index 219953b..ff16cdb 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/exception/ProvisioningEntryAlreadyCreatedException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/exception/ProvisioningEntryAlreadyCreatedException.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.accounting.provisioning.exception;
 
 import java.util.Date;
-
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
 
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/exception/ProvisioningJournalEntriesCannotbeCreatedException.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/exception/ProvisioningJournalEntriesCannotbeCreatedException.java
index 51fa6d8..9c4679c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/exception/ProvisioningJournalEntriesCannotbeCreatedException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/exception/ProvisioningJournalEntriesCannotbeCreatedException.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.accounting.provisioning.exception;
 
 import java.util.Date;
-
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
 
 public class ProvisioningJournalEntriesCannotbeCreatedException extends AbstractPlatformResourceNotFoundException {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/serialization/ProvisioningEntriesDefinitionJsonDeserializer.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/serialization/ProvisioningEntriesDefinitionJsonDeserializer.java
index 7449243..2c738c3 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/serialization/ProvisioningEntriesDefinitionJsonDeserializer.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/serialization/ProvisioningEntriesDefinitionJsonDeserializer.java
@@ -18,6 +18,8 @@
  */
 package org.apache.fineract.accounting.provisioning.serialization;
 
+import com.google.gson.JsonElement;
+import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -26,7 +28,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.fineract.accounting.provisioning.constant.ProvisioningEntriesApiConstants;
 import org.apache.fineract.infrastructure.core.data.ApiParameterError;
@@ -39,9 +40,6 @@ import org.joda.time.LocalDate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.google.gson.JsonElement;
-import com.google.gson.reflect.TypeToken;
-
 @Component
 public class ProvisioningEntriesDefinitionJsonDeserializer implements ProvisioningEntriesApiConstants {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesReadPlatformService.java
index 928e138..8a568a7 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesReadPlatformService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesReadPlatformService.java
@@ -20,7 +20,6 @@ package org.apache.fineract.accounting.provisioning.service;
 
 import java.util.Collection;
 import java.util.Date;
-
 import org.apache.fineract.accounting.provisioning.data.LoanProductProvisioningEntryData;
 import org.apache.fineract.accounting.provisioning.data.ProvisioningEntryData;
 import org.apache.fineract.infrastructure.core.service.Page;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesReadPlatformServiceImpl.java
index d06f5bb..b4e9ddf 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesReadPlatformServiceImpl.java
@@ -18,6 +18,14 @@
  */
 package org.apache.fineract.accounting.provisioning.service;
 
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
 import org.apache.fineract.accounting.provisioning.data.LoanProductProvisioningEntryData;
 import org.apache.fineract.accounting.provisioning.data.ProvisioningEntryData;
 import org.apache.fineract.infrastructure.core.service.Page;
@@ -30,15 +38,6 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-
 @Service
 public class ProvisioningEntriesReadPlatformServiceImpl implements ProvisioningEntriesReadPlatformService {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesWritePlatformServiceJpaRepositoryImpl.java
index 86a38ee..ba554b6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesWritePlatformServiceJpaRepositoryImpl.java
@@ -18,12 +18,12 @@
  */
 package org.apache.fineract.accounting.provisioning.service;
 
+import com.google.gson.JsonObject;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.fineract.accounting.glaccount.domain.GLAccount;
 import org.apache.fineract.accounting.glaccount.domain.GLAccountRepository;
 import org.apache.fineract.accounting.journalentry.service.JournalEntryWritePlatformService;
@@ -63,8 +63,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.stereotype.Service;
 
-import com.google.gson.JsonObject;
-
 @Service
 public class ProvisioningEntriesWritePlatformServiceJpaRepositoryImpl implements ProvisioningEntriesWritePlatformService {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleApiResource.java
index 388b02c..3664579 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleApiResource.java
@@ -18,6 +18,15 @@
  */
 package org.apache.fineract.accounting.rule.api;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.SwaggerDefinition;
+import io.swagger.annotations.Tag;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -26,7 +35,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
@@ -38,8 +46,6 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.UriInfo;
-
-import io.swagger.annotations.*;
 import org.apache.fineract.accounting.common.AccountingConstants;
 import org.apache.fineract.accounting.glaccount.data.GLAccountData;
 import org.apache.fineract.accounting.glaccount.service.GLAccountReadPlatformService;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleApiResourceSwagger.java
index 5f62be2..dba659c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleApiResourceSwagger.java
@@ -20,13 +20,12 @@ package org.apache.fineract.accounting.rule.api;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
 import org.apache.fineract.accounting.glaccount.data.GLAccountData;
 import org.apache.fineract.accounting.rule.data.AccountingTagRuleData;
 import org.apache.fineract.organisation.office.data.OfficeData;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Created by sanyam on 26/7/17.
  */
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/data/AccountingRuleData.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/data/AccountingRuleData.java
index 320e203..0c6c155 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/data/AccountingRuleData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/data/AccountingRuleData.java
@@ -21,7 +21,6 @@ package org.apache.fineract.accounting.rule.data;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-
 import org.apache.fineract.accounting.glaccount.data.GLAccountData;
 import org.apache.fineract.accounting.glaccount.data.GLAccountDataForLookup;
 import org.apache.fineract.infrastructure.codes.data.CodeValueData;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/domain/AccountingRule.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/domain/AccountingRule.java
index 0b09b10..143b24b 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/domain/AccountingRule.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/domain/AccountingRule.java
@@ -24,7 +24,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -34,14 +33,13 @@ import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.fineract.accounting.glaccount.domain.GLAccount;
 import org.apache.fineract.accounting.journalentry.domain.JournalEntryType;
 import org.apache.fineract.accounting.rule.api.AccountingRuleJsonInputParams;
 import org.apache.fineract.infrastructure.core.api.JsonCommand;
-import org.apache.fineract.organisation.office.domain.Office;
 import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom;
+import org.apache.fineract.organisation.office.domain.Office;
 
 @Entity
 @Table(name = "acc_accounting_rule", uniqueConstraints = { @UniqueConstraint(columnNames = { "name" }, name = "accounting_rule_name_unique") })
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/domain/AccountingTagRule.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/domain/AccountingTagRule.java
index 16f138d..54d343a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/domain/AccountingTagRule.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/domain/AccountingTagRule.java
@@ -24,7 +24,6 @@ import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
-
 import org.apache.fineract.accounting.journalentry.domain.JournalEntryType;
 import org.apache.fineract.infrastructure.codes.domain.CodeValue;
 import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/exception/AccountingRuleInvalidDeleteException.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/exception/AccountingRuleInvalidDeleteException.java
index 910f5cc..4cb428f 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/exception/AccountingRuleInvalidDeleteException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/exception/AccountingRuleInvalidDeleteException.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.accounting.rule.exception;
 
 import java.util.Date;
-
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/exception/AccountingRuleInvalidException.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/exception/AccountingRuleInvalidException.java
index fdfa56b..3c9d97b 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/exception/AccountingRuleInvalidException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/exception/AccountingRuleInvalidException.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.accounting.rule.exception;
 
 import java.util.Date;
-
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/serialization/AccountingRuleCommandFromApiJsonDeserializer.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/serialization/AccountingRuleCommandFromApiJsonDeserializer.java
index 8788323..4be5089 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/serialization/AccountingRuleCommandFromApiJsonDeserializer.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/serialization/AccountingRuleCommandFromApiJsonDeserializer.java
@@ -18,12 +18,13 @@
  */
 package org.apache.fineract.accounting.rule.serialization;
 
+import com.google.gson.JsonElement;
+import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.fineract.accounting.rule.api.AccountingRuleJsonInputParams;
 import org.apache.fineract.infrastructure.core.data.ApiParameterError;
@@ -35,9 +36,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 
-import com.google.gson.JsonElement;
-import com.google.gson.reflect.TypeToken;
-
 @Component
 public class AccountingRuleCommandFromApiJsonDeserializer {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/service/AccountingRuleReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/service/AccountingRuleReadPlatformService.java
index f078f64..bd5abee 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/service/AccountingRuleReadPlatformService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/service/AccountingRuleReadPlatformService.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.accounting.rule.service;
 
 import java.util.List;
-
 import org.apache.fineract.accounting.rule.data.AccountingRuleData;
 
 public interface AccountingRuleReadPlatformService {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/service/AccountingRuleReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/service/AccountingRuleReadPlatformServiceImpl.java
index 7db4f18..90d9f1f 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/service/AccountingRuleReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/service/AccountingRuleReadPlatformServiceImpl.java
@@ -25,7 +25,6 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.fineract.accounting.common.AccountingEnumerations;
 import org.apache.fineract.accounting.glaccount.data.GLAccountDataForLookup;
 import org.apache.fineract.accounting.glaccount.service.GLAccountReadPlatformService;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/service/AccountingRuleWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/service/AccountingRuleWritePlatformServiceJpaRepositoryImpl.java
index 8e4f40a..2372cbf 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/service/AccountingRuleWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/service/AccountingRuleWritePlatformServiceJpaRepositoryImpl.java
@@ -25,7 +25,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.fineract.accounting.closure.api.GLClosureJsonInputParams;
 import org.apache.fineract.accounting.glaccount.domain.GLAccount;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/api/AdHocApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/api/AdHocApiResource.java
index 3eb1d11..9adc489 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/api/AdHocApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/api/AdHocApiResource.java
@@ -18,11 +18,14 @@
  */
 package org.apache.fineract.adhocquery.api;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.SwaggerDefinition;
+import io.swagger.annotations.Tag;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
@@ -34,8 +37,6 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.UriInfo;
-
-import io.swagger.annotations.*;
 import org.apache.commons.lang.StringUtils;
 import org.apache.fineract.adhocquery.data.AdHocData;
 import org.apache.fineract.adhocquery.service.AdHocReadPlatformService;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/data/AdHocData.java b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/data/AdHocData.java
index 69d56ba..f126476 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/data/AdHocData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/data/AdHocData.java
@@ -18,13 +18,12 @@
  */
 package org.apache.fineract.adhocquery.data;
 
-import org.apache.fineract.adhocquery.domain.ReportRunFrequency;
-import org.apache.fineract.infrastructure.core.data.EnumOptionData;
-import org.joda.time.DateTime;
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
+import org.apache.fineract.adhocquery.domain.ReportRunFrequency;
+import org.apache.fineract.infrastructure.core.data.EnumOptionData;
+import org.joda.time.DateTime;
 
 /**
  * Immutable data object represent note or case information AdHocData
diff --git a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/domain/AdHoc.java b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/domain/AdHoc.java
index 19ae048..bb098a3 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/domain/AdHoc.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/domain/AdHoc.java
@@ -20,11 +20,9 @@ package org.apache.fineract.adhocquery.domain;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-
 import org.apache.commons.lang.BooleanUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.fineract.adhocquery.api.AdHocJsonInputParams;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/handler/DeleteAdHocCommandHandler.java b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/handler/DeleteAdHocCommandHandler.java
index eb8e9f6..42c48eb 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/handler/DeleteAdHocCommandHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/handler/DeleteAdHocCommandHandler.java
@@ -18,11 +18,11 @@
  */
 package org.apache.fineract.adhocquery.handler;
 
+import org.apache.fineract.adhocquery.service.AdHocWritePlatformService;
 import org.apache.fineract.commands.annotation.CommandType;
 import org.apache.fineract.commands.handler.NewCommandSourceHandler;
 import org.apache.fineract.infrastructure.core.api.JsonCommand;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
-import org.apache.fineract.adhocquery.service.AdHocWritePlatformService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/handler/UpdateAdHocCommandHandler.java b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/handler/UpdateAdHocCommandHandler.java
index db9d4ac..c031ead 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/handler/UpdateAdHocCommandHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/handler/UpdateAdHocCommandHandler.java
@@ -18,11 +18,11 @@
  */
 package org.apache.fineract.adhocquery.handler;
 
+import org.apache.fineract.adhocquery.service.AdHocWritePlatformService;
 import org.apache.fineract.commands.annotation.CommandType;
 import org.apache.fineract.commands.handler.NewCommandSourceHandler;
 import org.apache.fineract.infrastructure.core.api.JsonCommand;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
-import org.apache.fineract.adhocquery.service.AdHocWritePlatformService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocDataValidator.java b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocDataValidator.java
index 1a909d8..368f157 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocDataValidator.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocDataValidator.java
@@ -18,6 +18,8 @@
  */
 package org.apache.fineract.adhocquery.service;
 
+import com.google.gson.JsonElement;
+import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,7 +27,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.fineract.adhocquery.domain.ReportRunFrequency;
 import org.apache.fineract.infrastructure.core.data.ApiParameterError;
@@ -36,9 +37,6 @@ import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.google.gson.JsonElement;
-import com.google.gson.reflect.TypeToken;
-
 @Component
 public final class AdHocDataValidator {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocReadPlatformService.java
index 3529f10..3e3acad 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocReadPlatformService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocReadPlatformService.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.adhocquery.service;
 
 import java.util.Collection;
-
 import org.apache.fineract.adhocquery.data.AdHocData;
 
 public interface AdHocReadPlatformService {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocReadPlatformServiceImpl.java
index c82d9ce..1201d32 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocReadPlatformServiceImpl.java
@@ -21,7 +21,6 @@ package org.apache.fineract.adhocquery.service;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Collection;
-
 import org.apache.fineract.adhocquery.data.AdHocData;
 import org.apache.fineract.adhocquery.exception.AdHocNotFoundException;
 import org.apache.fineract.infrastructure.core.domain.JdbcSupport;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocScheduledJobRunnerServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocScheduledJobRunnerServiceImpl.java
index fc8c124..52352d1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocScheduledJobRunnerServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocScheduledJobRunnerServiceImpl.java
@@ -18,6 +18,8 @@
  */
 package org.apache.fineract.adhocquery.service;
 
+import java.util.Collection;
+import java.util.Date;
 import org.apache.fineract.adhocquery.data.AdHocData;
 import org.apache.fineract.adhocquery.domain.ReportRunFrequency;
 import org.apache.fineract.infrastructure.core.service.RoutingDataSource;
@@ -36,9 +38,6 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Collection;
-import java.util.Date;
-
 @Service(value = "adHocScheduledJobRunnerService")
 public class AdHocScheduledJobRunnerServiceImpl implements AdHocScheduledJobRunnerService {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocWritePlatformServiceJpaRepositoryImpl.java
index c573b9a..b48ceba 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocWritePlatformServiceJpaRepositoryImpl.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.adhocquery.service;
 
 import java.util.Map;
-
 import org.apache.fineract.adhocquery.domain.AdHoc;
 import org.apache.fineract.adhocquery.domain.AdHocRepository;
 import org.apache.fineract.adhocquery.exception.AdHocNotFoundException;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/api/BatchApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/batch/api/BatchApiResource.java
index 514d29d..5f2376f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/api/BatchApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/api/BatchApiResource.java
@@ -18,9 +18,17 @@
  */
 package org.apache.fineract.batch.api;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.SwaggerDefinition;
+import io.swagger.annotations.Tag;
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DefaultValue;
 import javax.ws.rs.POST;
@@ -30,8 +38,6 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.UriInfo;
-
-import io.swagger.annotations.*;
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
 import org.apache.fineract.batch.serialization.BatchRequestJsonHelper;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/api/BatchApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/batch/api/BatchApiResourceSwagger.java
index 0aa3514..d2ce0bf 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/api/BatchApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/api/BatchApiResourceSwagger.java
@@ -20,9 +20,8 @@ package org.apache.fineract.batch.api;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.fineract.batch.domain.Header;
-
 import java.util.Set;
+import org.apache.fineract.batch.domain.Header;
 
 /**
  * Created by sanyam on 26/7/17.
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandStrategy.java
index c582708..01fa6ed 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandStrategy.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandStrategy.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.batch.command;
 
 import javax.ws.rs.core.UriInfo;
-
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandStrategyProvider.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandStrategyProvider.java
index c4fcbd0..96254c9 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandStrategyProvider.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandStrategyProvider.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.batch.command;
 
 import java.util.concurrent.ConcurrentHashMap;
-
 import org.apache.fineract.batch.command.internal.UnknownCommandStrategy;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ActivateClientCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ActivateClientCommandStrategy.java
index 48834a9..f9de928 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ActivateClientCommandStrategy.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ActivateClientCommandStrategy.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.batch.command.internal;
 
 import javax.ws.rs.core.UriInfo;
-
 import org.apache.fineract.batch.command.CommandStrategy;
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ApplyLoanCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ApplyLoanCommandStrategy.java
index cc68047..0304aa5 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ApplyLoanCommandStrategy.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ApplyLoanCommandStrategy.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.batch.command.internal;
 
 import javax.ws.rs.core.UriInfo;
-
 import org.apache.fineract.batch.command.CommandStrategy;
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ApplySavingsCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ApplySavingsCommandStrategy.java
index f0a7b5c..e0f0107 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ApplySavingsCommandStrategy.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ApplySavingsCommandStrategy.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.batch.command.internal;
 
 import javax.ws.rs.core.UriInfo;
-
 import org.apache.fineract.batch.command.CommandStrategy;
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ApproveLoanCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ApproveLoanCommandStrategy.java
index 8fa00f2..ab976b1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ApproveLoanCommandStrategy.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ApproveLoanCommandStrategy.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.batch.command.internal;
 
 import javax.ws.rs.core.UriInfo;
-
 import org.apache.fineract.batch.command.CommandStrategy;
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ApproveLoanRescheduleCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ApproveLoanRescheduleCommandStrategy.java
index 3822f0a..7e1a7bd 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ApproveLoanRescheduleCommandStrategy.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/ApproveLoanRescheduleCommandStrategy.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.batch.command.internal;
 
 import javax.ws.rs.core.UriInfo;
-
 import org.apache.fineract.batch.command.CommandStrategy;
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/CollectChargesCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/CollectChargesCommandStrategy.java
index dc8b795..cd9b296 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/CollectChargesCommandStrategy.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/CollectChargesCommandStrategy.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.batch.command.internal;
 
 import javax.ws.rs.core.UriInfo;
-
 import org.apache.fineract.batch.command.CommandStrategy;
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/CreateChargeCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/CreateChargeCommandStrategy.java
index 80ee880..6bbb0ab 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/CreateChargeCommandStrategy.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/CreateChargeCommandStrategy.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.batch.command.internal;
 
 import javax.ws.rs.core.UriInfo;
-
 import org.apache.fineract.batch.command.CommandStrategy;
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/CreateClientCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/CreateClientCommandStrategy.java
index af0bc0c..9bcd882 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/CreateClientCommandStrategy.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/CreateClientCommandStrategy.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.batch.command.internal;
 
 import javax.ws.rs.core.UriInfo;
-
 import org.apache.fineract.batch.command.CommandStrategy;
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/DisburseLoanCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/DisburseLoanCommandStrategy.java
index 409f0a0..93c213d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/DisburseLoanCommandStrategy.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/DisburseLoanCommandStrategy.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.batch.command.internal;
 
 import javax.ws.rs.core.UriInfo;
-
 import org.apache.fineract.batch.command.CommandStrategy;
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/RepayLoanCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/RepayLoanCommandStrategy.java
index 16d710c..6e681fa 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/RepayLoanCommandStrategy.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/RepayLoanCommandStrategy.java
@@ -18,6 +18,7 @@
  */
 package org.apache.fineract.batch.command.internal;
 
+import javax.ws.rs.core.UriInfo;
 import org.apache.fineract.batch.command.CommandStrategy;
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
@@ -27,8 +28,6 @@ import org.apache.fineract.portfolio.loanaccount.api.LoanTransactionsApiResource
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.ws.rs.core.UriInfo;
-
 /**
  * Implements {@link CommandStrategy} and handles
  * repayment for a Loan. It passes the contents of the body from the BatchRequest
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/UnknownCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/UnknownCommandStrategy.java
index 369dd88..d19dc5d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/UnknownCommandStrategy.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/UnknownCommandStrategy.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.batch.command.internal;
 
 import javax.ws.rs.core.UriInfo;
-
 import org.apache.fineract.batch.command.CommandStrategy;
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/UpdateClientCommandStrategy.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/UpdateClientCommandStrategy.java
index 6ec26dc..470a63e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/UpdateClientCommandStrategy.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/internal/UpdateClientCommandStrategy.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.batch.command.internal;
 
 import javax.ws.rs.core.UriInfo;
-
 import org.apache.fineract.batch.command.CommandStrategy;
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/exception/ErrorHandler.java b/fineract-provider/src/main/java/org/apache/fineract/batch/exception/ErrorHandler.java
index d5646b9..a33114d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/exception/ErrorHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/exception/ErrorHandler.java
@@ -18,6 +18,8 @@
  */
 package org.apache.fineract.batch.exception;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
 import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException;
@@ -35,9 +37,6 @@ import org.apache.fineract.portfolio.loanproduct.exception.LinkedAccountRequired
 import org.springframework.dao.NonTransientDataAccessException;
 import org.springframework.transaction.TransactionException;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
 /**
  * Provides an Error Handler method that returns an object of type
  * {@link ErrorInfo} to the CommandStrategy which raised the exception. This
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/serialization/BatchRequestJsonHelper.java b/fineract-provider/src/main/java/org/apache/fineract/batch/serialization/BatchRequestJsonHelper.java
index 229f7f8..06579b6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/serialization/BatchRequestJsonHelper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/serialization/BatchRequestJsonHelper.java
@@ -18,15 +18,13 @@
  */
 package org.apache.fineract.batch.serialization;
 
+import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.List;
-
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
 import org.springframework.stereotype.Component;
 
-import com.google.gson.reflect.TypeToken;
-
 /**
  * Extends
  * {@link org.apache.fineract.infrastructure.core.serialization.FromJsonHelper} to
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/service/BatchApiService.java b/fineract-provider/src/main/java/org/apache/fineract/batch/service/BatchApiService.java
index c1ca205..e78b61b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/service/BatchApiService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/service/BatchApiService.java
@@ -19,9 +19,7 @@
 package org.apache.fineract.batch.service;
 
 import java.util.List;
-
 import javax.ws.rs.core.UriInfo;
-
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/service/BatchApiServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/batch/service/BatchApiServiceImpl.java
index cafe3eb..5071dcc 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/service/BatchApiServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/service/BatchApiServiceImpl.java
@@ -18,15 +18,14 @@
  */
 package org.apache.fineract.batch.service;
 
+import com.google.gson.Gson;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
-
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.core.UriInfo;
-
 import org.apache.fineract.batch.command.CommandContext;
 import org.apache.fineract.batch.command.CommandStrategy;
 import org.apache.fineract.batch.command.CommandStrategyProvider;
@@ -44,8 +43,6 @@ import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.TransactionCallback;
 import org.springframework.transaction.support.TransactionTemplate;
 
-import com.google.gson.Gson;
-
 /**
  * Implementation for {@link BatchApiService} to iterate through all the
  * incoming requests and obtain the appropriate CommandStrategy from
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/service/ResolutionHelper.java b/fineract-provider/src/main/java/org/apache/fineract/batch/service/ResolutionHelper.java
index c6cdc94..13e41d7 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/service/ResolutionHelper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/service/ResolutionHelper.java
@@ -18,21 +18,19 @@
  */
 package org.apache.fineract.batch.service;
 
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.jayway.jsonpath.JsonModel;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map.Entry;
-
 import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
 import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.jayway.jsonpath.JsonModel;
-
 /**
  * Provides methods to create dependency map among the various batchRequests. It
  * also provides method that takes care of dependency resolution among related
diff --git a/fineract-provider/src/main/java/org/apache/fineract/commands/annotation/CommandType.java b/fineract-provider/src/main/java/org/apache/fineract/commands/annotation/CommandType.java
index e46ae1d..96a2919 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/commands/annotation/CommandType.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/commands/annotation/CommandType.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.commands.annotation;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * Specifies the command type for the annotated class.<br>
diff --git a/fineract-provider/src/main/java/org/apache/fineract/commands/api/AuditsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/commands/api/AuditsApiResource.java
index 459db93..79d1b81 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/commands/api/AuditsApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/commands/api/AuditsApiResource.java
@@ -18,11 +18,17 @@
  */
 package org.apache.fineract.commands.api;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.SwaggerDefinition;
+import io.swagger.annotations.Tag;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -32,8 +38,6 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.UriInfo;
-
-import io.swagger.annotations.*;
 import org.apache.commons.lang.StringUtils;
 import org.apache.fineract.commands.data.AuditData;
 import org.apache.fineract.commands.data.AuditSearchData;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/commands/api/MakercheckersApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/commands/api/MakercheckersApiResource.java
index b9ca477..c714722 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/commands/api/MakercheckersApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/commands/api/MakercheckersApiResource.java
@@ -18,11 +18,17 @@
  */
 package org.apache.fineract.commands.api;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.SwaggerDefinition;
+import io.swagger.annotations.Tag;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
@@ -34,8 +40,6 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.UriInfo;
-
-import io.swagger.annotations.*;
 import org.apache.commons.lang.StringUtils;
 import org.apache.fineract.commands.data.AuditData;
 import org.apache.fineract.commands.data.AuditSearchData;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/commands/api/MakercheckersApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/commands/api/MakercheckersApiResourceSwagger.java
index 8b41b68..1f68e27 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/commands/api/MakercheckersApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/commands/api/MakercheckersApiResourceSwagger.java
@@ -20,13 +20,12 @@ package org.apache.fineract.commands.api;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.Collection;
+import java.util.List;
 import org.apache.fineract.commands.data.ProcessingResultLookup;
 import org.apache.fineract.useradministration.data.AppUserData;
 import org.joda.time.DateTime;
 
-import java.util.Collection;
-import java.util.List;
-
 /**
  * Created by sanyam on 27/7/17.
  */
diff --git a/fineract-provider/src/main/java/org/apache/fineract/commands/data/AuditSearchData.java b/fineract-provider/src/main/java/org/apache/fineract/commands/data/AuditSearchData.java
index a180cf2..c417f28 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/commands/data/AuditSearchData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/commands/data/AuditSearchData.java
@@ -20,7 +20,6 @@ package org.apache.fineract.commands.data;
 
 import java.util.Collection;
 import java.util.List;
-
 import org.apache.fineract.useradministration.data.AppUserData;
 
 /**
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 a0055fb..216d6b2 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
@@ -19,7 +19,6 @@
 package org.apache.fineract.commands.domain;
 
 import java.util.Date;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
@@ -27,12 +26,11 @@ import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom;
 import org.apache.fineract.useradministration.domain.AppUser;
 import org.joda.time.DateTime;
-import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom;
 
 @Entity
 @Table(name = "m_portfolio_command_source")
diff --git a/fineract-provider/src/main/java/org/apache/fineract/commands/provider/CommandHandlerProvider.java b/fineract-provider/src/main/java/org/apache/fineract/commands/provider/CommandHandlerProvider.java
index e75f4c8..9b914db 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/commands/provider/CommandHandlerProvider.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/commands/provider/CommandHandlerProvider.java
@@ -19,6 +19,7 @@
 package org.apache.fineract.commands.provider;
 
 import com.google.common.base.Preconditions;
+import java.util.HashMap;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.fineract.commands.annotation.CommandType;
@@ -32,8 +33,6 @@ import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
-import java.util.HashMap;
-
 /**
  * {@link CommandHandlerProvider} provides {@link NewCommandSourceHandler}s for a given entity and action.
  * <br>
diff --git a/fineract-provider/src/main/java/org/apache/fineract/commands/service/AuditReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/commands/service/AuditReadPlatformService.java
index a6acad7..ef71553 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/commands/service/AuditReadPlatformService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/commands/service/AuditReadPlatformService.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.commands.service;
 
 import java.util.Collection;
-
 import org.apache.fineract.commands.data.AuditData;
 import org.apache.fineract.commands.data.AuditSearchData;
 import org.apache.fineract.infrastructure.core.data.PaginationParameters;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/commands/service/AuditReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/commands/service/AuditReadPlatformServiceImpl.java
index 581c6d0..6988ba5 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/commands/service/AuditReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/commands/service/AuditReadPlatformServiceImpl.java
@@ -18,6 +18,9 @@
  */
 package org.apache.fineract.commands.service;
 
+import com.google.common.reflect.TypeToken;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 import java.lang.reflect.Type;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -27,7 +30,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.fineract.commands.data.AuditData;
 import org.apache.fineract.commands.data.AuditSearchData;
@@ -68,10 +70,6 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 
-import com.google.common.reflect.TypeToken;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-
 @Service
 public class AuditReadPlatformServiceImpl implements AuditReadPlatformService {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/commands/service/PortfolioCommandSourceWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/commands/service/PortfolioCommandSourceWritePlatformServiceImpl.java
index 5badaf7..d675032 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/commands/service/PortfolioCommandSourceWritePlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/commands/service/PortfolioCommandSourceWritePlatformServiceImpl.java
@@ -18,8 +18,8 @@
  */
 package org.apache.fineract.commands.service;
 
+import com.google.gson.JsonElement;
 import java.util.Random;
-
 import org.apache.fineract.commands.domain.CommandSource;
 import org.apache.fineract.commands.domain.CommandSourceRepository;
 import org.apache.fineract.commands.domain.CommandWrapper;
@@ -42,8 +42,6 @@ import org.springframework.orm.ObjectOptimisticLockingFailureException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.google.gson.JsonElement;
-
 @Service
 public class PortfolioCommandSourceWritePlatformServiceImpl implements PortfolioCommandSourceWritePlatformService {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/commands/service/SynchronousCommandProcessingService.java b/fineract-provider/src/main/java/org/apache/fineract/commands/service/SynchronousCommandProcessingService.java
index fd940b6..3be69b3 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/commands/service/SynchronousCommandProcessingService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/commands/service/SynchronousCommandProcessingService.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.commands.service;
 
 import java.util.Map;
-
 import org.apache.fineract.commands.domain.CommandSource;
 import org.apache.fineract.commands.domain.CommandSourceRepository;
 import org.apache.fineract.commands.domain.CommandWrapper;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/api/AccountNumberFormatsApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/api/AccountNumberFormatsApiResource.java
index 1227e37..3d2c2d3 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/api/AccountNumberFormatsApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/api/AccountNumberFormatsApiResource.java
@@ -18,11 +18,19 @@
  */
 package org.apache.fineract.infrastructure.accountnumberformat.api;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.SwaggerDefinition;
+import io.swagger.annotations.Tag;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
@@ -34,8 +42,6 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.UriInfo;
-
-import io.swagger.annotations.*;
 import org.apache.fineract.commands.domain.CommandWrapper;
 import org.apache.fineract.commands.service.CommandWrapperBuilder;
 import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/api/AccountNumberFormatsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/api/AccountNumberFormatsApiResourceSwagger.java
index 4dac2f5..628f462 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/api/AccountNumberFormatsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/api/AccountNumberFormatsApiResourceSwagger.java
@@ -20,10 +20,9 @@ package org.apache.fineract.infrastructure.accountnumberformat.api;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.fineract.infrastructure.core.data.EnumOptionData;
-
 import java.util.List;
 import java.util.Map;
+import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 
 /**
  * Created by sanyam on 28/7/17.
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/data/AccountNumberFormatData.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/data/AccountNumberFormatData.java
index f71b389..3739322 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/data/AccountNumberFormatData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/data/AccountNumberFormatData.java
@@ -21,7 +21,6 @@ package org.apache.fineract.infrastructure.accountnumberformat.data;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 
 public class AccountNumberFormatData implements Serializable {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/data/AccountNumberFormatDataValidator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/data/AccountNumberFormatDataValidator.java
index 33f1382..331c0c1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/data/AccountNumberFormatDataValidator.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/data/AccountNumberFormatDataValidator.java
@@ -18,6 +18,8 @@
  */
 package org.apache.fineract.infrastructure.accountnumberformat.data;
 
+import com.google.gson.JsonElement;
+import com.google.gson.reflect.TypeToken;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,11 +27,10 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.fineract.infrastructure.accountnumberformat.domain.AccountNumberFormatEnumerations;
-import org.apache.fineract.infrastructure.accountnumberformat.domain.EntityAccountType;
 import org.apache.fineract.infrastructure.accountnumberformat.domain.AccountNumberFormatEnumerations.AccountNumberPrefixType;
+import org.apache.fineract.infrastructure.accountnumberformat.domain.EntityAccountType;
 import org.apache.fineract.infrastructure.accountnumberformat.service.AccountNumberFormatConstants;
 import org.apache.fineract.infrastructure.core.data.ApiParameterError;
 import org.apache.fineract.infrastructure.core.data.DataValidatorBuilder;
@@ -39,9 +40,6 @@ import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.google.gson.JsonElement;
-import com.google.gson.reflect.TypeToken;
-
 @Component
 public class AccountNumberFormatDataValidator {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/domain/AccountNumberFormat.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/domain/AccountNumberFormat.java
index 4ff34cc..150d8a1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/domain/AccountNumberFormat.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/domain/AccountNumberFormat.java
@@ -22,7 +22,6 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
-
 import org.apache.fineract.infrastructure.accountnumberformat.domain.AccountNumberFormatEnumerations.AccountNumberPrefixType;
 import org.apache.fineract.infrastructure.accountnumberformat.service.AccountNumberFormatConstants;
 import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/domain/AccountNumberFormatEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/domain/AccountNumberFormatEnumerations.java
index 9dbc2f9..7545f55 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/domain/AccountNumberFormatEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/domain/AccountNumberFormatEnumerations.java
@@ -18,10 +18,16 @@
  */
 package org.apache.fineract.infrastructure.accountnumberformat.domain;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 
-import java.util.*;
-
 public class AccountNumberFormatEnumerations {
 
     public final static Set<AccountNumberPrefixType> accountNumberPrefixesForClientAccounts =
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/service/AccountNumberFormatConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/service/AccountNumberFormatConstants.java
index 722f6be..2eb9fa6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/service/AccountNumberFormatConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/service/AccountNumberFormatConstants.java
@@ -18,10 +18,6 @@
  */
 package org.apache.fineract.infrastructure.accountnumberformat.service;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
 import org.apache.fineract.infrastructure.accountnumberformat.data.AccountNumberFormatData;
 
 public class AccountNumberFormatConstants {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/service/AccountNumberFormatReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/service/AccountNumberFormatReadPlatformService.java
index 713749c..42f4b08 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/service/AccountNumberFormatReadPlatformService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/service/AccountNumberFormatReadPlatformService.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.infrastructure.accountnumberformat.service;
 
 import java.util.List;
-
 import org.apache.fineract.infrastructure.accountnumberformat.data.AccountNumberFormatData;
 import org.apache.fineract.infrastructure.accountnumberformat.domain.EntityAccountType;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/service/AccountNumberFormatReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/service/AccountNumberFormatReadPlatformServiceImpl.java
index 17a1e39..6a10c2d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/service/AccountNumberFormatReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/service/AccountNumberFormatReadPlatformServiceImpl.java
@@ -26,11 +26,10 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.fineract.infrastructure.accountnumberformat.data.AccountNumberFormatData;
 import org.apache.fineract.infrastructure.accountnumberformat.domain.AccountNumberFormatEnumerations;
-import org.apache.fineract.infrastructure.accountnumberformat.domain.EntityAccountType;
 import org.apache.fineract.infrastructure.accountnumberformat.domain.AccountNumberFormatEnumerations.AccountNumberPrefixType;
+import org.apache.fineract.infrastructure.accountnumberformat.domain.EntityAccountType;
 import org.apache.fineract.infrastructure.accountnumberformat.exception.AccountNumberFormatNotFoundException;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 import org.apache.fineract.infrastructure.core.domain.JdbcSupport;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/service/AccountNumberFormatWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/service/AccountNumberFormatWritePlatformServiceJpaRepositoryImpl.java
index d2f83d3..8885641 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/service/AccountNumberFormatWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/service/AccountNumberFormatWritePlatformServiceJpaRepositoryImpl.java
@@ -20,9 +20,7 @@ package org.apache.fineract.infrastructure.accountnumberformat.service;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
-
 import javax.persistence.PersistenceException;
-
 import org.apache.commons.lang.exception.ExceptionUtils;
 import org.apache.fineract.infrastructure.accountnumberformat.data.AccountNumberFormatDataValidator;
 import org.apache.fineract.infrastructure.accountnumberformat.domain.AccountNumberFormat;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/api/BulkImportApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/api/BulkImportApiResource.java
index 854ea79..1726e64 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/api/BulkImportApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/api/BulkImportApiResource.java
@@ -18,10 +18,8 @@
  */
 package org.apache.fineract.infrastructure.bulkimport.api;
 
-import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collection;
-
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -31,7 +29,6 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
-
 import org.apache.fineract.infrastructure.bulkimport.data.GlobalEntityType;
 import org.apache.fineract.infrastructure.bulkimport.data.ImportData;
 import org.apache.fineract.infrastructure.bulkimport.exceptions.ImportTypeNotFoundException;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/domain/ImportDocument.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/domain/ImportDocument.java
index 5e65be2..4d17b33 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/domain/ImportDocument.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/domain/ImportDocument.java
@@ -19,7 +19,6 @@
 package org.apache.fineract.infrastructure.bulkimport.domain;
 
 import java.util.Date;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
@@ -28,11 +27,9 @@ import javax.persistence.OneToOne;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
-
 import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom;
 import org.apache.fineract.infrastructure.documentmanagement.domain.Document;
 import org.apache.fineract.useradministration.domain.AppUser;
-import org.joda.time.LocalDate;
 import org.joda.time.LocalDateTime;
 
 @Entity
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/ImportHandlerUtils.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/ImportHandlerUtils.java
index a451f5c..53c0773 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/ImportHandlerUtils.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/ImportHandlerUtils.java
@@ -18,23 +18,25 @@
  */
 package org.apache.fineract.infrastructure.bulkimport.importhandler;
 
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
+import java.util.List;
 import org.apache.fineract.infrastructure.bulkimport.constants.TemplatePopulateImportConstants;
 import org.apache.fineract.infrastructure.core.data.ApiParameterError;
-import org.apache.fineract.infrastructure.core.exception.*;
-import org.apache.poi.ss.usermodel.*;
+import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
+import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
+import org.apache.fineract.infrastructure.core.exception.AbstractPlatformServiceUnavailableException;
+import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException;
+import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException;
+import org.apache.fineract.infrastructure.core.exception.UnsupportedParameterException;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.CellValue;
+import org.apache.poi.ss.usermodel.FormulaEvaluator;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.joda.time.LocalDate;
 
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
 public class ImportHandlerUtils {
 
     public static Integer getNumberOfRows(Sheet sheet, int primaryColumn) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/center/CenterImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/center/CenterImportHandler.java
index 2b5cd2b..40be5ce 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/center/CenterImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/center/CenterImportHandler.java
@@ -20,6 +20,10 @@ package org.apache.fineract.infrastructure.bulkimport.importhandler.center;
 
 import com.google.common.reflect.TypeToken;
 import com.google.gson.GsonBuilder;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 import org.apache.fineract.commands.domain.CommandWrapper;
 import org.apache.fineract.commands.service.CommandWrapperBuilder;
 import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
@@ -33,20 +37,18 @@ import org.apache.fineract.infrastructure.bulkimport.importhandler.helper.EnumOp
 import org.apache.fineract.infrastructure.bulkimport.importhandler.helper.GroupIdSerializer;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
-import org.apache.fineract.infrastructure.core.exception.*;
 import org.apache.fineract.portfolio.calendar.data.CalendarData;
 import org.apache.fineract.portfolio.group.data.CenterData;
 import org.apache.fineract.portfolio.group.data.GroupGeneralData;
-import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.joda.time.LocalDate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
 @Service
 public class CenterImportHandler implements ImportHandler {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/chartofaccounts/ChartOfAccountsImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/chartofaccounts/ChartOfAccountsImportHandler.java
index c31099a..b618462 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/chartofaccounts/ChartOfAccountsImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/chartofaccounts/ChartOfAccountsImportHandler.java
@@ -19,6 +19,8 @@
 package org.apache.fineract.infrastructure.bulkimport.importhandler.chartofaccounts;
 
 import com.google.gson.GsonBuilder;
+import java.util.ArrayList;
+import java.util.List;
 import org.apache.fineract.accounting.glaccount.data.GLAccountData;
 import org.apache.fineract.accounting.glaccount.domain.GLAccountType;
 import org.apache.fineract.accounting.glaccount.domain.GLAccountUsage;
@@ -35,13 +37,13 @@ import org.apache.fineract.infrastructure.bulkimport.importhandler.helper.EnumOp
 import org.apache.fineract.infrastructure.codes.data.CodeValueData;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
-import org.apache.fineract.infrastructure.core.exception.*;
-import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
 @Service
 public class ChartOfAccountsImportHandler implements ImportHandler {
     private  List<GLAccountData> glAccounts;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/client/ClientEntityImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/client/ClientEntityImportHandler.java
index c026083..5912d49 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/client/ClientEntityImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/client/ClientEntityImportHandler.java
@@ -18,11 +18,11 @@
  */
 package org.apache.fineract.infrastructure.bulkimport.importhandler.client;
 
+import com.google.gson.GsonBuilder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-
 import org.apache.fineract.commands.domain.CommandWrapper;
 import org.apache.fineract.commands.service.CommandWrapperBuilder;
 import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
@@ -44,8 +44,6 @@ import org.apache.poi.ss.usermodel.Workbook;
 import org.joda.time.LocalDate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import com.google.gson.GsonBuilder;
 @Service
 public class ClientEntityImportHandler implements ImportHandler {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/client/ClientPersonImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/client/ClientPersonImportHandler.java
index c2f7ec4..13b2270 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/client/ClientPersonImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/client/ClientPersonImportHandler.java
@@ -18,11 +18,11 @@
  */
 package org.apache.fineract.infrastructure.bulkimport.importhandler.client;
 
+import com.google.gson.GsonBuilder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-
 import org.apache.fineract.commands.domain.CommandWrapper;
 import org.apache.fineract.commands.service.CommandWrapperBuilder;
 import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
@@ -43,8 +43,6 @@ import org.joda.time.LocalDate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.google.gson.GsonBuilder;
-
 @Service
 public class ClientPersonImportHandler implements ImportHandler {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/fixeddeposits/FixedDepositImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/fixeddeposits/FixedDepositImportHandler.java
index 10118a5..c5b17be 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/fixeddeposits/FixedDepositImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/fixeddeposits/FixedDepositImportHandler.java
@@ -18,7 +18,13 @@
  */
 package org.apache.fineract.infrastructure.bulkimport.importhandler.fixeddeposits;
 
-import com.google.gson.*;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 import org.apache.fineract.commands.domain.CommandWrapper;
 import org.apache.fineract.commands.service.CommandWrapperBuilder;
 import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
@@ -31,17 +37,20 @@ import org.apache.fineract.infrastructure.bulkimport.importhandler.helper.DateSe
 import org.apache.fineract.infrastructure.bulkimport.importhandler.helper.EnumOptionDataIdSerializer;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
-import org.apache.fineract.infrastructure.core.exception.*;
-import org.apache.fineract.portfolio.savings.data.*;
-import org.apache.poi.ss.usermodel.*;
+import org.apache.fineract.portfolio.savings.data.ClosingOfSavingsAccounts;
+import org.apache.fineract.portfolio.savings.data.FixedDepositAccountData;
+import org.apache.fineract.portfolio.savings.data.SavingsAccountChargeData;
+import org.apache.fineract.portfolio.savings.data.SavingsActivation;
+import org.apache.fineract.portfolio.savings.data.SavingsApproval;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.joda.time.LocalDate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
 @Service
 public class FixedDepositImportHandler implements ImportHandler {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/fixeddeposits/FixedDepositTransactionImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/fixeddeposits/FixedDepositTransactionImportHandler.java
index b0665d1..417c14f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/fixeddeposits/FixedDepositTransactionImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/fixeddeposits/FixedDepositTransactionImportHandler.java
@@ -20,6 +20,9 @@ package org.apache.fineract.infrastructure.bulkimport.importhandler.fixeddeposit
 
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 import org.apache.fineract.commands.domain.CommandWrapper;
 import org.apache.fineract.commands.service.CommandWrapperBuilder;
 import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
@@ -31,17 +34,16 @@ import org.apache.fineract.infrastructure.bulkimport.importhandler.ImportHandler
 import org.apache.fineract.infrastructure.bulkimport.importhandler.helper.DateSerializer;
 import org.apache.fineract.infrastructure.bulkimport.importhandler.helper.SavingsAccountTransactionEnumValueSerialiser;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
-import org.apache.fineract.infrastructure.core.exception.*;
 import org.apache.fineract.portfolio.savings.data.SavingsAccountTransactionData;
 import org.apache.fineract.portfolio.savings.data.SavingsAccountTransactionEnumData;
-import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.joda.time.LocalDate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
 @Service
 public class FixedDepositTransactionImportHandler implements ImportHandler {
     private Workbook workbook;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/group/GroupImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/group/GroupImportHandler.java
index 1860a76..fdbe4ba 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/group/GroupImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/group/GroupImportHandler.java
@@ -20,6 +20,10 @@ package org.apache.fineract.infrastructure.bulkimport.importhandler.group;
 
 import com.google.common.reflect.TypeToken;
 import com.google.gson.GsonBuilder;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 import org.apache.fineract.commands.domain.CommandWrapper;
 import org.apache.fineract.commands.service.CommandWrapperBuilder;
 import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
@@ -36,16 +40,15 @@ import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 import org.apache.fineract.portfolio.calendar.data.CalendarData;
 import org.apache.fineract.portfolio.client.data.ClientData;
 import org.apache.fineract.portfolio.group.data.GroupGeneralData;
-import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.joda.time.LocalDate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
 @Service
 public class GroupImportHandler implements ImportHandler {
     private List<GroupGeneralData> groups;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/guarantor/GuarantorImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/guarantor/GuarantorImportHandler.java
index e97443f..d751b73 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/guarantor/GuarantorImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/guarantor/GuarantorImportHandler.java
@@ -20,6 +20,9 @@ package org.apache.fineract.infrastructure.bulkimport.importhandler.guarantor;
 
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 import org.apache.fineract.commands.domain.CommandWrapper;
 import org.apache.fineract.commands.service.CommandWrapperBuilder;
 import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
@@ -30,17 +33,16 @@ import org.apache.fineract.infrastructure.bulkimport.importhandler.ImportHandler
 import org.apache.fineract.infrastructure.bulkimport.importhandler.ImportHandlerUtils;
 import org.apache.fineract.infrastructure.bulkimport.importhandler.helper.DateSerializer;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
-import org.apache.fineract.infrastructure.core.exception.*;
 import org.apache.fineract.portfolio.loanaccount.guarantor.data.GuarantorData;
-import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.joda.time.LocalDate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
 @Service
 public class GuarantorImportHandler implements ImportHandler {
     private Workbook workbook;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/ClientIdSerializer.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/ClientIdSerializer.java
index 0dbe28c..125deff 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/ClientIdSerializer.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/ClientIdSerializer.java
@@ -18,11 +18,14 @@
  */
 package org.apache.fineract.infrastructure.bulkimport.importhandler.helper;
 
-import com.google.gson.*;
-import org.apache.fineract.portfolio.client.data.ClientData;
-
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import java.lang.reflect.Type;
 import java.util.Collection;
+import org.apache.fineract.portfolio.client.data.ClientData;
 
 public class ClientIdSerializer implements JsonSerializer<Collection<ClientData>> {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/CodeValueDataIdSerializer.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/CodeValueDataIdSerializer.java
index d5f4ef0..6a9b78e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/CodeValueDataIdSerializer.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/CodeValueDataIdSerializer.java
@@ -22,9 +22,8 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
-import org.apache.fineract.infrastructure.codes.data.CodeValueData;
-
 import java.lang.reflect.Type;
+import org.apache.fineract.infrastructure.codes.data.CodeValueData;
 
 public class CodeValueDataIdSerializer implements JsonSerializer<CodeValueData> {
     @Override
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/CurrencyDateCodeSerializer.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/CurrencyDateCodeSerializer.java
index c784bae..bc137e2 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/CurrencyDateCodeSerializer.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/CurrencyDateCodeSerializer.java
@@ -22,9 +22,8 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
-import org.apache.fineract.organisation.monetary.data.CurrencyData;
-
 import java.lang.reflect.Type;
+import org.apache.fineract.organisation.monetary.data.CurrencyData;
 
 public class CurrencyDateCodeSerializer implements JsonSerializer<CurrencyData>{
     @Override
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/DateSerializer.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/DateSerializer.java
index c7b7bc5..8297b23 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/DateSerializer.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/DateSerializer.java
@@ -22,9 +22,8 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
-import org.joda.time.LocalDate;
-
 import java.lang.reflect.Type;
+import org.joda.time.LocalDate;
 
 public class DateSerializer implements JsonSerializer<LocalDate> {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/EnumOptionDataIdSerializer.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/EnumOptionDataIdSerializer.java
index e95e2cb..5e7533d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/EnumOptionDataIdSerializer.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/EnumOptionDataIdSerializer.java
@@ -22,9 +22,8 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
-import org.apache.fineract.infrastructure.core.data.EnumOptionData;
-
 import java.lang.reflect.Type;
+import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 
 public class EnumOptionDataIdSerializer implements JsonSerializer<EnumOptionData> {
     @Override
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/EnumOptionDataValueSerializer.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/EnumOptionDataValueSerializer.java
index 41b6ce3..a9456e0 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/EnumOptionDataValueSerializer.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/EnumOptionDataValueSerializer.java
@@ -22,9 +22,8 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
-import org.apache.fineract.infrastructure.core.data.EnumOptionData;
-
 import java.lang.reflect.Type;
+import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 
 public class EnumOptionDataValueSerializer implements JsonSerializer<EnumOptionData> {
     @Override
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/GroupIdSerializer.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/GroupIdSerializer.java
index 07306a0..4e33537 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/GroupIdSerializer.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/GroupIdSerializer.java
@@ -18,11 +18,14 @@
  */
 package org.apache.fineract.infrastructure.bulkimport.importhandler.helper;
 
-import com.google.gson.*;
-import org.apache.fineract.portfolio.group.data.GroupGeneralData;
-
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import java.lang.reflect.Type;
 import java.util.Collection;
+import org.apache.fineract.portfolio.group.data.GroupGeneralData;
 
 public class GroupIdSerializer implements JsonSerializer<Collection<GroupGeneralData>> {
     @Override
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/SavingsAccountTransactionEnumValueSerialiser.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/SavingsAccountTransactionEnumValueSerialiser.java
index 4942d2d..0b45769 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/SavingsAccountTransactionEnumValueSerialiser.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/helper/SavingsAccountTransactionEnumValueSerialiser.java
@@ -22,9 +22,8 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
-import org.apache.fineract.portfolio.savings.data.SavingsAccountTransactionEnumData;
-
 import java.lang.reflect.Type;
+import org.apache.fineract.portfolio.savings.data.SavingsAccountTransactionEnumData;
 
 public class SavingsAccountTransactionEnumValueSerialiser implements JsonSerializer<SavingsAccountTransactionEnumData> {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/journalentry/JournalEntriesImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/journalentry/JournalEntriesImportHandler.java
index ad7b8a9..78d6eee 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/journalentry/JournalEntriesImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/journalentry/JournalEntriesImportHandler.java
@@ -19,12 +19,14 @@
 package org.apache.fineract.infrastructure.bulkimport.importhandler.journalentry;
 
 import com.google.gson.GsonBuilder;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 import org.apache.fineract.accounting.journalentry.data.CreditDebit;
 import org.apache.fineract.accounting.journalentry.data.JournalEntryData;
 import org.apache.fineract.commands.domain.CommandWrapper;
 import org.apache.fineract.commands.service.CommandWrapperBuilder;
 import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
-import org.apache.fineract.infrastructure.bulkimport.constants.ChartOfAcountsConstants;
 import org.apache.fineract.infrastructure.bulkimport.constants.JournalEntryConstants;
 import org.apache.fineract.infrastructure.bulkimport.constants.TemplatePopulateImportConstants;
 import org.apache.fineract.infrastructure.bulkimport.data.Count;
@@ -33,16 +35,15 @@ import org.apache.fineract.infrastructure.bulkimport.importhandler.ImportHandler
 import org.apache.fineract.infrastructure.bulkimport.importhandler.helper.CurrencyDateCodeSerializer;
 import org.apache.fineract.infrastructure.bulkimport.importhandler.helper.DateSerializer;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
-import org.apache.fineract.infrastructure.core.exception.*;
 import org.apache.fineract.organisation.monetary.data.CurrencyData;
-import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.joda.time.LocalDate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
 @Service
 public class JournalEntriesImportHandler implements ImportHandler {
     private Workbook workbook;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/loan/LoanImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/loan/LoanImportHandler.java
index 2199fa7..60371cf 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/loan/LoanImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/loan/LoanImportHandler.java
@@ -22,6 +22,10 @@ import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
 import org.apache.fineract.commands.domain.CommandWrapper;
 import org.apache.fineract.commands.service.CommandWrapperBuilder;
 import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
@@ -34,17 +38,20 @@ import org.apache.fineract.infrastructure.bulkimport.importhandler.helper.DateSe
 import org.apache.fineract.infrastructure.bulkimport.importhandler.helper.EnumOptionDataValueSerializer;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
-import org.apache.fineract.portfolio.loanaccount.data.*;
-import org.apache.poi.ss.usermodel.*;
+import org.apache.fineract.portfolio.loanaccount.data.DisbursementData;
+import org.apache.fineract.portfolio.loanaccount.data.LoanAccountData;
+import org.apache.fineract.portfolio.loanaccount.data.LoanApprovalData;
+import org.apache.fineract.portfolio.loanaccount.data.LoanChargeData;
+import org.apache.fineract.portfolio.loanaccount.data.LoanTransactionData;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.joda.time.LocalDate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
 @Service
 public class LoanImportHandler implements ImportHandler {
     private Workbook workbook;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/loanrepayment/LoanRepaymentImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/loanrepayment/LoanRepaymentImportHandler.java
index c5417e3..9538ba6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/loanrepayment/LoanRepaymentImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/loanrepayment/LoanRepaymentImportHandler.java
@@ -18,10 +18,11 @@
  */
 package org.apache.fineract.infrastructure.bulkimport.importhandler.loanrepayment;
 
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.fineract.commands.domain.CommandWrapper;
 import org.apache.fineract.commands.service.CommandWrapperBuilder;
 import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
@@ -41,9 +42,6 @@ import org.apache.poi.ss.usermodel.Workbook;
 import org.joda.time.LocalDate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonObject;
 @Service
 public class LoanRepaymentImportHandler implements ImportHandler {
     private  Workbook workbook;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/office/OfficeImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/office/OfficeImportHandler.java
index 7a3aa00..4fbfb21 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/office/OfficeImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/office/OfficeImportHandler.java
@@ -19,6 +19,8 @@
 package org.apache.fineract.infrastructure.bulkimport.importhandler.office;
 
 import com.google.gson.GsonBuilder;
+import java.util.ArrayList;
+import java.util.List;
 import org.apache.fineract.commands.domain.CommandWrapper;
 import org.apache.fineract.commands.service.CommandWrapperBuilder;
 import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
@@ -29,16 +31,16 @@ import org.apache.fineract.infrastructure.bulkimport.importhandler.ImportHandler
 import org.apache.fineract.infrastructure.bulkimport.importhandler.ImportHandlerUtils;
 import org.apache.fineract.infrastructure.bulkimport.importhandler.helper.DateSerializer;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
-import org.apache.fineract.infrastructure.core.exception.*;
 import org.apache.fineract.organisation.office.data.OfficeData;
-import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.joda.time.LocalDate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @Service
 public class OfficeImportHandler implements ImportHandler {
     private List<OfficeData> offices;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/recurringdeposit/RecurringDepositImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/recurringdeposit/RecurringDepositImportHandler.java
index 0c2cb82..1863a44 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/recurringdeposit/RecurringDepositImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/recurringdeposit/RecurringDepositImportHandler.java
@@ -20,6 +20,9 @@ package org.apache.fineract.infrastructure.bulkimport.importhandler.recurringdep
 
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 import org.apache.fineract.commands.domain.CommandWrapper;
 import org.apache.fineract.commands.service.CommandWrapperBuilder;
 import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
@@ -32,19 +35,18 @@ import org.apache.fineract.infrastructure.bulkimport.importhandler.helper.DateSe
 import org.apache.fineract.infrastructure.bulkimport.importhandler.helper.EnumOptionDataIdSerializer;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
-import org.apache.fineract.infrastructure.core.exception.*;
 import org.apache.fineract.portfolio.savings.data.RecurringDepositAccountData;
 import org.apache.fineract.portfolio.savings.data.SavingsAccountChargeData;
 import org.apache.fineract.portfolio.savings.data.SavingsActivation;
 import org.apache.fineract.portfolio.savings.data.SavingsApproval;
-import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.joda.time.LocalDate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
 @Service
 public class RecurringDepositImportHandler implements ImportHandler {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/recurringdeposit/RecurringDepositTransactionImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/recurringdeposit/RecurringDepositTransactionImportHandler.java
index 3715dbd..53d6e50 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/recurringdeposit/RecurringDepositTransactionImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/recurringdeposit/RecurringDepositTransactionImportHandler.java
@@ -20,6 +20,9 @@ package org.apache.fineract.infrastructure.bulkimport.importhandler.recurringdep
 
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 import org.apache.fineract.commands.domain.CommandWrapper;
 import org.apache.fineract.commands.service.CommandWrapperBuilder;
 import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
@@ -31,17 +34,17 @@ import org.apache.fineract.infrastructure.bulkimport.importhandler.ImportHandler
 import org.apache.fineract.infrastructure.bulkimport.importhandler.helper.DateSerializer;
 import org.apache.fineract.infrastructure.bulkimport.importhandler.helper.SavingsAccountTransactionEnumValueSerialiser;
 import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
-import org.apache.fineract.infrastructure.core.exception.*;
+import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 import org.apache.fineract.portfolio.savings.data.SavingsAccountTransactionData;
 import org.apache.fineract.portfolio.savings.data.SavingsAccountTransactionEnumData;
-import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.joda.time.LocalDate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
 @Service
 public class RecurringDepositTransactionImportHandler implements ImportHandler {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/savings/SavingsImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/savings/SavingsImportHandler.java
index 13c0f54..e46671c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/savings/SavingsImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/savings/SavingsImportHandler.java
@@ -20,6 +20,10 @@ package org.apache.fineract.infrastructure.bulkimport.importhandler.savings;
 
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
... 28141 lines suppressed ...


Mime
View raw message