You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by vo...@apache.org on 2020/06/23 08:02:29 UTC

[fineract] branch develop updated: increase auto formatting comment line length from 80 to 120

This is an automated email from the ASF dual-hosted git repository.

vorburger 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 c529fdf  increase auto formatting comment line length from 80 to 120
c529fdf is described below

commit c529fdf58c335adb4dd938b0551f7e355e9eb56d
Author: Michael Vorburger <mi...@vorburger.ch>
AuthorDate: Sat Jun 20 23:26:52 2020 +0200

    increase auto formatting comment line length from 80 to 120
---
 config/fineractdev-formatter.xml                   |   2 +-
 .../AccountNumberPreferencesTest.java              |   9 +-
 .../fineract/integrationtests/BatchApiTest.java    |  73 +++++------
 .../BatchRequestsIntegrationTest.java              |  20 ++-
 .../ClientLoanIntegrationTest.java                 |  97 ++++++--------
 .../ClientSavingsIntegrationTest.java              | 143 ++++++++-------------
 .../DisbursalAndRepaymentScheduleTest.java         |   3 +-
 .../FinancialActivityAccountsTest.java             |   9 +-
 .../integrationtests/FixedDepositTest.java         |  42 +++---
 ...xibleSavingsInterestPostingIntegrationTest.java |   3 +-
 .../integrationtests/GlobalConfigurationTest.java  |   9 +-
 .../fineract/integrationtests/GroupTest.java       |   3 +-
 .../integrationtests/HookIntegrationTest.java      |   4 +-
 .../LoanApplicationApprovalTest.java               |   9 +-
 .../LoanDisbursementDetailsIntegrationTest.java    | 132 +++++++------------
 ...ithWaiveInterestAndWriteOffIntegrationTest.java |   3 +-
 ...mDaysBetweenDisbursalAndFirstRepaymentTest.java |  10 +-
 .../integrationtests/RecurringDepositTest.java     | 104 +++++++--------
 .../integrationtests/SurveyIntegrationTest.java    |   3 +-
 .../integrationtests/common/BatchHelper.java       |  76 +++++------
 .../integrationtests/common/ClientChargesTest.java |  33 ++---
 .../common/GlobalConfigurationHelper.java          |  15 +--
 .../common/SchedulerJobHelper.java                 |   4 +-
 .../fineract/integrationtests/common/Utils.java    |   4 +-
 .../common/loans/LoanApplicationTestBuilder.java   |  12 +-
 .../common/loans/LoanDisbursementTestBuilder.java  |  31 ++---
 .../EntityDatatableChecksIntegrationTest.java      |   3 +-
 .../org/apache/fineract/ServerApplication.java     |  13 +-
 .../AccrualAccountingDataValidator.java            |   3 +-
 .../closure/api/GLClosuresApiResourceSwagger.java  |   3 +-
 .../accounting/closure/data/GLClosureData.java     |   3 +-
 .../exception/GLClosureDuplicateException.java     |   3 +-
 .../exception/GLClosureNotFoundException.java      |   3 +-
 .../GLClosureCommandFromApiJsonDeserializer.java   |   3 +-
 ...osureWritePlatformServiceJpaRepositoryImpl.java |   3 +-
 .../accounting/common/AccountingConstants.java     |   9 +-
 .../FinancialActivityAccountRepositoryWrapper.java |   3 +-
 ...cateFinancialActivityAccountFoundException.java |   3 +-
 .../FinancialActivityAccountInvalidException.java  |   3 +-
 .../FinancialActivityAccountNotFoundException.java |   3 +-
 ...ialActivityAccountWritePlatformServiceImpl.java |   3 +-
 .../accounting/glaccount/data/GLAccountData.java   |   3 +-
 .../exception/GLAccountDisableException.java       |   3 +-
 .../exception/GLAccountDuplicateException.java     |   3 +-
 .../GLAccountInvalidClassificationException.java   |   3 +-
 .../exception/GLAccountInvalidDeleteException.java |   3 +-
 .../exception/GLAccountInvalidParentException.java |   3 +-
 .../exception/GLAccountInvalidUpdateException.java |   3 +-
 .../exception/GLAccountInvalidUsageException.java  |   3 +-
 .../GLAccountCommandFromApiJsonDeserializer.java   |   3 +-
 ...countWritePlatformServiceJpaRepositoryImpl.java |   3 +-
 .../journalentry/data/JournalEntryData.java        |   3 +-
 .../domain/JournalEntryRepository.java             |  10 +-
 ...JournalEntryCommandFromApiJsonDeserializer.java |   3 +-
 .../AccountingProcessorForSavingsFactory.java      |   5 +-
 .../service/AccountingProcessorHelper.java         |  83 +++++-------
 .../AccrualBasedAccountingProcessorForLoan.java    |  46 +++----
 ...edAccountingProcessorForClientTransactions.java |  12 +-
 .../CashBasedAccountingProcessorForLoan.java       |  39 +++---
 .../CashBasedAccountingProcessorForSavings.java    |   3 +-
 ...EntryWritePlatformServiceJpaRepositoryImpl.java |  11 +-
 .../ProductToGLAccountMappingInvalidException.java |   3 +-
 ...ProductToGLAccountMappingNotFoundException.java |   3 +-
 ...tToGLAccountMappingFromApiJsonDeserializer.java |  26 ++--
 .../LoanProductToGLAccountMappingHelper.java       |   3 +-
 .../service/ProductToGLAccountMappingHelper.java   |  43 +++----
 ...ToGLAccountMappingWritePlatformServiceImpl.java |  21 ++-
 .../SavingsProductToGLAccountMappingHelper.java    |   3 +-
 .../ShareProductToGLAccountMappingHelper.java      |   3 +-
 .../accounting/rule/data/AccountingRuleData.java   |   3 +-
 .../AccountingRuleDuplicateException.java          |   3 +-
 .../exception/AccountingRuleNotFoundException.java |   3 +-
 .../fineract/adhocquery/api/AdHocApiResource.java  |   3 +-
 .../adhocquery/service/AdHocDataValidator.java     |   9 +-
 ...AdHocWritePlatformServiceJpaRepositoryImpl.java |   3 +-
 .../fineract/batch/api/BatchApiResource.java       |  16 +--
 .../fineract/batch/command/CommandContext.java     |  11 +-
 .../fineract/batch/command/CommandStrategy.java    |  10 +-
 .../batch/command/CommandStrategyProvider.java     |  20 ++-
 .../internal/ActivateClientCommandStrategy.java    |  12 +-
 .../command/internal/ApplyLoanCommandStrategy.java |  12 +-
 .../internal/ApplySavingsCommandStrategy.java      |  12 +-
 .../internal/ApproveLoanCommandStrategy.java       |  12 +-
 .../internal/CollectChargesCommandStrategy.java    |  12 +-
 .../internal/CreateChargeCommandStrategy.java      |  12 +-
 .../internal/CreateClientCommandStrategy.java      |  12 +-
 .../internal/DisburseLoanCommandStrategy.java      |  12 +-
 .../command/internal/RepayLoanCommandStrategy.java |   8 +-
 .../command/internal/UnknownCommandStrategy.java   |   5 +-
 .../internal/UpdateClientCommandStrategy.java      |  12 +-
 .../apache/fineract/batch/domain/BatchRequest.java |  17 +--
 .../fineract/batch/domain/BatchResponse.java       |  13 +-
 .../org/apache/fineract/batch/domain/Header.java   |   5 +-
 .../fineract/batch/exception/ErrorHandler.java     |  11 +-
 .../apache/fineract/batch/exception/ErrorInfo.java |   6 +-
 .../serialization/BatchRequestJsonHelper.java      |   9 +-
 .../fineract/batch/service/BatchApiService.java    |  20 ++-
 .../batch/service/BatchApiServiceImpl.java         |  11 +-
 .../fineract/batch/service/ResolutionHelper.java   |  18 +--
 .../fineract/commands/annotation/CommandType.java  |   3 +-
 ...onAsCommandIsNotApprovedByCheckerException.java |  11 +-
 .../exception/UnsupportedCommandException.java     |   4 +-
 .../commands/provider/CommandHandlerProvider.java  |  12 +-
 ...folioCommandSourceWritePlatformServiceImpl.java |   6 +-
 .../SynchronousCommandProcessingService.java       |  10 +-
 .../data/AccountNumberFormatDataValidator.java     |   6 +-
 .../service/AccountNumberFormatConstants.java      |   5 +-
 ...AccountNumberFormatReadPlatformServiceImpl.java |   5 +-
 ...ormatWritePlatformServiceJpaRepositoryImpl.java |   3 +-
 .../populator/PersonnelSheetPopulator.java         |  10 +-
 .../service/RuntimeDelegatingCacheManager.java     |   8 +-
 .../email/api/EmailCampaignApiResource.java        |   4 +-
 .../EmailCampaignReadPlatformServiceImpl.java      |   5 +-
 ...ailCampaignWritePlatformCommandHandlerImpl.java |  23 ++--
 ...EmailWritePlatformServiceJpaRepositoryImpl.java |   3 +-
 .../sms/service/SmsCampaignDomainServiceImpl.java  |   5 +-
 .../SmsCampaignWritePlatformServiceJpaImpl.java    |  17 +--
 .../infrastructure/codes/CodeConstants.java        |   3 +-
 .../codes/domain/CodeValueRepositoryWrapper.java   |  11 +-
 .../SystemDefinedCodeCannotBeChangedException.java |   3 +-
 .../service/CodeValueReadPlatformService.java      |   6 +-
 ...ValueWritePlatformServiceJpaRepositoryImpl.java |   3 +-
 .../CodeWritePlatformServiceJpaRepositoryImpl.java |   3 +-
 .../domain/ConfigurationDomainServiceJpa.java      |   3 +-
 .../GlobalConfigurationRepositoryWrapper.java      |   3 +-
 ...obalConfigurationPropertyNotFoundException.java |   3 +-
 ...onfigurationCommandFromApiJsonDeserializer.java |   3 +-
 ...ationWritePlatformServiceJpaRepositoryImpl.java |   3 +-
 .../core/api/ApiRequestParameterHelper.java        |   7 +-
 .../infrastructure/core/api/DateAdapter.java       |   4 +-
 .../core/api/JodaDateTimeAdapter.java              |   3 +-
 .../core/api/JodaLocalDateAdapter.java             |   4 +-
 .../core/api/JodaMonthDayAdapter.java              |   4 +-
 .../infrastructure/core/api/JsonCommand.java       |   4 +-
 .../infrastructure/core/api/JsonQuery.java         |   3 +-
 .../boot/AbstractApplicationConfiguration.java     |   9 +-
 .../boot/EmbeddedTomcatWithSSLConfiguration.java   |  11 +-
 .../core/boot/WebXmlOauthConfiguration.java        |   3 +-
 .../core/data/ApiGlobalErrorResponse.java          |  15 +--
 .../core/data/ApiParameterError.java               |  13 +-
 .../core/data/CommandProcessingResult.java         |   3 +-
 .../core/data/CommandProcessingResultBuilder.java  |   3 +-
 .../core/data/DataValidatorBuilder.java            |  10 +-
 .../core/debug/EchoHeadersResource.java            |  13 +-
 .../core/domain/AbstractAuditableCustom.java       |   8 +-
 .../core/domain/AbstractPersistableCustom.java     |  10 +-
 .../infrastructure/core/domain/JdbcSupport.java    |   4 +-
 .../AbstractPlatformDomainRuleException.java       |   3 +-
 .../AbstractPlatformResourceNotFoundException.java |   3 +-
 ...bstractPlatformServiceUnavailableException.java |   3 +-
 .../GeneralPlatformDomainRuleException.java        |   3 +-
 .../core/exception/InvalidJsonException.java       |   4 +-
 .../core/exception/MultiException.java             |  10 +-
 .../exception/PlatformDataIntegrityException.java  |   3 +-
 .../exception/UnsupportedParameterException.java   |   4 +-
 .../AccessDeniedExceptionMapper.java               |   8 +-
 .../BadCredentialsExceptionMapper.java             |   9 +-
 .../InvalidJsonExceptionMapper.java                |   3 +-
 .../InvalidTenantIdentifierExceptionMapper.java    |   8 +-
 .../exceptionmapper/JsonSyntaxExceptionMapper.java |   3 +-
 .../MalformedJsonExceptionMapper.java              |   3 +-
 .../NoAuthorizationExceptionMapper.java            |   8 +-
 .../PlatformApiDataValidationExceptionMapper.java  |   8 +-
 .../PlatformDataIntegrityExceptionMapper.java      |   8 +-
 .../PlatformDomainRuleExceptionMapper.java         |   8 +-
 .../PlatformInternalServerExceptionMapper.java     |   7 +-
 .../PlatformResourceNotFoundExceptionMapper.java   |   9 +-
 .../PlatformServiceUnavailableExceptionMapper.java |   9 +-
 .../UnAuthenticatedUserExceptionMapper.java        |   4 +-
 .../UnrecognizedQueryParamExceptionMapper.java     |   8 +-
 .../UnsupportedCommandExceptionMapper.java         |   4 +-
 .../UnsupportedParameterExceptionMapper.java       |   4 +-
 .../core/filters/ResponseCorsFilter.java           |   4 +-
 .../AbstractFromApiJsonDeserializer.java           |   3 +-
 .../AbstractFromCommandJsonDeserializer.java       |   3 +-
 .../ApiRequestJsonSerializationSettings.java       |   4 +-
 .../CommandSerializerDefaultToJson.java            |   3 +-
 .../serialization/DefaultToApiJsonSerializer.java  |   4 +-
 .../core/serialization/FromJsonHelper.java         |   7 +-
 .../core/serialization/JsonParserHelper.java       |   7 +-
 ...AbandonedConnectionCleanupShutdownListener.java |  13 +-
 .../core/service/RoutingDataSource.java            |   9 +-
 .../core/service/RoutingDataSourceService.java     |   3 +-
 .../service/RoutingDataSourceServiceFactory.java   |   3 +-
 .../core/service/SearchParameters.java             |   6 +-
 .../core/service/TenantDatabaseUpgradeService.java |   6 +-
 .../TomcatJdbcDataSourcePerTenantService.java      |   8 +-
 .../dataqueries/data/ResultsetColumnValueData.java |   3 +-
 .../dataqueries/domain/ReportParameterUsage.java   |  19 +--
 .../domain/ReportRepositoryWrapper.java            |   5 +-
 .../exception/DatatableEntryRequiredException.java |   3 +-
 ...ityDatatableChecksWritePlatformServiceImpl.java |   3 +-
 .../service/GenericDataServiceImpl.java            |   3 +-
 .../service/ReadReportingServiceImpl.java          |  83 +++++-------
 .../service/ReadWriteNonCoreDataServiceImpl.java   |  25 ++--
 .../service/ReportWritePlatformServiceImpl.java    |   3 +-
 .../api/DocumentManagementApiResource.java         |  13 +-
 .../documentmanagement/api/ImagesApiResource.java  |   8 +-
 .../contentrepository/ContentRepositoryUtils.java  |   7 +-
 ...idEntityTypeForDocumentManagementException.java |   3 +-
 .../FineractEntityAccessRepositoryWrapper.java     |   3 +-
 .../domain/FineractEntityRelation.java             |   6 +-
 .../domain/FineractEntityToEntityMapping.java      |   8 +-
 .../NotOfficeSpecificProductException.java         |   3 +-
 .../FineractEntityAccessReadServiceImpl.java       |  15 +--
 .../service/FineractEntityAccessWriteService.java  |   8 +-
 .../FineractEntityAccessWriteServiceImpl.java      |  10 +-
 .../fineract/infrastructure/gcm/GcmConstants.java  |  24 ++--
 .../infrastructure/gcm/domain/Message.java         |   3 +-
 .../infrastructure/gcm/domain/MulticastResult.java |   3 +-
 .../infrastructure/gcm/domain/Notification.java    |   3 +-
 .../fineract/infrastructure/gcm/domain/Result.java |  12 +-
 .../fineract/infrastructure/gcm/domain/Sender.java |  46 +++----
 .../jobs/annotation/CronMethodParser.java          |   3 +-
 .../jobs/service/JobRegisterServiceImpl.java       |  12 +-
 .../jobs/service/SchedulerJobListener.java         |   5 +-
 .../jobs/service/SchedulerStopListener.java        |   3 +-
 .../infrastructure/openjpa/OpenJpaDialect.java     |  16 +--
 .../openjpa/OpenJpaVendorAdapter.java              |  12 +-
 .../ReportMailingJobEmailAttachmentFileFormat.java |   7 +-
 ...ortMailingJobStretchyReportParamDateOption.java |  16 +--
 .../data/ReportMailingJobTimelineData.java         |   3 +-
 .../reportmailingjob/domain/ReportMailingJob.java  |   3 +-
 .../domain/ReportMailingJobRepository.java         |   3 +-
 .../domain/ReportMailingJobRepositoryWrapper.java  |   3 +-
 ...rtMailingJobConfigurationNotFoundException.java |   3 +-
 .../ReportMailingJobNotFoundException.java         |   3 +-
 ...eportMailingJobRunHistoryNotFoundException.java |   3 +-
 .../reportmailingjob/helper/IPv4Helper.java        |   6 +-
 .../service/ReportMailingJobEmailServiceImpl.java  |   3 +-
 .../ReportMailingJobReadPlatformService.java       |   6 +-
 ...ortMailingJobRunHistoryReadPlatformService.java |   3 +-
 .../ReportMailingJobWritePlatformServiceImpl.java  |   3 +-
 .../util/ReportMailingJobDateUtil.java             |   3 +-
 .../validation/ReportMailingJobValidator.java      |   3 +-
 .../security/data/PlatformRequestLog.java          |   3 +-
 .../exception/InvalidTenantIdentiferException.java |   3 +-
 .../exception/NoAuthorizationException.java        |   4 +-
 .../security/exception/ResetPasswordException.java |   4 +-
 .../InsecureTwoFactorAuthenticationFilter.java     |   6 +-
 .../TenantAwareBasicAuthenticationFilter.java      |  13 +-
 .../filter/TenantAwareTenantIdentifierFilter.java  |  11 +-
 .../filter/TwoFactorAuthenticationFilter.java      |  18 +--
 .../service/BasicAuthTenantDetailsServiceJdbc.java |   4 +-
 .../CustomAuthenticationFailureHandler.java        |  18 ++-
 .../security/service/JdbcTenantDetailsService.java |   4 +-
 .../security/service/PlatformSecurityContext.java  |   7 +-
 .../SpringSecurityPlatformSecurityContext.java     |   3 +-
 .../TenantAwareJpaPlatformUserDetailsService.java  |   3 +-
 .../infrastructure/security/utils/SQLBuilder.java  |  37 +++---
 .../sms/data/SmsMessageApiQueueResourceData.java   |   3 +-
 .../sms/data/SmsMessageApiReportResourceData.java  |   3 +-
 .../sms/data/SmsMessageDeliveryReportData.java     |   3 +-
 .../scheduler/SmsMessageScheduledJobService.java   |   3 +-
 .../SmsMessageScheduledJobServiceImpl.java         |   6 +-
 .../SmsWritePlatformServiceJpaRepositoryImpl.java  |   3 +-
 .../survey/service/WriteLikelihoodServiceImpl.java |   3 +-
 .../fineract/interoperation/util/MathUtil.java     |   3 +-
 .../holiday/domain/HolidayRepositoryWrapper.java   |   3 +-
 .../ApplicationCurrencyRepositoryWrapper.java      |  13 +-
 .../monetary/exception/CurrencyInUseException.java |   3 +-
 .../OrganizationalCurrencyNotFoundException.java   |   3 +-
 .../office/api/OfficesApiResource.java             |   3 +-
 .../office/domain/OfficeRepositoryWrapper.java     |   3 +-
 .../OrganisationCurrencyRepositoryWrapper.java     |   9 +-
 .../office/exception/InvalidOfficeException.java   |   3 +-
 .../OfficeTransactionNotFoundException.java        |   3 +-
 ...fficeWritePlatformServiceJpaRepositoryImpl.java |   7 +-
 ...egoryWritePlatformServiceJpaRepositoryImpl.java |   3 +-
 ...teriaWritePlatformServiceJpaRepositoryImpl.java |   3 +-
 .../organisation/staff/api/StaffApiResource.java   |   3 +-
 .../staff/domain/StaffRepositoryWrapper.java       |   3 +-
 .../staff/service/StaffReadPlatformService.java    |   3 +-
 ...StaffWritePlatformServiceJpaRepositoryImpl.java |   3 +-
 .../organisation/teller/data/CashierData.java      |  24 ++--
 .../organisation/teller/data/TellerData.java       |   6 +-
 .../teller/data/TellerTransactionData.java         |   6 +-
 .../organisation/teller/domain/Cashier.java        |  37 ++----
 .../teller/domain/CashierRepository.java           |   3 +-
 .../teller/domain/CashierTransaction.java          |   3 +-
 .../organisation/teller/domain/Teller.java         |   7 +-
 .../teller/domain/TellerRepository.java            |   3 +-
 .../teller/domain/TellerTransactionRepository.java |   3 +-
 .../AllocateCashToCashierCommandHandler.java       |   3 +-
 .../AllocateCashierToTellerCommandHandler.java     |   3 +-
 .../teller/handler/CreateTellerCommandHandler.java |   3 +-
 .../DeleteCashierAllocationCommandHandler.java     |   3 +-
 .../teller/handler/DeleteTellerCommandHandler.java |   3 +-
 .../handler/ModifyCashierCommandHandler.java       |   3 +-
 .../SettleCashFromCashierCommandHandler.java       |   3 +-
 .../UpdateCashierAllocationCommandHandler.java     |   3 +-
 .../teller/handler/UpdateTellerCommandHandler.java |   3 +-
 .../teller/service/TellerWritePlatformService.java |   4 +-
 .../service/TellerWritePlatformServiceJpaImpl.java |  12 +-
 .../workingdays/data/AdjustedDateDetailsDTO.java   |   4 +-
 .../domain/WorkingDaysRepositoryWrapper.java       |   3 +-
 .../account/api/AccountTransfersApiConstants.java  |   5 +-
 .../domain/AccountTransferStandingInstruction.java |   3 +-
 ...AccountAssociationsReadPlatformServiceImpl.java |  13 +-
 .../PortfolioAccountReadPlatformServiceImpl.java   |   4 +-
 ...StandingInstructionReadPlatformServiceImpl.java |  20 +--
 .../data/AccountSummaryCollectionData.java         |   3 +-
 .../fineract/portfolio/address/domain/Address.java |   4 +-
 .../portfolio/calendar/domain/Calendar.java        |  21 ++-
 .../calendar/domain/CalendarFrequencyType.java     |   6 +-
 .../domain/CalendarInstanceRepository.java         |   3 +-
 .../domain/CalendarInstanceRepositoryWrapper.java  |  10 +-
 .../calendar/domain/CalendarRepositoryWrapper.java |   9 +-
 .../CalendarInstanceNotFoundException.java         |   3 +-
 .../service/CalendarReadPlatformServiceImpl.java   |  19 ++-
 .../portfolio/calendar/service/CalendarUtils.java  |  35 ++---
 ...endarWritePlatformServiceJpaRepositoryImpl.java |  27 ++--
 .../fineract/portfolio/charge/domain/Charge.java   |  11 +-
 .../charge/domain/ChargeRepositoryWrapper.java     |   9 +-
 ...eDueAtDisbursementCannotBePenaltyException.java |   4 +-
 .../exception/ChargeMustBePenaltyException.java    |   4 +-
 .../LoanChargeCannotBeAddedException.java          |   3 +-
 .../exception/LoanChargeNotFoundException.java     |   3 +-
 .../LoanChargeWithoutMandatoryFieldException.java  |   3 +-
 .../SavingsAccountChargeNotFoundException.java     |   3 +-
 ...ccountChargeWithoutMandatoryFieldException.java |   3 +-
 ...ccountChargeWithoutMandatoryFieldException.java |   3 +-
 .../charge/service/ChargeReadPlatformService.java  |   3 +-
 ...hargeWritePlatformServiceJpaRepositoryImpl.java |   3 +-
 .../portfolio/client/api/ClientApiConstants.java   |   5 +-
 .../client/data/ClientApiCollectionConstants.java  |   5 +-
 .../portfolio/client/data/ClientDataValidator.java |  18 +--
 .../portfolio/client/data/ClientTimelineData.java  |   3 +-
 .../client/domain/AccountNumberGenerator.java      |   5 +-
 .../domain/ClientNonPersonRepositoryWrapper.java   |   3 +-
 .../client/domain/ClientRepositoryWrapper.java     |   3 +-
 .../portfolio/client/domain/ClientTransaction.java |   3 +-
 .../ClientIdentifierNotFoundException.java         |   3 +-
 ...ClientNonPersonNotFoundByClientIdException.java |   3 +-
 .../ClientNonPersonNotFoundException.java          |   3 +-
 .../DuplicateClientIdentifierException.java        |   3 +-
 .../InvalidClientSavingProductException.java       |   4 +-
 .../InvalidClientStateTransitionException.java     |   4 +-
 .../handler/UpdateClientAddressCommandHandler.java |   5 +-
 ...ntIdentifierCommandFromApiJsonDeserializer.java |   3 +-
 ...hargeWritePlatformServiceJpaRepositoryImpl.java |   9 +-
 ...lientFamilyMembersWritePlatformServiceImpl.java |   6 +-
 ...lientWritePlatformServiceJpaRepositoryImpl.java |  17 +--
 .../collateral/domain/LoanCollateral.java          |  17 +--
 .../CollateralCommandFromApiJsonDeserializer.java  |   3 +-
 ...teralWritePlatformServiceJpaRepositoryImpl.java |   9 +-
 .../collectionsheet/data/IndividualClientData.java |   3 +-
 .../IndividualCollectionSheetLoanFlatData.java     |   3 +-
 .../collectionsheet/data/JLGClientData.java        |  10 +-
 .../data/JLGCollectionSheetFlatData.java           |   3 +-
 .../collectionsheet/data/JLGGroupData.java         |   3 +-
 .../collectionsheet/data/LoanDueData.java          |   3 +-
 .../collectionsheet/data/SavingsDueData.java       |   3 +-
 ...ulkDisbursalCommandFromApiJsonDeserializer.java |   3 +-
 ...ulkRepaymentCommandFromApiJsonDeserializer.java |   3 +-
 .../CollectionSheetReadPlatformServiceImpl.java    |   5 +-
 .../portfolio/common/domain/DaysInMonthType.java   |   3 +-
 .../portfolio/common/domain/DaysInYearType.java    |   3 +-
 .../common/service/BusinessEventListner.java       |   5 +-
 .../service/BusinessEventNotifierService.java      |  15 +--
 .../service/BusinessEventNotifierServiceImpl.java  |  30 ++---
 .../FundWritePlatformServiceJpaRepositoryImpl.java |   3 +-
 .../group/api/GroupingTypesApiConstants.java       |   5 +-
 .../portfolio/group/data/GroupGeneralData.java     |   3 +-
 .../portfolio/group/data/GroupTimelineData.java    |   3 +-
 .../fineract/portfolio/group/domain/Group.java     |   3 +-
 .../group/domain/GroupRepositoryWrapper.java       |   3 +-
 .../exception/InvalidGroupLevelException.java      |   4 +-
 ...TypesWritePlatformServiceJpaRepositoryImpl.java |  35 ++---
 .../data/InterestRateChartRepositoryWrapper.java   |  10 +-
 .../InterestRateChartSlabRepositoryWrapper.java    |  10 +-
 .../domain/InterestIncentives.java                 |   6 +-
 .../domain/InterestRateChart.java                  |   3 +-
 .../service/InterestRateChartAssembler.java        |   3 +-
 .../service/InterestRateChartSlabAssembler.java    |   3 +-
 .../loanaccount/api/LoansApiResource.java          |   7 +-
 .../command/UpdateLoanOfficerCommand.java          |   3 +-
 .../loanaccount/data/LoanAccountData.java          |  18 +--
 .../data/LoanApplicationTimelineData.java          |   3 +-
 .../portfolio/loanaccount/data/LoanChargeData.java |   3 +-
 .../loanaccount/data/LoanTransactionEnumData.java  |   4 +-
 .../domain/ChangedTransactionDetail.java           |   3 +-
 .../portfolio/loanaccount/domain/Loan.java         | 132 ++++++++-----------
 .../domain/LoanAccountDomainService.java           |   5 +-
 .../domain/LoanAccountDomainServiceJpa.java        |  34 ++---
 .../portfolio/loanaccount/domain/LoanCharge.java   |  20 ++-
 .../domain/LoanInterestRecalculationDetails.java   |   3 +-
 .../LoanRepaymentScheduleProcessingWrapper.java    |   3 +-
 .../loanaccount/domain/LoanRepositoryWrapper.java  |   3 +-
 .../portfolio/loanaccount/domain/LoanSummary.java  |   3 +-
 .../loanaccount/domain/LoanSummaryWrapper.java     |   3 +-
 .../domain/LoanTermVariationsComparator.java       |   4 +-
 .../loanaccount/domain/LoanTransaction.java        |  15 +--
 .../domain/LoanTransactionComparator.java          |   8 +-
 .../loanaccount/domain/LoanTransactionType.java    |  12 +-
 ...tLoanRepaymentScheduleTransactionProcessor.java |  49 +++----
 .../LoanRepaymentScheduleTransactionProcessor.java |   3 +-
 ...eLoanRepaymentScheduleTransactionProcessor.java |  20 +--
 ...tLoanRepaymentScheduleTransactionProcessor.java |  11 +-
 ...eLoanRepaymentScheduleTransactionProcessor.java |  16 +--
 ...yLoanRepaymentScheduleTransactionProcessor.java |  14 +-
 ...rLoanRepaymentScheduleTransactionProcessor.java |  11 +-
 ...rLoanRepaymentScheduleTransactionProcessor.java |  11 +-
 ...ILoanRepaymentScheduleTransactionProcessor.java |  17 +--
 .../exception/DateMismatchException.java           |   4 +-
 .../InvalidLoanStateTransitionException.java       |   4 +-
 .../InvalidLoanTransactionTypeException.java       |   4 +-
 .../exception/InvalidLoanTypeException.java        |   4 +-
 .../InvalidPaidInAdvanceAmountException.java       |   4 +-
 ...ttedAndPendingApprovalStateCannotBeDeleted.java |   3 +-
 ...tedAndPendingApprovalStateCannotBeModified.java |   3 +-
 .../LoanTemplateTypeRequiredException.java         |   3 +-
 ...sactionProcessingStrategyNotFoundException.java |   3 +-
 ...sbursalAndFirstRepaymentViolationException.java |   5 +-
 .../NotSupportedLoanTemplateTypeException.java     |   3 +-
 .../exception/InvalidGuarantorException.java       |   3 +-
 .../GuarantorCommandFromApiJsonDeserializer.java   |   3 +-
 .../service/GuarantorDomainServiceImpl.java        |  37 +++---
 .../service/GuarantorReadPlatformService.java      |   3 +-
 .../loanschedule/data/LoanScheduleData.java        |  12 +-
 .../loanschedule/data/LoanSchedulePeriodData.java  |  10 +-
 .../domain/AbstractLoanScheduleGenerator.java      |  33 ++---
 ...liningBalanceInterestLoanScheduleGenerator.java |  19 ++-
 .../domain/DefaultScheduledDateGenerator.java      |  15 +--
 .../loanschedule/domain/FinanicalFunctions.java    |  14 +-
 .../domain/FlatInterestLoanScheduleGenerator.java  |  10 +-
 .../loanschedule/domain/LoanApplicationTerms.java  |  48 +++----
 .../LoanScheduleModelDisbursementPeriod.java       |   3 +-
 .../domain/LoanScheduleModelRepaymentPeriod.java   |   3 +-
 .../service/LoanScheduleAssembler.java             |  24 ++--
 ...LoanScheduleCalculationPlatformServiceImpl.java |   3 +-
 .../api/RescheduleLoansApiResource.java            |  16 +--
 .../data/LoanRescheduleRequestTimelineData.java    |   3 +-
 .../domain/LoanRescheduleRequest.java              |   8 +-
 .../LoanRescheduleRequestNotFoundException.java    |   3 +-
 .../LoanRescheduleRequestReadPlatformService.java  |   5 +-
 ...nRescheduleRequestWritePlatformServiceImpl.java |  22 ++--
 .../LoanApplicationCommandFromApiJsonHelper.java   |   5 +-
 ...ationWritePlatformServiceJpaRepositoryImpl.java |  13 +-
 .../service/LoanReadPlatformService.java           |   9 +-
 .../service/LoanReadPlatformServiceImpl.java       |  16 +--
 .../LoanWritePlatformServiceJpaRepositoryImpl.java |  27 ++--
 .../InterestRecalculationCompoundingMethod.java    |   3 +-
 .../domain/InterestRecalculationPeriodMethod.java  |   3 +-
 .../loanproduct/domain/LendingStrategy.java        |  10 +-
 .../portfolio/loanproduct/domain/LoanProduct.java  |   7 +-
 .../domain/LoanProductMinMaxConstraints.java       |   3 +-
 ...oductMinimumRepaymentScheduleRelatedDetail.java |   3 +-
 .../domain/LoanProductRelatedDetail.java           |   4 +-
 .../domain/LoanRescheduleStrategyMethod.java       |   3 +-
 .../exception/InvalidCurrencyException.java        |   3 +-
 .../exception/InvalidLendingStrategy.java          |   3 +-
 .../exception/NotInMinMaxRangeException.java       |   3 +-
 .../exception/ProductMixNotFoundException.java     |   3 +-
 ...ctMixWritePlatformServiceJpaRepositoryImpl.java |   4 +-
 ...oductWritePlatformServiceJpaRepositoryImpl.java |   3 +-
 .../meeting/domain/MeetingRepositoryWrapper.java   |   9 +-
 .../MeetingNotSupportedResourceException.java      |   3 +-
 ...etingWritePlatformServiceJpaRepositoryImpl.java |  17 +--
 .../fineract/portfolio/note/data/NoteData.java     |   3 +-
 .../portfolio/rate/domain/RateRepository.java      |   3 +-
 .../rate/service/RateWriteServiceImpl.java         |   3 +-
 .../savings/DepositAccountOnClosureType.java       |   4 +-
 .../DepositAccountOnHoldTransactionType.java       |   3 +-
 .../portfolio/savings/DepositAccountType.java      |   3 +-
 .../savings/SavingsAccountTransactionType.java     |   3 +-
 .../SavingsCompoundingInterestPeriodType.java      |   3 +-
 .../SavingsInterestCalculationDaysInYearType.java  |   3 +-
 .../savings/SavingsInterestCalculationType.java    |   6 +-
 .../savings/SavingsPostingInterestPeriodType.java  |   4 +-
 ...rringDepositAccountTransactionsApiResource.java |   6 +-
 .../savings/api/SavingsAccountsApiResource.java    |  14 +-
 .../savings/api/SavingsApiSetConstants.java        |  10 +-
 .../portfolio/savings/data/DepositAccountData.java |   3 +-
 .../savings/data/DepositAccountDataValidator.java  |  27 ++--
 .../portfolio/savings/data/DepositProductData.java |   4 +-
 .../savings/data/DepositProductDataValidator.java  |  10 +-
 .../savings/data/FixedDepositProductData.java      |   5 +-
 .../savings/data/RecurringDepositProductData.java  |   5 +-
 .../SavingsAccountApplicationTimelineData.java     |   3 +-
 .../savings/data/SavingsAccountConstant.java       |  10 +-
 .../data/SavingsAccountTransactionEnumData.java    |   3 +-
 .../portfolio/savings/data/SavingsProductData.java |   4 +-
 .../savings/data/SavingsProductDataValidator.java  |  39 ++----
 .../savings/domain/DepositAccountAssembler.java    |   5 +-
 .../domain/DepositAccountDomainServiceJpa.java     |  18 +--
 .../savings/domain/DepositPreClosureDetail.java    |   5 +-
 .../domain/DepositProductAmountDetails.java        |   3 +-
 .../savings/domain/DepositRecurringDetail.java     |   5 +-
 .../savings/domain/DepositTermDetail.java          |   3 +-
 .../savings/domain/FixedDepositAccount.java        |  10 +-
 .../savings/domain/RecurringDepositAccount.java    |  33 ++---
 .../portfolio/savings/domain/SavingsAccount.java   |  51 +++-----
 .../savings/domain/SavingsAccountAssembler.java    |  10 +-
 .../savings/domain/SavingsAccountCharge.java       |  11 +-
 .../SavingsAccountChargeRepositoryWrapper.java     |   3 +-
 .../domain/SavingsAccountRepositoryWrapper.java    |   9 +-
 .../savings/domain/SavingsAccountSummary.java      |   3 +-
 .../savings/domain/SavingsAccountTransaction.java  |   8 +-
 .../SavingsAccountTransactionComparator.java       |   3 +-
 .../SavingsAccountTransactionSummaryWrapper.java   |   4 +-
 .../portfolio/savings/domain/SavingsProduct.java   |  12 +-
 .../domain/interest/CompoundInterestHelper.java    |   7 +-
 .../savings/domain/interest/EndOfDayBalance.java   |  10 +-
 .../savings/domain/interest/PostingPeriod.java     |   7 +-
 ...positAccountTransactionNotAllowedException.java |   3 +-
 .../InsufficientAccountBalanceException.java       |   3 +-
 ...ingsActivityPriorToClientTransferException.java |   4 +-
 ...ransferTransactionsCannotBeUndoneException.java |   4 +-
 ...ntInterestRateChartReadPlatformServiceImpl.java |  17 +--
 ...ocessWritePlatformServiceJpaRepositoryImpl.java |   3 +-
 .../DepositsDropdownReadPlatformServiceImpl.java   |  18 +--
 ...oductWritePlatformServiceJpaRepositoryImpl.java |   3 +-
 ...oductWritePlatformServiceJpaRepositoryImpl.java |   3 +-
 .../SavingsAccountReadPlatformServiceImpl.java     |  73 ++++-------
 ...countWritePlatformServiceJpaRepositoryImpl.java |   3 +-
 ...ocessWritePlatformServiceJpaRepositoryImpl.java |   3 +-
 ...oductWritePlatformServiceJpaRepositoryImpl.java |   3 +-
 .../tax/exception/TaxMappingNotFoundException.java |   3 +-
 .../exception/TransferNotSupportedException.java   |   3 +-
 ...nsferWritePlatformServiceJpaRepositoryImpl.java |  60 ++++-----
 .../fineract/template/service/TrustModifier.java   |   3 +-
 .../useradministration/api/UsersApiResource.java   |   3 +-
 .../useradministration/domain/AppUser.java         |   3 +-
 .../PermissionCantBeMakerCheckerableException.java |   3 +-
 .../exception/UnAuthenticatedUserException.java    |   4 +-
 .../PermissionsCommandFromApiJsonDeserializer.java |   3 +-
 ...pUserWritePlatformServiceJpaRepositoryImpl.java |   7 +-
 .../service/PermissionReadPlatformServiceImpl.java |   5 +-
 .../RoleWritePlatformServiceJpaRepositoryImpl.java |   3 +-
 .../org/apache/fineract/batch/BatchBuilder.java    |   3 +-
 .../apache/fineract/common/RestAssuredFixture.java |   7 +-
 .../java/org/apache/fineract/common/Utils.java     |   8 +-
 .../ClasspathHellDuplicatesCheckExtension.java     |  12 +-
 .../spring/SpringConfigurationTest.java            |  23 ++--
 ...TestsWithoutDatabaseAndNoJobsConfiguration.java |  15 +--
 ...nRepaymentScheduleTransactionProcessorTest.java |   3 +-
 ...nRepaymentScheduleTransactionProcessorTest.java |  10 +-
 .../LoanProductRelatedDetailTestHelper.java        |   5 +-
 .../loanaccount/LoanScheduleTestDataHelper.java    |  16 +--
 .../loanaccount/LoanTransactionBuilder.java        |   3 +-
 541 files changed, 1995 insertions(+), 3177 deletions(-)

diff --git a/config/fineractdev-formatter.xml b/config/fineractdev-formatter.xml
index 0a412cb..05b6ad3 100644
--- a/config/fineractdev-formatter.xml
+++ b/config/fineractdev-formatter.xml
@@ -79,7 +79,7 @@
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
         <setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line" value="one_line_if_empty"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
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 3fa7566..8c1ca0a 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
@@ -112,8 +112,7 @@ public class AccountNumberPreferencesTest {
         this.deleteAllAccountNumberPreferences();
 
         /*
-         * Validate the default account number generation rules for clients,
-         * loans and savings accounts.
+         * Validate the default account number generation rules for clients, loans and savings accounts.
          */
         this.validateDefaultAccountNumberGeneration();
 
@@ -121,8 +120,7 @@ public class AccountNumberPreferencesTest {
         this.createAccountNumberPreference();
 
         /*
-         * Validate account number preference rules apply to Clients,Loans and
-         * Saving Accounts
+         * Validate account number preference rules apply to Clients,Loans and Saving Accounts
          */
         this.validateAccountNumberGenerationWithPreferences();
 
@@ -130,8 +128,7 @@ public class AccountNumberPreferencesTest {
         this.updateAccountNumberPreference();
 
         /*
-         * Validate account number preference rules apply to Clients,Loans and
-         * Saving Accounts after Updation
+         * Validate account number preference rules apply to Clients,Loans and Saving Accounts after Updation
          */
         this.validateAccountNumberGenerationWithPreferences();
 
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 fbbeca9..e0f45b8 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
@@ -41,10 +41,8 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 /**
- * Test class for
- * {@link org.apache.fineract.batch.command.CommandStrategyProvider}. This tests
- * the response provided by commandStrategy by injecting it with a
- * {@code BatchRequest}.
+ * Test class for {@link org.apache.fineract.batch.command.CommandStrategyProvider}. This tests the response provided by
+ * commandStrategy by injecting it with a {@code BatchRequest}.
  *
  * @author RishabhShukla
  *
@@ -57,9 +55,8 @@ public class BatchApiTest {
     private RequestSpecification requestSpec;
 
     /**
-     * Sets up the essential settings for the TEST like contentType,
-     * expectedStatusCode. It uses the '@BeforeEach' annotation provided by
-     * jUnit.
+     * Sets up the essential settings for the TEST like contentType, expectedStatusCode. It uses the '@BeforeEach'
+     * annotation provided by jUnit.
      */
     @BeforeEach
     public void setup() {
@@ -70,9 +67,8 @@ public class BatchApiTest {
     }
 
     /**
-     * Tests for the unimplemented command Strategies by returning 501 status
-     * code. For a unknownRequest a statusCode 501 is returned back with
-     * response.
+     * Tests for the unimplemented command Strategies by returning 501 status code. For a unknownRequest a statusCode
+     * 501 is returned back with response.
      *
      * @see org.apache.fineract.batch.command.internal.UnknownCommandStrategy
      */
@@ -93,9 +89,8 @@ public class BatchApiTest {
     }
 
     /**
-     * Tests for the successful response for a createClient request from
-     * createClientCommand. A successful response with statusCode '200' is
-     * returned back.
+     * Tests for the successful response for a createClient request from createClientCommand. A successful response with
+     * statusCode '200' is returned back.
      *
      * @see org.apache.fineract.batch.command.internal.CreateClientCommandStrategy
      */
@@ -113,10 +108,9 @@ public class BatchApiTest {
     }
 
     /**
-     * Tests for an erroneous response with statusCode '501' if transaction
-     * fails. If Query Parameter 'enclosingTransaction' is set to 'true' and if
-     * one of the request in BatchRequest fails then all transactions are rolled
-     * back.
+     * Tests for an erroneous response with statusCode '501' if transaction fails. If Query Parameter
+     * 'enclosingTransaction' is set to 'true' and if one of the request in BatchRequest fails then all transactions are
+     * rolled back.
      *
      * @see org.apache.fineract.batch.command.internal.CreateClientCommandStrategy
      * @see org.apache.fineract.batch.api.BatchApiResource
@@ -156,9 +150,8 @@ public class BatchApiTest {
     }
 
     /**
-     * Tests that a client information was successfully updated through
-     * updateClientCommand. A 'changes' parameter is returned in the response
-     * after successful update of client information.
+     * Tests that a client information was successfully updated through updateClientCommand. A 'changes' parameter is
+     * returned in the response after successful update of client information.
      *
      * @see org.apache.fineract.batch.command.internal.UpdateClientCommandStrategy
      */
@@ -190,10 +183,8 @@ public class BatchApiTest {
     }
 
     /**
-     * Tests that a ApplyLoanCommand was successfully executed and returned a
-     * 200(OK) status. It creates a new client and apply a loan to that client.
-     * This also verifies the successful resolution of dependencies among two
-     * requests.
+     * Tests that a ApplyLoanCommand was successfully executed and returned a 200(OK) status. It creates a new client
+     * and apply a loan to that client. This also verifies the successful resolution of dependencies among two requests.
      *
      * @see org.apache.fineract.batch.command.internal.ApplyLoanCommandStrategy
      */
@@ -240,9 +231,8 @@ public class BatchApiTest {
     }
 
     /**
-     * Tests that a new savings accounts was applied to an existing client and a
-     * 200(OK) status was returned. It first creates a new client and a savings
-     * product, then uses the cliendId and ProductId to apply a savings account.
+     * Tests that a new savings accounts was applied to an existing client and a 200(OK) status was returned. It first
+     * creates a new client and a savings product, then uses the cliendId and ProductId to apply a savings account.
      *
      * @see org.apache.fineract.batch.command.internal.ApplySavingsCommandStrategy
      */
@@ -282,10 +272,9 @@ public class BatchApiTest {
     }
 
     /**
-     * Tests that a new charge was added to a newly created loan and charges are
-     * Collected properly 200(OK) status was returned for successful responses.
-     * It first creates a new client and apply a loan, then creates a new charge
-     * for the create loan and then fetches all the applied charges
+     * Tests that a new charge was added to a newly created loan and charges are Collected properly 200(OK) status was
+     * returned for successful responses. It first creates a new client and apply a loan, then creates a new charge for
+     * the create loan and then fetches all the applied charges
      *
      * @see org.apache.fineract.batch.command.internal.CollectChargesCommandStrategy
      * @see org.apache.fineract.batch.command.internal.CreateChargeCommandStrategy
@@ -334,10 +323,9 @@ public class BatchApiTest {
     }
 
     /**
-     * Tests that batch repayment for loans is happening properly. Collected
-     * properly 200(OK) status was returned for successful responses. It first
-     * creates a new loan and then makes two repayments for it and then verifies
-     * that 200(OK) is returned for the repayment requests.
+     * Tests that batch repayment for loans is happening properly. Collected properly 200(OK) status was returned for
+     * successful responses. It first creates a new loan and then makes two repayments for it and then verifies that
+     * 200(OK) is returned for the repayment requests.
      *
      * @see org.apache.fineract.batch.command.internal.RepayLoanCommandStrategy
      */
@@ -398,9 +386,8 @@ public class BatchApiTest {
     }
 
     /**
-     * Test for the successful activation of a pending client using
-     * 'ActivateClientCommandStrategy'. A '200' status code is expected on
-     * successful activation.
+     * Test for the successful activation of a pending client using 'ActivateClientCommandStrategy'. A '200' status code
+     * is expected on successful activation.
      *
      * @see org.apache.fineract.batch.command.internal.ActivateClientCommandStrategy
      */
@@ -428,9 +415,8 @@ public class BatchApiTest {
     }
 
     /**
-     * Test for the successful approval and disbursal of a loan using
-     * 'ApproveLoanCommandStrategy' and 'DisburseLoanCommandStrategy'. A '200'
-     * status code is expected on successful activation.
+     * Test for the successful approval and disbursal of a loan using 'ApproveLoanCommandStrategy' and
+     * 'DisburseLoanCommandStrategy'. A '200' status code is expected on successful activation.
      *
      * @see org.apache.fineract.batch.command.internal.ApproveLoanCommandStrategy
      * @see org.apache.fineract.batch.command.internal.DisburseLoanCommandStrategy
@@ -483,9 +469,8 @@ public class BatchApiTest {
     }
 
     /**
-     * Test for the successful create client, apply loan,approval and disbursal
-     * of a loan using Batch API with enclosingTransaction. A '200' status code
-     * is expected on successful activation.
+     * Test for the successful create client, apply loan,approval and disbursal of a loan using Batch API with
+     * enclosingTransaction. A '200' status code is expected on successful activation.
      *
      * @see org.apache.fineract.batch.command.internal.ApproveLoanCommandStrategy
      * @see org.apache.fineract.batch.command.internal.DisburseLoanCommandStrategy
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 9a9b137..6891640 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
@@ -40,9 +40,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Test class for testing the integration of Batch API with custom batch
- * requests and various user defined workflow. Like in the case of mifos
- * community-app
+ * Test class for testing the integration of Batch API with custom batch requests and various user defined workflow.
+ * Like in the case of mifos community-app
  *
  * @author Rishabh Shukla
  */
@@ -57,9 +56,8 @@ public class BatchRequestsIntegrationTest {
     }
 
     /**
-     * Sets up the essential settings for the TEST like contentType,
-     * expectedStatusCode. It uses the '@BeforeEach' annotation provided by
-     * jUnit.
+     * Sets up the essential settings for the TEST like contentType, expectedStatusCode. It uses the '@BeforeEach'
+     * annotation provided by jUnit.
      */
     @BeforeEach
     public void setup() {
@@ -72,12 +70,10 @@ public class BatchRequestsIntegrationTest {
 
     @Test
     /**
-     * Tests that a loan is successfully applied to client members of a group.
-     * Firstly, it'll create a few new clients and then will add those clients
-     * to the group. Then a few loans will be created and one of those loans
-     * will be chosen at random and similarily a few of the created clients will
-     * be chosen on random. Now, the selected loan will be applied to these
-     * clients through Batch - API ApplyLoanCommandStrategy.
+     * Tests that a loan is successfully applied to client members of a group. Firstly, it'll create a few new clients
+     * and then will add those clients to the group. Then a few loans will be created and one of those loans will be
+     * chosen at random and similarily a few of the created clients will be chosen on random. Now, the selected loan
+     * will be applied to these clients through Batch - API ApplyLoanCommandStrategy.
      */
     public void shouldReturnOkStatusForLoansAppliedToSelectedClients() {
 
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 aa8c7ed..aeb5280 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
@@ -62,9 +62,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Client Loan Integration Test for checking Loan Application Repayments
- * Schedule, loan charges, penalties, loan repayments and verifying accounting
- * transactions
+ * Client Loan Integration Test for checking Loan Application Repayments Schedule, loan charges, penalties, loan
+ * repayments and verifying accounting transactions
  */
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class ClientLoanIntegrationTest {
@@ -1249,8 +1248,7 @@ public class ClientLoanIntegrationTest {
     }
 
     /***
-     * Test case for checking CashBasedAccounting functionality adding charges
-     * with calculation type flat
+     * Test case for checking CashBasedAccounting functionality adding charges with calculation type flat
      */
     @Test
     public void loanWithFlatCahargesAndCashBasedAccountingEnabled() {
@@ -1426,8 +1424,8 @@ public class ClientLoanIntegrationTest {
     }
 
     /***
-     * Test case for checking CashBasedAccounting functionality adding charges
-     * with calculation type percentage of amount
+     * Test case for checking CashBasedAccounting functionality adding charges with calculation type percentage of
+     * amount
      */
     @Test
     public void loanWithCahargesOfTypeAmountPercentageAndCashBasedAccountingEnabled() {
@@ -1606,8 +1604,8 @@ public class ClientLoanIntegrationTest {
     }
 
     /***
-     * Test case for checking CashBasedAccounting functionality adding charges
-     * with calculation type percentage of amount plus interest
+     * Test case for checking CashBasedAccounting functionality adding charges with calculation type percentage of
+     * amount plus interest
      */
     @Test
     public void loanWithCahargesOfTypeAmountPlusInterestPercentageAndCashBasedAccountingEnabled() {
@@ -1787,8 +1785,7 @@ public class ClientLoanIntegrationTest {
     }
 
     /***
-     * Test case for checking AccuralUpfrontAccounting functionality adding
-     * charges with calculation type flat
+     * Test case for checking AccuralUpfrontAccounting functionality adding charges with calculation type flat
      */
     @Test
     public void loanWithFlatCahargesAndUpfrontAccrualAccountingEnabled() {
@@ -1981,8 +1978,8 @@ public class ClientLoanIntegrationTest {
     }
 
     /***
-     * Test case for checking AccuralUpfrontAccounting functionality adding
-     * charges with calculation type percentage of amount
+     * Test case for checking AccuralUpfrontAccounting functionality adding charges with calculation type percentage of
+     * amount
      */
     @Test
     public void loanWithCahargesAndUpfrontAccrualAccountingEnabled() {
@@ -2171,8 +2168,8 @@ public class ClientLoanIntegrationTest {
     }
 
     /***
-     * Test case for checking AccuralUpfrontAccounting functionality adding
-     * charges with calculation type percentage of amount plus interest
+     * Test case for checking AccuralUpfrontAccounting functionality adding charges with calculation type percentage of
+     * amount plus interest
      */
     @Test
     public void loanWithCahargesOfTypeAmountPlusInterestPercentageAndUpfrontAccrualAccountingEnabled() {
@@ -2368,8 +2365,7 @@ public class ClientLoanIntegrationTest {
     }
 
     /***
-     * Test case for checking AccuralPeriodicAccounting functionality adding
-     * charges with calculation type flat
+     * Test case for checking AccuralPeriodicAccounting functionality adding charges with calculation type flat
      */
     @Test
     public void loanWithFlatChargesAndPeriodicAccrualAccountingEnabled() throws InterruptedException {
@@ -2467,14 +2463,10 @@ public class ClientLoanIntegrationTest {
         validateCharge(flatInstallmentFee, loanCharges, "50", "100.00", "50.0", "50.0");
 
         /*
-         * this.journalEntryHelper.checkJournalEntryForAssetAccount(
-         * assetAccount, "20 September 2011", new
-         * JournalEntry(Float.valueOf("50.0"),
-         * JournalEntry.TransactionType.CREDIT));
-         * this.journalEntryHelper.checkJournalEntryForExpenseAccount
-         * (expenseAccount, "20 September 2011", new
-         * JournalEntry(Float.valueOf("50.0"),
-         * JournalEntry.TransactionType.DEBIT));
+         * this.journalEntryHelper.checkJournalEntryForAssetAccount( assetAccount, "20 September 2011", new
+         * JournalEntry(Float.valueOf("50.0"), JournalEntry.TransactionType.CREDIT));
+         * this.journalEntryHelper.checkJournalEntryForExpenseAccount (expenseAccount, "20 September 2011", new
+         * JournalEntry(Float.valueOf("50.0"), JournalEntry.TransactionType.DEBIT));
          */
         final String jobName = "Add Accrual Transactions";
 
@@ -2561,8 +2553,8 @@ public class ClientLoanIntegrationTest {
     }
 
     /**
-     * Test case for checking AccuralPeriodicAccounting functionality adding
-     * charges with calculation type percentage of amount
+     * Test case for checking AccuralPeriodicAccounting functionality adding charges with calculation type percentage of
+     * amount
      */
     @Test
     public void loanWithChargesOfTypeAmountPercentageAndPeriodicAccrualAccountingEnabled() throws InterruptedException {
@@ -2663,14 +2655,10 @@ public class ClientLoanIntegrationTest {
         validateCharge(percentageInstallmentFee, loanCharges, "1", "61.19", "29.11", "29.70");
 
         /*
-         * this.journalEntryHelper.checkJournalEntryForAssetAccount(
-         * assetAccount, "20 September 2011", new
-         * JournalEntry(Float.valueOf("29.7"),
-         * JournalEntry.TransactionType.CREDIT));
-         * this.journalEntryHelper.checkJournalEntryForExpenseAccount
-         * (expenseAccount, "20 September 2011", new
-         * JournalEntry(Float.valueOf("29.7"),
-         * JournalEntry.TransactionType.DEBIT));
+         * this.journalEntryHelper.checkJournalEntryForAssetAccount( assetAccount, "20 September 2011", new
+         * JournalEntry(Float.valueOf("29.7"), JournalEntry.TransactionType.CREDIT));
+         * this.journalEntryHelper.checkJournalEntryForExpenseAccount (expenseAccount, "20 September 2011", new
+         * JournalEntry(Float.valueOf("29.7"), JournalEntry.TransactionType.DEBIT));
          */
 
         final String jobName = "Add Accrual Transactions";
@@ -2758,8 +2746,8 @@ public class ClientLoanIntegrationTest {
     }
 
     /***
-     * Test case for checking AccuralPeriodicAccounting functionality adding
-     * charges with calculation type percentage of amount and interest
+     * Test case for checking AccuralPeriodicAccounting functionality adding charges with calculation type percentage of
+     * amount and interest
      */
     @Test
     public void loanWithChargesOfTypeAmountPlusInterestPercentageAndPeriodicAccrualAccountingEnabled() throws InterruptedException {
@@ -2861,13 +2849,10 @@ public class ClientLoanIntegrationTest {
         validateCharge(amountPlusInterestPercentageInstallmentFee, loanCharges, "1", "63.02", "31.51", "31.51");
 
         /*
-         * this.journalEntryHelper.checkJournalEntryForAssetAccount(
-         * assetAccount, "20 September 2011", new JournalEntry(
-         * Float.valueOf("31.51"), JournalEntry.TransactionType.CREDIT));
-         * this.journalEntryHelper.checkJournalEntryForExpenseAccount
-         * (expenseAccount, "20 September 2011", new
-         * JournalEntry(Float.valueOf("31.51"),
-         * JournalEntry.TransactionType.DEBIT));
+         * this.journalEntryHelper.checkJournalEntryForAssetAccount( assetAccount, "20 September 2011", new
+         * JournalEntry( Float.valueOf("31.51"), JournalEntry.TransactionType.CREDIT));
+         * this.journalEntryHelper.checkJournalEntryForExpenseAccount (expenseAccount, "20 September 2011", new
+         * JournalEntry(Float.valueOf("31.51"), JournalEntry.TransactionType.DEBIT));
          */
 
         final String jobName = "Add Accrual Transactions";
@@ -3032,8 +3017,7 @@ public class ClientLoanIntegrationTest {
         validateNumberForEqual("0.00", String.valueOf(firstInstallment.get("totalOutstandingForPeriod")));
 
         /***
-         * Verify 2nd and 3rd repayments dues before making excess payment for
-         * installment no 2
+         * Verify 2nd and 3rd repayments dues before making excess payment for installment no 2
          */
         HashMap secondInstallment = loanSchedule.get(2);
         HashMap thirdInstallment = loanSchedule.get(3);
@@ -3051,18 +3035,15 @@ public class ClientLoanIntegrationTest {
         loanSchedule.clear();
         loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
         /***
-         * Verify 2nd and 3rd repayments after making excess payment for
-         * installment no 2
+         * Verify 2nd and 3rd repayments after making excess payment for installment no 2
          */
         secondInstallment = loanSchedule.get(2);
         validateNumberForEqual("0.00", String.valueOf(secondInstallment.get("totalOutstandingForPeriod")));
 
         /***
-         * According to RBI Excess payment should go to principal portion of
-         * next installment, but as interest recalculation is not implemented,
-         * it wont make any difference to schedule even though if we made excess
-         * payment, so excess payments will behave the same as regular payment
-         * with the excess amount
+         * According to RBI Excess payment should go to principal portion of next installment, but as interest
+         * recalculation is not implemented, it wont make any difference to schedule even though if we made excess
+         * payment, so excess payments will behave the same as regular payment with the excess amount
          */
         thirdInstallment = loanSchedule.get(3);
         validateNumberForEqual("3200", String.valueOf(thirdInstallment.get("totalOutstandingForPeriod")));
@@ -3072,16 +3053,14 @@ public class ClientLoanIntegrationTest {
         validateNumberForEqual("100.00", String.valueOf(thirdInstallment.get("interestOutstanding")));
 
         /***
-         * Make payment with due amount of 3rd installment on 4th installment
-         * date
+         * Make payment with due amount of 3rd installment on 4th installment date
          */
         this.loanTransactionHelper.makeRepayment("20 January 2012", Float.valueOf("3200"), loanID);
         loanSchedule.clear();
         loanSchedule = this.loanTransactionHelper.getLoanRepaymentSchedule(this.requestSpec, this.responseSpec, loanID);
 
         /***
-         * Verify overdue interests are deducted first and then remaining amount
-         * for interest portion of due installment
+         * Verify overdue interests are deducted first and then remaining amount for interest portion of due installment
          */
         thirdInstallment = loanSchedule.get(3);
         HashMap fourthInstallment = loanSchedule.get(4);
@@ -4948,8 +4927,8 @@ public class ClientLoanIntegrationTest {
                 .withMoratorium("2", "3").withLoanProductConfiguration(loanProductConfigurationAsFalse).build(null));
         LOG.info("-------------------LOAN PRODUCT CREATED WITH ATTRIBUTE CONFIGURATION AS FALSE---------------------- {}", loanProductID);
         /*
-         * Try to override attribute values in loan account when attribute
-         * configurations are set to false at product level
+         * Try to override attribute values in loan account when attribute configurations are set to false at product
+         * level
          */
         loanID = applyForLoanApplicationWithProductConfigurationAsFalse(clientID, loanProductID, proposedAmount);
         LOG.info("--------------------------LOAN CREATED WITH ID------------------------- {}", loanID);
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 db31fdf..93d074e 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java
@@ -656,9 +656,8 @@ public class ClientSavingsIntegrationTest {
     }
 
     /***
-     * Test case for overdraft account functionality. Open account with zero
-     * balance, perform transactions then post interest and verify posted
-     * interest
+     * Test case for overdraft account functionality. Open account with zero balance, perform transactions then post
+     * interest and verify posted interest
      */
     @SuppressWarnings("unchecked")
     @Test
@@ -675,8 +674,7 @@ public class ClientSavingsIntegrationTest {
         final String minBalanceForInterestCalculation = null;
 
         /***
-         * Create savings product with zero opening balance and overdraft
-         * enabled
+         * Create savings product with zero opening balance and overdraft enabled
          */
         final String zeroOpeningBalance = "0.0";
         final String minRequiredBalance = null;
@@ -734,9 +732,8 @@ public class ClientSavingsIntegrationTest {
         Float balance = Float.valueOf(zeroOpeningBalance);
 
         /***
-         * Perform withdraw transaction, verify account balance(account balance
-         * will go to negative as no deposits are there prior to this
-         * transaction)
+         * Perform withdraw transaction, verify account balance(account balance will go to negative as no deposits are
+         * there prior to this transaction)
          */
         Integer withdrawTransactionId = (Integer) this.savingsAccountHelper.withdrawalFromSavingsAccount(savingsId, WITHDRAW_AMOUNT,
                 ACTIVATION_DATE, CommonConstants.RESPONSE_RESOURCE_ID);
@@ -746,8 +743,7 @@ public class ClientSavingsIntegrationTest {
         assertEquals(balance, withdrawTransaction.get("runningBalance"), "Verifying Balance after Withdrawal");
 
         /***
-         * Perform Deposit transaction on last day of month and verify account
-         * balance.
+         * Perform Deposit transaction on last day of month and verify account balance.
          *
          * @param transactionDate
          *            this value is every time last day of previous month
@@ -768,9 +764,8 @@ public class ClientSavingsIntegrationTest {
         Float actualInterestPosted = Float.valueOf(summary.get("totalInterestPosted").toString());
 
         /***
-         * Calculate expected interest to be posted, interest should be posted
-         * for one day only because deposit transaction happened on last day of
-         * month before this account balance is negative.
+         * Calculate expected interest to be posted, interest should be posted for one day only because deposit
+         * transaction happened on last day of month before this account balance is negative.
          */
         final Float nominalAnnualInterest = Float.valueOf(accountDetails.get("nominalAnnualInterestRate").toString());
         final HashMap interestCalculationDaysInYearType = (HashMap) accountDetails.get("interestCalculationDaysInYearType");
@@ -781,8 +776,7 @@ public class ClientSavingsIntegrationTest {
         Float interestPosted = (float) (interestPerDay * balance * 1);
 
         /***
-         * Apply rounding on interestPosted, actualInterestPosted and verify
-         * both are same
+         * Apply rounding on interestPosted, actualInterestPosted and verify both are same
          */
         DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US));
         decimalFormat.applyPattern("#.###");
@@ -812,8 +806,7 @@ public class ClientSavingsIntegrationTest {
         final String minBalanceForInterestCalculation = null;
 
         /***
-         * Create savings product with zero opening balance and overdraft
-         * enabled
+         * Create savings product with zero opening balance and overdraft enabled
          */
         final String zeroOpeningBalance = "0.0";
         final String minRequiredBalance = null;
@@ -876,8 +869,7 @@ public class ClientSavingsIntegrationTest {
         String TRANSACTION_DATE = dateFormat.format(transactionDate.getTime());
 
         /***
-         * Perform Deposit transaction on last day of month and verify account
-         * balance.
+         * Perform Deposit transaction on last day of month and verify account balance.
          *
          * @param transactionDate
          *            this value is every time last day of previous month
@@ -890,9 +882,8 @@ public class ClientSavingsIntegrationTest {
         assertEquals(balance, depositTransaction.get("runningBalance"), "Verifying Balance after Deposit");
 
         /***
-         * Calculate expected interest to be posted, interest should be posted
-         * for one day only because deposit transaction happened on last day of
-         * month before this account balance is negative.
+         * Calculate expected interest to be posted, interest should be posted for one day only because deposit
+         * transaction happened on last day of month before this account balance is negative.
          */
         this.savingsAccountHelper.postInterestForSavings(savingsId);
         HashMap accountDetails = this.savingsAccountHelper.getSavingsDetails(savingsId);
@@ -908,8 +899,7 @@ public class ClientSavingsIntegrationTest {
         Float interestPosted = (float) (interestPerDay * balance * 1);
 
         /***
-         * Apply rounding on interestPosted, actualInterestPosted and verify
-         * both are same
+         * Apply rounding on interestPosted, actualInterestPosted and verify both are same
          */
         DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US));
         decimalFormat.applyPattern("#.###");
@@ -931,8 +921,7 @@ public class ClientSavingsIntegrationTest {
         interestPosted = (float) (interestPerDay * balance * 1);
 
         /***
-         * Apply rounding on interestPosted, actualInterestPosted and verify
-         * both are same
+         * Apply rounding on interestPosted, actualInterestPosted and verify both are same
          */
         decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US));
         decimalFormat.applyPattern("#.###");
@@ -958,8 +947,7 @@ public class ClientSavingsIntegrationTest {
         interestPosted = (float) (interestPerDay * balance * 1);
 
         /***
-         * Apply rounding on interestPosted, actualInterestPosted and verify
-         * both are same
+         * Apply rounding on interestPosted, actualInterestPosted and verify both are same
          */
         decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US));
         decimalFormat.applyPattern("#.###");
@@ -989,8 +977,7 @@ public class ClientSavingsIntegrationTest {
             interestPosted = (float) (interestPerDay * balance * 19);
 
             /***
-             * Apply rounding on interestPosted, actualInterestPosted and verify
-             * both are same
+             * Apply rounding on interestPosted, actualInterestPosted and verify both are same
              */
             decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US));
             decimalFormat.applyPattern("#.###");
@@ -1020,8 +1007,7 @@ public class ClientSavingsIntegrationTest {
             interestPosted = (float) (interestPerDay * balance * 8);
 
             /***
-             * Apply rounding on interestPosted, actualInterestPosted and verify
-             * both are same
+             * Apply rounding on interestPosted, actualInterestPosted and verify both are same
              */
             decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US));
             decimalFormat.applyPattern("#.###");
@@ -1047,8 +1033,7 @@ public class ClientSavingsIntegrationTest {
         interestPosted = (float) (interestPerDay * balance * 1);
 
         /***
-         * Apply rounding on interestPosted, actualInterestPosted and verify
-         * both are same
+         * Apply rounding on interestPosted, actualInterestPosted and verify both are same
          */
         decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US));
         decimalFormat.applyPattern("#.###");
@@ -1072,8 +1057,7 @@ public class ClientSavingsIntegrationTest {
         final String minBalanceForInterestCalculation = null;
 
         /***
-         * Create savings product with zero opening balance and overdraft
-         * enabled
+         * Create savings product with zero opening balance and overdraft enabled
          */
         final String zeroOpeningBalance = "0.0";
         final String minRequiredBalance = null;
@@ -1136,9 +1120,8 @@ public class ClientSavingsIntegrationTest {
         String TRANSACTION_DATE = dateFormat.format(transactionDate.getTime());
 
         /***
-         * Perform withdraw transaction, verify account balance(account balance
-         * will go to negative as no deposits are there prior to this
-         * transaction)
+         * Perform withdraw transaction, verify account balance(account balance will go to negative as no deposits are
+         * there prior to this transaction)
          */
         Integer withdrawTransactionId = (Integer) this.savingsAccountHelper.withdrawalFromSavingsAccount(savingsId, WITHDRAW_AMOUNT,
                 ACTIVATION_DATE, CommonConstants.RESPONSE_RESOURCE_ID);
@@ -1148,8 +1131,7 @@ public class ClientSavingsIntegrationTest {
         assertEquals(balance, withdrawTransaction.get("runningBalance"), "Verifying Balance after Withdrawal");
 
         /***
-         * Perform Deposit transaction on last day of month and verify account
-         * balance.
+         * Perform Deposit transaction on last day of month and verify account balance.
          *
          * @param transactionDate
          *            this value is every time last day of previous month
@@ -1162,9 +1144,8 @@ public class ClientSavingsIntegrationTest {
         assertEquals(balance, depositTransaction.get("runningBalance"), "Verifying Balance after Deposit");
 
         /***
-         * Calculate expected interest to be posted, interest should be posted
-         * for one day only because deposit transaction happened on last day of
-         * month before this account balance is negative.
+         * Calculate expected interest to be posted, interest should be posted for one day only because deposit
+         * transaction happened on last day of month before this account balance is negative.
          */
         this.savingsAccountHelper.postInterestForSavings(savingsId);
         HashMap accountDetails = this.savingsAccountHelper.getSavingsDetails(savingsId);
@@ -1180,8 +1161,7 @@ public class ClientSavingsIntegrationTest {
         Float interestPosted = (float) (interestPerDay * balance * 1);
 
         /***
-         * Apply rounding on interestPosted, actualInterestPosted and verify
-         * both are same
+         * Apply rounding on interestPosted, actualInterestPosted and verify both are same
          */
         DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US));
         decimalFormat.applyPattern("#.###");
@@ -1203,8 +1183,7 @@ public class ClientSavingsIntegrationTest {
         interestPosted = (float) (interestPerDay * balance * 1);
 
         /***
-         * Apply rounding on interestPosted, actualInterestPosted and verify
-         * both are same
+         * Apply rounding on interestPosted, actualInterestPosted and verify both are same
          */
         decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US));
         decimalFormat.applyPattern("#.###");
@@ -1230,8 +1209,7 @@ public class ClientSavingsIntegrationTest {
         interestPosted = (float) (interestPerDay * balance * 1);
 
         /***
-         * Apply rounding on interestPosted, actualInterestPosted and verify
-         * both are same
+         * Apply rounding on interestPosted, actualInterestPosted and verify both are same
          */
         decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US));
         decimalFormat.applyPattern("#.###");
@@ -1261,8 +1239,7 @@ public class ClientSavingsIntegrationTest {
             interestPosted = (float) (interestPerDay * balance * 19);
 
             /***
-             * Apply rounding on interestPosted, actualInterestPosted and verify
-             * both are same
+             * Apply rounding on interestPosted, actualInterestPosted and verify both are same
              */
             decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US));
             decimalFormat.applyPattern("#.###");
@@ -1292,8 +1269,7 @@ public class ClientSavingsIntegrationTest {
             interestPosted = (float) (interestPerDay * balance * 8);
 
             /***
-             * Apply rounding on interestPosted, actualInterestPosted and verify
-             * both are same
+             * Apply rounding on interestPosted, actualInterestPosted and verify both are same
              */
             decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US));
             decimalFormat.applyPattern("#.###");
@@ -1319,8 +1295,7 @@ public class ClientSavingsIntegrationTest {
         interestPosted = (float) (interestPerDay * balance * 1);
 
         /***
-         * Apply rounding on interestPosted, actualInterestPosted and verify
-         * both are same
+         * Apply rounding on interestPosted, actualInterestPosted and verify both are same
          */
         decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US));
         decimalFormat.applyPattern("#.###");
@@ -1344,8 +1319,7 @@ public class ClientSavingsIntegrationTest {
         final String minBalanceForInterestCalculation = null;
 
         /***
-         * Create savings product with zero opening balance and overdraft
-         * enabled
+         * Create savings product with zero opening balance and overdraft enabled
          */
         final String zeroOpeningBalance = "0.0";
         final String minRequiredBalance = null;
@@ -1408,9 +1382,8 @@ public class ClientSavingsIntegrationTest {
         Float balance = Float.valueOf(zeroOpeningBalance);
 
         /***
-         * Perform withdraw transaction, verify account balance(account balance
-         * will go to negative as no deposits are there prior to this
-         * transaction)
+         * Perform withdraw transaction, verify account balance(account balance will go to negative as no deposits are
+         * there prior to this transaction)
          */
         Integer withdrawTransactionId = (Integer) this.savingsAccountHelper.withdrawalFromSavingsAccount(savingsId, WITHDRAW_AMOUNT,
                 ACTIVATION_DATE, CommonConstants.RESPONSE_RESOURCE_ID);
@@ -1420,8 +1393,7 @@ public class ClientSavingsIntegrationTest {
         assertEquals(balance, withdrawTransaction.get("runningBalance"), "Verifying Balance after Withdrawal");
 
         /***
-         * Perform Deposit transaction on last day of month and verify account
-         * balance.
+         * Perform Deposit transaction on last day of month and verify account balance.
          *
          * @param transactionDate
          *            this value is every time last day of previous month
@@ -1442,9 +1414,8 @@ public class ClientSavingsIntegrationTest {
         Float actualInterestPosted = Float.valueOf(summary.get("totalInterestPosted").toString());
 
         /***
-         * Calculate expected interest to be posted, interest should be posted
-         * for one day only because deposit transaction happened on last day of
-         * month before this account balance is negative.
+         * Calculate expected interest to be posted, interest should be posted for one day only because deposit
+         * transaction happened on last day of month before this account balance is negative.
          */
         this.savingsAccountHelper.postInterestAsOnSavings(savingsId, POSTED_TRANSACTION_DATE);
         HashMap accountDetailsPostInterest = this.savingsAccountHelper.getSavingsDetails(savingsId);
@@ -1453,9 +1424,8 @@ public class ClientSavingsIntegrationTest {
         Float accountDetailsPostInterestPosted = Float.valueOf(summary.get("totalInterestPosted").toString());
 
         /***
-         * Calculate expected interest to be posted, interest should be posted
-         * for one day only because deposit transaction happened on last day of
-         * month before this account balance is negative.
+         * Calculate expected interest to be posted, interest should be posted for one day only because deposit
+         * transaction happened on last day of month before this account balance is negative.
          */
         final Float nominalAnnualInterest = Float.valueOf(accountDetails.get("nominalAnnualInterestRate").toString());
         final HashMap interestCalculationDaysInYearType = (HashMap) accountDetails.get("interestCalculationDaysInYearType");
@@ -1466,8 +1436,7 @@ public class ClientSavingsIntegrationTest {
         Float interestPosted = (float) (interestPerDay * balance * 1);
 
         /***
-         * Apply rounding on interestPosted, actualInterestPosted and verify
-         * both are same
+         * Apply rounding on interestPosted, actualInterestPosted and verify both are same
          */
         DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US));
         decimalFormat.applyPattern("#.###");
@@ -1518,8 +1487,7 @@ public class ClientSavingsIntegrationTest {
         final String minBalanceForInterestCalculation = null;
 
         /***
-         * Create savings product with zero opening balance and overdraft
-         * enabled
+         * Create savings product with zero opening balance and overdraft enabled
          */
         final String zeroOpeningBalance = "0.0";
         final String minRequiredBalance = null;
@@ -1587,9 +1555,8 @@ public class ClientSavingsIntegrationTest {
         Float balance = Float.valueOf(zeroOpeningBalance);
 
         /***
-         * Perform withdraw transaction, verify account balance(account balance
-         * will go to negative as no deposits are there prior to this
-         * transaction)
+         * Perform withdraw transaction, verify account balance(account balance will go to negative as no deposits are
+         * there prior to this transaction)
          */
         Integer withdrawTransactionId = (Integer) this.savingsAccountHelper.withdrawalFromSavingsAccount(savingsId, WITHDRAW_AMOUNT,
                 ACTIVATION_DATE, CommonConstants.RESPONSE_RESOURCE_ID);
@@ -1599,8 +1566,7 @@ public class ClientSavingsIntegrationTest {
         assertEquals(balance, withdrawTransaction.get("runningBalance"), "Verifying Balance after Withdrawal");
 
         /***
-         * Perform Deposit transaction on last day of month and verify account
-         * balance.
+         * Perform Deposit transaction on last day of month and verify account balance.
          *
          * @param transactionDate
          *            this value is every time last day of previous month
@@ -1621,9 +1587,8 @@ public class ClientSavingsIntegrationTest {
         Float actualInterestPosted = Float.valueOf(summary.get("totalInterestPosted").toString());
 
         /***
-         * Calculate expected interest to be posted, interest should be posted
-         * for one day only because deposit transaction happened on last day of
-         * month before this account balance is negative.
+         * Calculate expected interest to be posted, interest should be posted for one day only because deposit
+         * transaction happened on last day of month before this account balance is negative.
          */
         final Float nominalAnnualInterest = Float.valueOf(accountDetails.get("nominalAnnualInterestRate").toString());
         final HashMap interestCalculationDaysInYearType = (HashMap) accountDetails.get("interestCalculationDaysInYearType");
@@ -1634,8 +1599,7 @@ public class ClientSavingsIntegrationTest {
         Float interestPosted = (float) (interestPerDay * balance * 1);
 
         /***
-         * Apply rounding on interestPosted, actualInterestPosted and verify
-         * both are same
+         * Apply rounding on interestPosted, actualInterestPosted and verify both are same
          */
         DecimalFormat decimalFormat = new DecimalFormat("", new DecimalFormatSymbols(Locale.US));
         decimalFormat.applyPattern("#.###");
@@ -1957,13 +1921,10 @@ public class ClientSavingsIntegrationTest {
     }
 
     /*
-     * private void verifySavingsInterest(final Object savingsInterest) {
-     * LOG.info(
-     * "--------------------VERIFYING THE BALANCE, INTEREST --------------------------"
-     * );
+     * private void verifySavingsInterest(final Object savingsInterest) { LOG.info(
+     * "--------------------VERIFYING THE BALANCE, INTEREST --------------------------" );
      *
-     * assertEquals("Verifying Interest Calculation", Float.valueOf("238.3399"),
-     * savingsInterest); }
+     * assertEquals("Verifying Interest Calculation", Float.valueOf("238.3399"), savingsInterest); }
      */
 
     @SuppressWarnings("unchecked")
@@ -2082,8 +2043,8 @@ public class ClientSavingsIntegrationTest {
     }
 
     /**
-     * incorrect savings account balance when charge transaction is reversed
-     * during an overdraft recalculate Daily Balances
+     * incorrect savings account balance when charge transaction is reversed during an overdraft recalculate Daily
+     * Balances
      */
 
     @Test
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 a9bac38..fd44624 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
@@ -46,8 +46,7 @@ import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 /**
- * Tests loan schedule change based on group meeting changes and loan
- * rescheduling
+ * Tests loan schedule change based on group meeting changes and loan rescheduling
  **/
 @SuppressWarnings({ "rawtypes" })
 @Disabled
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 453601f..87ca0e0 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FinancialActivityAccountsTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FinancialActivityAccountsTest.java
@@ -83,15 +83,13 @@ public class FinancialActivityAccountsTest {
         Assertions.assertNotNull(financialActivityAccountId);
 
         /***
-         * Fetch Created Financial Activity to Account Mapping and validate
-         * created values
+         * Fetch Created Financial Activity to Account Mapping and validate created values
          **/
         assertFinancialActivityAccountCreation(financialActivityAccountId, LIABILITY_TRANSFER_FINANCIAL_ACTIVITY_ID,
                 liabilityTransferAccount);
 
         /**
-         * Update Existing Financial Activity to Account Mapping and assert
-         * changes
+         * Update Existing Financial Activity to Account Mapping and assert changes
          **/
         Account newLiabilityTransferAccount = accountHelper.createLiabilityAccount();
         Assertions.assertNotNull(newLiabilityTransferAccount);
@@ -120,8 +118,7 @@ public class FinancialActivityAccountsTest {
                 duplicateFinancialActivityAccountError.get(0).get(CommonConstants.RESPONSE_ERROR_MESSAGE_CODE));
 
         /**
-         * Associating incorrect GL account types with a financial activity
-         * should fail
+         * Associating incorrect GL account types with a financial activity should fail
          **/
         List<HashMap> invalidFinancialActivityAccountError = (List<HashMap>) financialActivityAccountHelper.updateFinancialActivityAccount(
                 financialActivityAccountId, assetTransferFinancialActivityId, newLiabilityTransferAccount.getAccountID(),
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 25f125b..7fc0aaf 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
@@ -121,8 +121,8 @@ public class FixedDepositTest {
     }
 
     /***
-     * Test case for Fixed Deposit Account premature closure with transaction
-     * type withdrawal and Cash Based accounting enabled
+     * Test case for Fixed Deposit Account premature closure with transaction type withdrawal and Cash Based accounting
+     * enabled
      */
     @Test
     public void testFixedDepositAccountWithPrematureClosureTypeWithdrawal() {
@@ -202,8 +202,7 @@ public class FixedDepositTest {
         Float depositAmount = (Float) accountSummary.get("totalDeposits");
 
         /***
-         * Verify journal entries posted for initial deposit transaction which
-         * happened at activation time
+         * Verify journal entries posted for initial deposit transaction which happened at activation time
          */
         final JournalEntry[] assetAccountInitialEntry = { new JournalEntry(depositAmount, JournalEntry.TransactionType.DEBIT) };
         final JournalEntry[] liablilityAccountInitialEntry = { new JournalEntry(depositAmount, JournalEntry.TransactionType.CREDIT) };
@@ -336,8 +335,7 @@ public class FixedDepositTest {
         Float depositAmount = (Float) accountSummary.get("totalDeposits");
 
         /***
-         * Verify journal entries posted for initial deposit transaction which
-         * happened at activation time
+         * Verify journal entries posted for initial deposit transaction which happened at activation time
          */
         final JournalEntry[] assetAccountInitialEntry = { new JournalEntry(depositAmount, JournalEntry.TransactionType.DEBIT) };
         final JournalEntry[] liablilityAccountInitialEntry = { new JournalEntry(depositAmount, JournalEntry.TransactionType.CREDIT) };
@@ -479,8 +477,7 @@ public class FixedDepositTest {
         Float depositAmount = (Float) accountSummary.get("totalDeposits");
 
         /***
-         * Verify journal entries posted for initial deposit transaction which
-         * happened at activation time
+         * Verify journal entries posted for initial deposit transaction which happened at activation time
          */
         final JournalEntry[] assetAccountInitialEntry = { new JournalEntry(depositAmount, JournalEntry.TransactionType.DEBIT) };
         final JournalEntry[] liablilityAccountInitialEntry = { new JournalEntry(depositAmount, JournalEntry.TransactionType.CREDIT) };
@@ -686,8 +683,8 @@ public class FixedDepositTest {
     }
 
     /***
-     * Test case for FD Account premature closure with transaction transfers to
-     * savings account and Cash Based accounting enabled
+     * Test case for FD Account premature closure with transaction transfers to savings account and Cash Based
+     * accounting enabled
      */
     @Test
     public void testFixedDepositAccountWithPrematureClosureTypeTransferToSavings() {
@@ -777,8 +774,7 @@ public class FixedDepositTest {
         Float depositAmount = (Float) accountSummary.get("totalDeposits");
 
         /***
-         * Verify journal entries posted for initial deposit transaction which
-         * happened at activation time
+         * Verify journal entries posted for initial deposit transaction which happened at activation time
          */
         final JournalEntry[] assetAccountInitialEntry = { new JournalEntry(depositAmount, JournalEntry.TransactionType.DEBIT) };
         final JournalEntry[] liablilityAccountInitialEntry = { new JournalEntry(depositAmount, JournalEntry.TransactionType.CREDIT) };
@@ -834,9 +830,8 @@ public class FixedDepositTest {
         Float prematurityAmount = (Float) fixedDepositData.get("maturityAmount");
 
         /***
-         * Verify journal entry transactions for preclosure transaction As this
-         * transaction is an account transfer you should get financial account
-         * mapping details and verify amounts
+         * Verify journal entry transactions for preclosure transaction As this transaction is an account transfer you
+         * should get financial account mapping details and verify amounts
          */
         this.journalEntryHelper.checkJournalEntryForLiabilityAccount(liabilityAccount, CLOSED_ON_DATE,
                 new JournalEntry(prematurityAmount, JournalEntry.TransactionType.CREDIT),
@@ -855,8 +850,8 @@ public class FixedDepositTest {
     }
 
     /***
-     * Test case for Fixed Deposit Account premature closure with transaction
-     * type ReInvest and Cash Based accounting enabled
+     * Test case for Fixed Deposit Account premature closure with transaction type ReInvest and Cash Based accounting
+     * enabled
      */
     @Test
     public void testFixedDepositAccountWithPrematureClosureTypeReinvest() {
@@ -930,8 +925,7 @@ public class FixedDepositTest {
         Float depositAmount = (Float) accountSummary.get("totalDeposits");
 
         /***
-         * Verify journal entries posted for initial deposit transaction which
-         * happened at activation time
+         * Verify journal entries posted for initial deposit transaction which happened at activation time
          */
         final JournalEntry[] assetAccountInitialEntry = { new JournalEntry(depositAmount, JournalEntry.TransactionType.DEBIT) };
         final JournalEntry[] liablilityAccountInitialEntry = { new JournalEntry(depositAmount, JournalEntry.TransactionType.CREDIT) };
@@ -2376,8 +2370,8 @@ public class FixedDepositTest {
     }
 
     /***
-     * Test case for Fixed Deposit Account rollover with maturity instruction as
-     * re invest maturity amount(principal+interest)
+     * Test case for Fixed Deposit Account rollover with maturity instruction as re invest maturity
+     * amount(principal+interest)
      */
     @Test
     public void testFixedDepositAccountWithRolloverMaturityAmount() {
@@ -2457,8 +2451,7 @@ public class FixedDepositTest {
     }
 
     /***
-     * Test case for Fixed Deposit Account rollover with maturity instruction as
-     * re invest principal only
+     * Test case for Fixed Deposit Account rollover with maturity instruction as re invest principal only
      */
     @Test
     public void testFixedDepositAccountWithRolloverPrincipal() {
@@ -2648,8 +2641,7 @@ public class FixedDepositTest {
         List<HashMap> financialActivities = this.financialActivityAccountHelper.getAllFinancialActivityAccounts(this.responseSpec);
         final Account financialAccount;
         /***
-         * if no financial activities are defined for account transfers, create
-         * liability financial accounting mappings
+         * if no financial activities are defined for account transfers, create liability financial accounting mappings
          */
         if (financialActivities.isEmpty()) {
             financialAccount = createLiabilityFinancialAccountTransferType(LIABILITY_TRANSFER_FINANCIAL_ACTIVITY_ID);
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 9401d73..7ca4884 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
@@ -78,8 +78,7 @@ public class FlexibleSavingsInterestPostingIntegrationTest {
         this.savingsAccountHelper.depositToSavingsAccount(savingsId, "1000", startDate, CommonConstants.RESPONSE_RESOURCE_ID);
 
         /***
-         * Perform Post interest transaction and verify the posted transaction
-         * date
+         * Perform Post interest transaction and verify the posted transaction date
          */
         this.savingsAccountHelper.postInterestForSavings(savingsId);
         HashMap accountDetails = this.savingsAccountHelper.getSavingsDetails(savingsId);
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 0d9058d..51d6a15 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
@@ -160,8 +160,7 @@ public class GlobalConfigurationTest {
                 Assertions.assertNotNull(configId);
 
                 /*
-                 * Update force-password-reset-days with value as 0 and Enable
-                 * as true - failure case
+                 * Update force-password-reset-days with value as 0 and Enable as true - failure case
                  */
                 ArrayList error = (ArrayList) GlobalConfigurationHelper.updatePasswordResetDaysForGlobalConfiguration(this.requestSpec,
                         this.httpStatusForidden, configId, newValue, newBooleanValue, CommonConstants.RESPONSE_ERROR);
@@ -172,8 +171,7 @@ public class GlobalConfigurationTest {
                         "Force Password Reset days value must be greater than zero.");
 
                 /*
-                 * Update force-password-reset-days with value as 50 and Enable
-                 * as true - success case
+                 * Update force-password-reset-days with value as 50 and Enable as true - success case
                  */
                 final HashMap updateSuccess = (HashMap) GlobalConfigurationHelper.updatePasswordResetDaysForGlobalConfiguration(
                         this.requestSpec, this.responseSpec, configId, "50", newBooleanValue, "changes");
@@ -185,8 +183,7 @@ public class GlobalConfigurationTest {
                 Assertions.assertNotNull(updateSuccess1);
 
                 /*
-                 * Update without sending value and Enable as true - failure
-                 * case
+                 * Update without sending value and Enable as true - failure case
                  */
                 ArrayList failure = (ArrayList) GlobalConfigurationHelper.updatePasswordResetDaysForGlobalConfiguration(this.requestSpec,
                         this.httpStatusForidden, configId, null, newBooleanValue, CommonConstants.RESPONSE_ERROR);
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 9320ae0..7d7392a 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupTest.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupTest.java
@@ -41,8 +41,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Group Test for checking Group: Creation, Activation, Client Association,
- * Updating & Deletion
+ * Group Test for checking Group: Creation, Activation, Client Association, Updating & Deletion
  */
 public class GroupTest {
 
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 3729c46..36cc3b2 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
@@ -70,8 +70,8 @@ public class HookIntegrationTest {
         try {
 
             /**
-             * sleep for a three seconds after each failure to increase the
-             * likelihood of the previous request for creating office completing
+             * sleep for a three seconds after each failure to increase the likelihood of the previous request for
+             * creating office completing
              **/
 
             for (int i = 0; i < 6; i++) {
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 8d3ee93..8cb924c 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
@@ -87,8 +87,7 @@ public class LoanApplicationApprovalTest {
     }
 
     /*
-     * Negative test case: Approved amount non zero is greater than proposed
-     * amount
+     * Negative test case: Approved amount non zero is greater than proposed amount
      */
     @Test
     public void loanApplicationApprovedAmountGreaterThanProposedAmount() {
@@ -236,10 +235,8 @@ public class LoanApplicationApprovalTest {
 
         /* If tranches are not specified for a multi-disburse loan */
         /**
-         * error =
-         * this.loanTransactionHelper.approveLoanForTranches(approveDate,
-         * expectedDisbursementDate, approvalAmount5, loanID, approveTranche5,
-         * CommonConstants.RESPONSE_ERROR);
+         * error = this.loanTransactionHelper.approveLoanForTranches(approveDate, expectedDisbursementDate,
+         * approvalAmount5, loanID, approveTranche5, CommonConstants.RESPONSE_ERROR);
          * assertEquals("error.msg.disbursementData.required",
          * error.get(0).get(CommonConstants.RESPONSE_ERROR_MESSAGE_CODE));
          **/
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 dc98baa..0a83815 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
@@ -232,113 +232,79 @@ public class LoanDisbursementDetailsIntegrationTest {
 
     /* Uncomment and modify test builder values once MIFOSX-2006 is closed. */
     /*
-     * private void validateRepaymentScheduleWithoutEMI(ArrayList<HashMap>
-     * periods){ LoanDisbursementTestBuilder expectedRepaymentSchedule0 = new
-     * LoanDisbursementTestBuilder( "[2015, 6, 1]", 0.0f, 0.0f, null, null,
-     * 5000.0f, null, null, null);
+     * private void validateRepaymentScheduleWithoutEMI(ArrayList<HashMap> periods){ LoanDisbursementTestBuilder
+     * expectedRepaymentSchedule0 = new LoanDisbursementTestBuilder( "[2015, 6, 1]", 0.0f, 0.0f, null, null, 5000.0f,
+     * null, null, null);
      *
-     * LoanDisbursementTestBuilder expectedRepaymentSchedule1 = new
-     * LoanDisbursementTestBuilder( "[2015, 7, 1]", 800.0f, 800.0f, 50.0f,
-     * 750.0f, 4250.0f, 750.0f, 750.0f, "[2015, 6, 1]");
+     * LoanDisbursementTestBuilder expectedRepaymentSchedule1 = new LoanDisbursementTestBuilder( "[2015, 7, 1]", 800.0f,
+     * 800.0f, 50.0f, 750.0f, 4250.0f, 750.0f, 750.0f, "[2015, 6, 1]");
      *
-     * LoanDisbursementTestBuilder expectedRepaymentSchedule2 = new
-     * LoanDisbursementTestBuilder( "[2015, 8, 1]", 800.0f, 800.0f, 42.5f,
-     * 757.5f, 3492.5f, 757.5f, 757.5f, "[2015, 7, 1]");
+     * LoanDisbursementTestBuilder expectedRepaymentSchedule2 = new LoanDisbursementTestBuilder( "[2015, 8, 1]", 800.0f,
+     * 800.0f, 42.5f, 757.5f, 3492.5f, 757.5f, 757.5f, "[2015, 7, 1]");
      *
-     * LoanDisbursementTestBuilder expectedRepaymentSchedule3 = new
-     * LoanDisbursementTestBuilder( "[2015, 9, 1]", 0.0f, 0.0f, null, null,
-     * 5000.0f, null, null, null);
+     * LoanDisbursementTestBuilder expectedRepaymentSchedule3 = new LoanDisbursementTestBuilder( "[2015, 9, 1]", 0.0f,
+     * 0.0f, null, null, 5000.0f, null, null, null);
      *
-     * LoanDisbursementTestBuilder expectedRepaymentSchedule4 = new
-     * LoanDisbursementTestBuilder( "[2015, 9, 1]", 800.0f, 800.0f, 34.92f,
-     * 765.08f, 7727.42f, 765.08f, 765.08f, "[2015, 8, 1]");
+     * LoanDisbursementTestBuilder expectedRepaymentSchedule4 = new LoanDisbursementTestBuilder( "[2015, 9, 1]", 800.0f,
+     * 800.0f, 34.92f, 765.08f, 7727.42f, 765.08f, 765.08f, "[2015, 8, 1]");
      *
-     * LoanDisbursementTestBuilder expectedRepaymentSchedule5 = new
-     * LoanDisbursementTestBuilder( "[2015, 10, 1]", 800.0f, 800.0f, 77.27f,
-     * 722.73f, 7004.69f, 722.73f, 722.73f, "[2015, 9, 1]");
+     * LoanDisbursementTestBuilder expectedRepaymentSchedule5 = new LoanDisbursementTestBuilder( "[2015, 10, 1]",
+     * 800.0f, 800.0f, 77.27f, 722.73f, 7004.69f, 722.73f, 722.73f, "[2015, 9, 1]");
      *
-     * LoanDisbursementTestBuilder expectedRepaymentSchedule6 = new
-     * LoanDisbursementTestBuilder( "[2015, 11, 1]", 800.0f, 800.0f, 70.05f,
-     * 729.95f, 6274.74f, 729.95f, 729.95f, "[2015, 10, 1]");
+     * LoanDisbursementTestBuilder expectedRepaymentSchedule6 = new LoanDisbursementTestBuilder( "[2015, 11, 1]",
+     * 800.0f, 800.0f, 70.05f, 729.95f, 6274.74f, 729.95f, 729.95f, "[2015, 10, 1]");
      *
-     * LoanDisbursementTestBuilder expectedRepaymentSchedule7 = new
-     * LoanDisbursementTestBuilder( "[2015, 12, 1]", 800.0f, 800.0f, 62.75f,
-     * 737.25f, 5537.49f, 737.25f, 737.25f, "[2015, 11, 1]");
+     * LoanDisbursementTestBuilder expectedRepaymentSchedule7 = new LoanDisbursementTestBuilder( "[2015, 12, 1]",
+     * 800.0f, 800.0f, 62.75f, 737.25f, 5537.49f, 737.25f, 737.25f, "[2015, 11, 1]");
      *
-     * LoanDisbursementTestBuilder expectedRepaymentSchedule8 = new
-     * LoanDisbursementTestBuilder( "[2016, 1, 1]", 800.0f, 800.0f, 55.37f,
-     * 744.63f, 4792.86f, 744.63f, 744.63f, "[2015, 12, 1]");
+     * LoanDisbursementTestBuilder expectedRepaymentSchedule8 = new LoanDisbursementTestBuilder( "[2016, 1, 1]", 800.0f,
+     * 800.0f, 55.37f, 744.63f, 4792.86f, 744.63f, 744.63f, "[2015, 12, 1]");
      *
-     * LoanDisbursementTestBuilder expectedRepaymentSchedule9 = new
-     * LoanDisbursementTestBuilder( "[2016, 2, 1]", 800.0f, 800.0f, 47.93f,
-     * 752.07f, 4040.79f, 752.07f, 752.07f, "[2016, 1, 1]");
+     * LoanDisbursementTestBuilder expectedRepaymentSchedule9 = new LoanDisbursementTestBuilder( "[2016, 2, 1]", 800.0f,
+     * 800.0f, 47.93f, 752.07f, 4040.79f, 752.07f, 752.07f, "[2016, 1, 1]");
      *
-     * LoanDisbursementTestBuilder expectedRepaymentSchedule10 = new
-     * LoanDisbursementTestBuilder( "[2016, 3, 1]", 800.0f, 800.0f, 40.41f,
-     * 759.59f, 3281.2f, 759.59f, 759.59f, "[2016, 2, 1]");
+     * LoanDisbursementTestBuilder expectedRepaymentSchedule10 = new LoanDisbursementTestBuilder( "[2016, 3, 1]",
+     * 800.0f, 800.0f, 40.41f, 759.59f, 3281.2f, 759.59f, 759.59f, "[2016, 2, 1]");
      *
-     * LoanDisbursementTestBuilder expectedRepaymentSchedule11 = new
-     * LoanDisbursementTestBuilder( "[2016, 4, 1]", 800.0f, 800.0f, 32.81f,
-     * 767.19f, 2514.01f, 767.19f, 767.19f, "[2016, 3, 1]");
+     * LoanDisbursementTestBuilder expectedRepaymentSchedule11 = new LoanDisbursementTestBuilder( "[2016, 4, 1]",
+     * 800.0f, 800.0f, 32.81f, 767.19f, 2514.01f, 767.19f, 767.19f, "[2016, 3, 1]");
      *
-     * LoanDisbursementTestBuilder expectedRepaymentSchedule12 = new
-     * LoanDisbursementTestBuilder( "[2016, 5, 1]", 800.0f, 800.0f, 25.14f,
-     * 774.86f, 1739.15f, 774.86f, 774.86f, "[2016, 4, 1]");
+     * LoanDisbursementTestBuilder expectedRepaymentSchedule12 = new LoanDisbursementTestBuilder( "[2016, 5, 1]",
+     * 800.0f, 800.0f, 25.14f, 774.86f, 1739.15f, 774.86f, 774.86f, "[2016, 4, 1]");
      *
-     * LoanDisbursementTestBuilder expectedRepaymentSchedule13 = new
-     * LoanDisbursementTestBuilder( "[2016, 6, 1]", 800.0f, 800.0f, 17.39f,
-     * 782.61f, 956.54f, 782.61f, 782.61f, "[2016, 5, 1]");
+     * LoanDisbursementTestBuilder expectedRepaymentSchedule13 = new LoanDisbursementTestBuilder( "[2016, 6, 1]",
+     * 800.0f, 800.0f, 17.39f, 782.61f, 956.54f, 782.61f, 782.61f, "[2016, 5, 1]");
      *
-     * LoanDisbursementTestBuilder expectedRepaymentSchedule14 = new
-     * LoanDisbursementTestBuilder( "[2016, 7, 1]", 966.11f, 966.11f, 9.57f,
-     * 956.54f, 0.0f, 956.54f, 956.54f, "[2016, 6, 1]");
+     * LoanDisbursementTestBuilder expectedRepaymentSchedule14 = new LoanDisbursementTestBuilder( "[2016, 7, 1]",
+     * 966.11f, 966.11f, 9.57f, 956.54f, 0.0f, 956.54f, 956.54f, "[2016, 6, 1]");
      *
-     * ArrayList<LoanDisbursementTestBuilder> list = new
-     * ArrayList<LoanDisbursementTestBuilder>();
-     * list.add(expectedRepaymentSchedule0);
-     * list.add(expectedRepaymentSchedule1);
-     * list.add(expectedRepaymentSchedule2);
-     * list.add(expectedRepaymentSchedule3);
-     * list.add(expectedRepaymentSchedule4);
-     * list.add(expectedRepaymentSchedule5);
-     * list.add(expectedRepaymentSchedule6);
-     * list.add(expectedRepaymentSchedule7);
-     * list.add(expectedRepaymentSchedule8);
-     * list.add(expectedRepaymentSchedule9);
-     * list.add(expectedRepaymentSchedule10);
-     * list.add(expectedRepaymentSchedule11);
-     * list.add(expectedRepaymentSchedule12);
-     * list.add(expectedRepaymentSchedule13);
-     * list.add(expectedRepaymentSchedule14);
+     * ArrayList<LoanDisbursementTestBuilder> list = new ArrayList<LoanDisbursementTestBuilder>();
+     * list.add(expectedRepaymentSchedule0); list.add(expectedRepaymentSchedule1); list.add(expectedRepaymentSchedule2);
+     * list.add(expectedRepaymentSchedule3); list.add(expectedRepaymentSchedule4); list.add(expectedRepaymentSchedule5);
+     * list.add(expectedRepaymentSchedule6); list.add(expectedRepaymentSchedule7); list.add(expectedRepaymentSchedule8);
+     * list.add(expectedRepaymentSchedule9); list.add(expectedRepaymentSchedule10);
+     * list.add(expectedRepaymentSchedule11); list.add(expectedRepaymentSchedule12);
+     * list.add(expectedRepaymentSchedule13); list.add(expectedRepaymentSchedule14);
      *
-     * for (int i = 0; i < list.size(); i++) {
-     * this.assertRepaymentScheduleValuesWithoutEMI(periods.get(i), list.get(i),
+     * for (int i = 0; i < list.size(); i++) { this.assertRepaymentScheduleValuesWithoutEMI(periods.get(i), list.get(i),
      * i); } }
      *
-     * private void assertRepaymentScheduleValuesWithoutEMI(HashMap period,
-     * LoanDisbursementTestBuilder expectedRepaymentSchedule, int position) {
+     * private void assertRepaymentScheduleValuesWithoutEMI(HashMap period, LoanDisbursementTestBuilder
+     * expectedRepaymentSchedule, int position) {
      *
-     * assertEquals(period.get("dueDate").toString(),
-     * expectedRepaymentSchedule.getDueDate());
+     * assertEquals(period.get("dueDate").toString(), expectedRepaymentSchedule.getDueDate());
      * assertEquals(period.get("principalLoanBalanceOutstanding"),
      * expectedRepaymentSchedule.getPrincipalLoanBalanceOutstanding());
-     * assertEquals(period.get("totalOriginalDueForPeriod"),
-     * expectedRepaymentSchedule.getTotalOriginalDueForPeriod());
-     * assertEquals(period.get("totalOutstandingForPeriod"),
-     * expectedRepaymentSchedule.getTotalOutstandingForPeriod());
+     * assertEquals(period.get("totalOriginalDueForPeriod"), expectedRepaymentSchedule.getTotalOriginalDueForPeriod());
+     * assertEquals(period.get("totalOutstandingForPeriod"), expectedRepaymentSchedule.getTotalOutstandingForPeriod());
      *
      * if (position != 0 && position != 3) {
      *
-     * assertEquals(period.get("interestOutstanding"),
-     * expectedRepaymentSchedule.getInterestOutstanding());
-     * assertEquals(period.get("principalOutstanding"),
-     * expectedRepaymentSchedule.getPrincipalOutstanding());
-     * assertEquals(period.get("principalDue"),
-     * expectedRepaymentSchedule.getPrincipalDue());
-     * assertEquals(period.get("principalOriginalDue"),
-     * expectedRepaymentSchedule.getPrincipalOriginalDue());
-     * assertEquals(period.get("fromDate").toString(),
-     * expectedRepaymentSchedule.getFromDate()); } }
+     * assertEquals(period.get("interestOutstanding"), expectedRepaymentSchedule.getInterestOutstanding());
+     * assertEquals(period.get("principalOutstanding"), expectedRepaymentSchedule.getPrincipalOutstanding());
+     * assertEquals(period.get("principalDue"), expectedRepaymentSchedule.getPrincipalDue());
+     * assertEquals(period.get("principalOriginalDue"), expectedRepaymentSchedule.getPrincipalOriginalDue());
+     * assertEquals(period.get("fromDate").toString(), expectedRepaymentSchedule.getFromDate()); } }
      */
     private Integer applyForLoanApplicationWithEmiAmount(final Integer clientID, final Integer loanProductID, final String proposedAmount,
             List<HashMap> tranches, final String installmentAmount) {
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 53ce86a..3570e89 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
@@ -37,8 +37,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Client Loan Integration Test for checking Loan Disbursement with Waive
- * Interest and Write-Off.
+ * Client Loan Integration Test for checking Loan Disbursement with Waive Interest and Write-Off.
  */
 @SuppressWarnings({ "rawtypes" })
 public class LoanWithWaiveInterestAndWriteOffIntegrationTest {
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 3de3828..7acd7cf 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
@@ -66,9 +66,8 @@ public class MinimumDaysBetweenDisbursalAndFirstRepaymentTest {
     }
 
     /*
-     * MinimumDaysBetweenDisbursalAndFirstRepayment is set to 7 days and days
-     * between disbursal date and first repayment is set as 7. system should
-     * allow to create this loan and allow to disburse
+     * MinimumDaysBetweenDisbursalAndFirstRepayment is set to 7 days and days between disbursal date and first repayment
+     * is set as 7. system should allow to create this loan and allow to disburse
      */
     @Test
     public void createLoanEntity_WITH_DAY_BETWEEN_DISB_DATE_AND_REPAY_START_DATE_GREATER_THAN_MIN_DAY_CRITERIA() {
@@ -112,9 +111,8 @@ public class MinimumDaysBetweenDisbursalAndFirstRepaymentTest {
     }
 
     /*
-     * MinimumDaysBetweenDisbursalAndFirstRepayment is set to 7 days and days
-     * between disbursal date and first repayment is set as 7. system should
-     * allow to create this loan and allow to disburse
+     * MinimumDaysBetweenDisbursalAndFirstRepayment is set to 7 days and days between disbursal date and first repayment
+     * is set as 7. system should allow to create this loan and allow to disburse
      */
     @SuppressWarnings("unchecked")
     @Test
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 45f7262..7474bf9 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
@@ -122,8 +122,8 @@ public class RecurringDepositTest {
     }
 
     /***
-     * Test case for Recurring Deposit Account premature closure with
-     * transaction type withdrawal and Cash Based accounting enabled
+     * Test case for Recurring Deposit Account premature closure with transaction type withdrawal and Cash Based
+     * accounting enabled
      */
     @Test
     public void testRecurringDepositAccountWithPrematureClosureTypeWithdrawal() {
@@ -208,8 +208,7 @@ public class RecurringDepositTest {
         Float depositAmount = (Float) recurringDepositAccountData.get("mandatoryRecommendedDepositAmount");
 
         /***
-         * Perform Deposit transaction and verify journal entries are posted for
-         * the transaction
+         * Perform Deposit transaction and verify journal entries are posted for the transaction
          */
         Integer depositTransactionId = this.recurringDepositAccountHelper.depositToRecurringDepositAccount(recurringDepositAccountId,
                 depositAmount, EXPECTED_FIRST_DEPOSIT_ON_DATE);
@@ -272,9 +271,8 @@ public class RecurringDepositTest {
     }
 
     /***
-     * Test case for Recurring Deposit Account premature closure with
-     * transaction transfers to savings account and Cash Based accounting
-     * enabled
+     * Test case for Recurring Deposit Account premature closure with transaction transfers to savings account and Cash
+     * Based accounting enabled
      */
     @Test
     public void testRecurringDepositAccountWithPrematureClosureTypeTransferToSavings() {
@@ -388,8 +386,7 @@ public class RecurringDepositTest {
         Float depositAmount = (Float) recurringDepositAccountData.get("mandatoryRecommendedDepositAmount");
 
         /***
-         * Perform Deposit transaction and verify journal entries are posted for
-         * the transaction
+         * Perform Deposit transaction and verify journal entries are posted for the transaction
          */
         Integer depositTransactionId = this.recurringDepositAccountHelper.depositToRecurringDepositAccount(recurringDepositAccountId,
                 depositAmount, EXPECTED_FIRST_DEPOSIT_ON_DATE);
@@ -451,9 +448,8 @@ public class RecurringDepositTest {
                 recurringDepositAccountId);
         Float maturityAmount = Float.valueOf(recurringDepositAccountData.get("maturityAmount").toString());
         /***
-         * Verify journal entry transactions for preclosure transaction As this
-         * transaction is an account transfer you should get financial account
-         * mapping details and verify amounts
+         * Verify journal entry transactions for preclosure transaction As this transaction is an account transfer you
+         * should get financial account mapping details and verify amounts
          */
         this.journalEntryHelper.checkJournalEntryForLiabilityAccount(liabilityAccount, CLOSED_ON_DATE,
                 new JournalEntry(maturityAmount, JournalEntry.TransactionType.CREDIT),
@@ -592,8 +588,7 @@ public class RecurringDepositTest {
         Float depositAmount = (Float) recurringDepositAccountData.get("mandatoryRecommendedDepositAmount");
 
         /***
-         * Perform Deposit transaction and verify journal entries are posted for
-         * the transaction
+         * Perform Deposit transaction and verify journal entries are posted for the transaction
          */
         Integer depositTransactionId = this.recurringDepositAccountHelper.depositToRecurringDepositAccount(recurringDepositAccountId,
                 depositAmount, EXPECTED_FIRST_DEPOSIT_ON_DATE);
@@ -656,9 +651,8 @@ public class RecurringDepositTest {
                 recurringDepositAccountId);
         Float maturityAmount = Float.valueOf(recurringDepositAccountData.get("maturityAmount").toString());
         /***
-         * Verify journal entry transactions for preclosure transaction As this
-         * transaction is an account transfer you should get financial account
-         * mapping details and verify amounts
+         * Verify journal entry transactions for preclosure transaction As this transaction is an account transfer you
+         * should get financial account mapping details and verify amounts
          */
         this.journalEntryHelper.checkJournalEntryForLiabilityAccount(liabilityAccount, CLOSED_ON_DATE,
                 new JournalEntry(maturityAmount, JournalEntry.TransactionType.CREDIT),
@@ -804,8 +798,7 @@ public class RecurringDepositTest {
         Float depositAmount = (Float) recurringDepositAccountData.get("mandatoryRecommendedDepositAmount");
 
         /***
-         * Perform Deposit transaction and verify journal entries are posted for
-         * the transaction
+         * Perform Deposit transaction and verify journal entries are posted for the transaction
          */
         todaysDate = Calendar.getInstance();
         todaysDate.add(Calendar.MONTH, -20);
@@ -846,8 +839,8 @@ public class RecurringDepositTest {
     }
 
     /***
-     * Test case for Recurring Deposit Account premature closure with
-     * transaction type ReInvest and Cash Based accounting enabled
+     * Test case for Recurring Deposit Account premature closure with transaction type ReInvest and Cash Based
+     * accounting enabled
      */
     @Test
     public void testRecurringDepositAccountWithPrematureClosureTypeReinvest() {
@@ -941,8 +934,7 @@ public class RecurringDepositTest {
         Float depositAmount = (Float) recurringDepositAccountData.get("mandatoryRecommendedDepositAmount");
 
         /***
-         * Perform Deposit transaction and verify journal entries are posted for
-         * the transaction
+         * Perform Deposit transaction and verify journal entries are posted for the transaction
          */
         Integer depositTransactionId = this.recurringDepositAccountHelper.depositToRecurringDepositAccount(recurringDepositAccountId,
                 DEPOSIT_AMOUNT, EXPECTED_FIRST_DEPOSIT_ON_DATE);
@@ -981,8 +973,7 @@ public class RecurringDepositTest {
                 .calculatePrematureAmountForRecurringDeposit(recurringDepositAccountId, CLOSED_ON_DATE);
 
         /***
-         * Expected to get an error response from api because re-invest option
-         * is not supported for account preClosure
+         * Expected to get an error response from api because re-invest option is not supported for account preClosure
          */
         ArrayList<HashMap> errorResponse = (ArrayList<HashMap>) recurringDepositAccountHelperValidationError
                 .prematureCloseForRecurringDeposit(recurringDepositAccountId, CLOSED_ON_DATE, CLOSURE_TYPE_REINVEST, null,
@@ -1130,8 +1121,7 @@ public class RecurringDepositTest {
     }
 
     /***
-     * Test case for Closure of Recurring Deposit Account(Withdrawn by
-     * applicant)
+     * Test case for Closure of Recurring Deposit Account(Withdrawn by applicant)
      */
     @Test
     public void testRecurringDepositAccountWithdrawnByClientAndClosed() {
@@ -1298,8 +1288,7 @@ public class RecurringDepositTest {
         Float balanceBefore = (Float) recurringDepositSummaryBefore.get("accountBalance");
 
         /***
-         * Perform Deposit transaction and verify journal entries are posted for
-         * the transaction
+         * Perform Deposit transaction and verify journal entries are posted for the transaction
          */
         Integer transactionIdForDeposit = this.recurringDepositAccountHelper.depositToRecurringDepositAccount(recurringDepositAccountId,
                 DEPOSIT_AMOUNT, DEPOSIT_DATE);
@@ -1351,8 +1340,7 @@ public class RecurringDepositTest {
     }
 
     /***
-     * Test case for verify maturity amount with monthly compounding and monthly
-     * posting with 365 days in year
+     * Test case for verify maturity amount with monthly compounding and monthly posting with 365 days in year
      */
     @Test
     public void testMaturityAmountForMonthlyCompoundingAndMonthlyPosting_With_365_Days() {
@@ -1429,8 +1417,7 @@ public class RecurringDepositTest {
     }
 
     /***
-     * Test case for verify maturity amount with monthly compounding and monthly
-     * posting with 360 days in year
+     * Test case for verify maturity amount with monthly compounding and monthly posting with 360 days in year
      */
     @Test
     public void testMaturityAmountForMonthlyCompoundingAndMonthlyPosting_With_360_Days() {
@@ -1606,8 +1593,8 @@ public class RecurringDepositTest {
     }
 
     /***
-     * Test case for verify premature closure amount with penal interest for
-     * whole term with closure transaction type withdrawal and 365 days in year
+     * Test case for verify premature closure amount with penal interest for whole term with closure transaction type
+     * withdrawal and 365 days in year
      */
     @Test
     public void testPrematureClosureAmountWithPenalInterestForWholeTerm_With_365_Days() {
@@ -1731,8 +1718,8 @@ public class RecurringDepositTest {
     }
 
     /***
-     * Test case for verify premature closure amount with penal interest for
-     * whole term with closure transaction type withdrawal and 360 days in year
+     * Test case for verify premature closure amount with penal interest for whole term with closure transaction type
+     * withdrawal and 360 days in year
      */
     @Test
     public void testPrematureClosureAmountWithPenalInterestForWholeTerm_With_360_Days() {
@@ -1861,9 +1848,8 @@ public class RecurringDepositTest {
     }
 
     /***
-     * Test case for verify premature closure amount with penal interest till
-     * maturity date with closure transaction type withdrawal and 365 days in
-     * year
+     * Test case for verify premature closure amount with penal interest till maturity date with closure transaction
+     * type withdrawal and 365 days in year
      */
     @Test
     public void testPrematureClosureAmountWithPenalInterestTillPrematureWithdrawal_With_365_Days() {
@@ -1999,9 +1985,8 @@ public class RecurringDepositTest {
     }
 
     /***
-     * Test case verify premature closure amount with penal interest till
-     * maturity date with closure transaction type withdrawal and 360 days in
-     * year
+     * Test case verify premature closure amount with penal interest till maturity date with closure transaction type
+     * withdrawal and 360 days in year
      */
     @Test
     public void testPrematureClosureAmountWithPenalInterestTillPrematureWithdrawal_With_360_Days() {
@@ -2142,8 +2127,7 @@ public class RecurringDepositTest {
     }
 
     /***
-     * Test case for verify maturity amount with daily compounding and monthly
-     * posting with 365 days in year
+     * Test case for verify maturity amount with daily compounding and monthly posting with 365 days in year
      */
     @Test
     public void testMaturityAmountForDailyCompoundingAndMonthlyPosting_With_365_Days() {
@@ -2224,8 +2208,7 @@ public class RecurringDepositTest {
     }
 
     /***
-     * Test case for verify maturity amount with daily compounding and monthly
-     * posting with 360 days in year
+     * Test case for verify maturity amount with daily compounding and monthly posting with 360 days in year
      */
     @Test
     public void testMaturityAmountForDailyCompoundingAndMonthlyPosting_With_360_Days() {
@@ -2307,8 +2290,8 @@ public class RecurringDepositTest {
     }
 
     /***
-     * Test case for verify premature closure amount with Bi-annual interest
-     * compounding and Bi-annual interest posting with 365 days in year
+     * Test case for verify premature closure amount with Bi-annual interest compounding and Bi-annual interest posting
+     * with 365 days in year
      */
     @Test
     public void testRecurringDepositWithBi_AnnualCompoundingAndPosting_365_Days() {
@@ -2397,8 +2380,8 @@ public class RecurringDepositTest {
     }
 
     /***
-     * Test case for verify premature closure amount with Bi-annual interest
-     * compounding and Bi-annual interest posting with 360 days in year
+     * Test case for verify premature closure amount with Bi-annual interest compounding and Bi-annual interest posting
+     * with 360 days in year
      */
     @Test
     public void testRecurringDepositWithBi_AnnualCompoundingAndPosting_360_Days() {
@@ -2487,8 +2470,8 @@ public class RecurringDepositTest {
     }
 
     /***
-     * Test case for verify maturity amount with Daily interest compounding and
-     * annual interest posting with 365 days in year
+     * Test case for verify maturity amount with Daily interest compounding and annual interest posting with 365 days in
+     * year
      */
     @Test
     public void testMaturityAmountForDailyCompoundingAndAnnuallyPosting_With_365_Days() {
@@ -2577,8 +2560,8 @@ public class RecurringDepositTest {
     }
 
     /***
-     * Test case for verify maturity amount with Daily interest compounding and
-     * annual interest posting with 360 days in year
+     * Test case for verify maturity amount with Daily interest compounding and annual interest posting with 360 days in
+     * year
      */
     @Test
     public void testMaturityAmountForDailyCompoundingAndAnnuallyPosting_With_360_Days() {
@@ -2667,8 +2650,8 @@ public class RecurringDepositTest {
     }
 
     /***
-     * Test case for verify premature closure amount with Quarterly interest
-     * compounding and Quarterly interest posting with 365 days in year
+     * Test case for verify premature closure amount with Quarterly interest compounding and Quarterly interest posting
+     * with 365 days in year
      */
     @Test
     public void testRecurringDepositQuarterlyCompoundingAndQuarterlyPosting_365_Days() {
@@ -2757,8 +2740,8 @@ public class RecurringDepositTest {
     }
 
     /***
-     * Test case for verify premature closure amount with Quarterly interest
-     * compounding and Quarterly interest posting with 360 days in year
+     * Test case for verify premature closure amount with Quarterly interest compounding and Quarterly interest posting
+     * with 360 days in year
      */
     @Test
     public void testRecurringDepositQuarterlyCompoundingAndQuarterlyPosting_360_Days() {
@@ -3112,8 +3095,7 @@ public class RecurringDepositTest {
         List<HashMap> financialActivities = this.financialActivityAccountHelper.getAllFinancialActivityAccounts(this.responseSpec);
         final Account financialAccount;
         /***
-         * if no financial activities are defined for account transfers, create
-         * liability financial accounting mappings
+         * if no financial activities are defined for account transfers, create liability financial accounting mappings
          */
         if (financialActivities.isEmpty()) {
             financialAccount = createLiabilityFinancialAccountTransferType(LIABILITY_TRANSFER_FINANCIAL_ACTIVITY_ID);
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 0ae3d38..d417e4b 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
@@ -28,8 +28,7 @@ import org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper;
 import org.junit.jupiter.api.BeforeEach;
 
 /**
- * Client Loan Integration Test for checking Loan Application Repayment
- * Schedule.
+ * Client Loan Integration Test for checking Loan Application Repayment Schedule.
  */
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class SurveyIntegrationTest {
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 5a026b5..bc70fba 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
@@ -32,9 +32,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Helper class for {@link org.apache.fineract.integrationtests.BatchApiTest}.
- * It takes care of creation of {@code BatchRequest} list and posting this list
- * to the server.
+ * Helper class for {@link org.apache.fineract.integrationtests.BatchApiTest}. It takes care of creation of
+ * {@code BatchRequest} list and posting this list to the server.
  *
  * @author Rishabh Shukla
  *
@@ -81,9 +80,8 @@ public final class BatchHelper {
     }
 
     /**
-     * Returns a list of BatchResponse with query parameter enclosing
-     * transaction set to false by posting the jsonified BatchRequest to the
-     * server.
+     * Returns a list of BatchResponse with query parameter enclosing transaction set to false by posting the jsonified
+     * BatchRequest to the server.
      *
      * @param requestSpec
      * @param responseSpec
@@ -97,9 +95,8 @@ public final class BatchHelper {
     }
 
     /**
-     * Returns a list of BatchResponse with query parameter enclosing
-     * transaction set to true by posting the jsonified BatchRequest to the
-     * server.
+     * Returns a list of BatchResponse with query parameter enclosing transaction set to true by posting the jsonified
+     * BatchRequest to the server.
      *
      * @param requestSpec
      * @param responseSpec
@@ -113,8 +110,7 @@ public final class BatchHelper {
     }
 
     /**
-     * Returns a BatchResponse based on the given BatchRequest, by posting the
-     * request to the server.
+     * Returns a BatchResponse based on the given BatchRequest, by posting the request to the server.
      *
      * @param BatchRequest
      * @return List<BatchResponse>
@@ -137,9 +133,8 @@ public final class BatchHelper {
     }
 
     /**
-     * Creates and returns a
-     * {@link org.apache.fineract.batch.command.internal.CreateClientCommandStrategy}
-     * Request as one of the request in Batch.
+     * Creates and returns a {@link org.apache.fineract.batch.command.internal.CreateClientCommandStrategy} Request as
+     * one of the request in Batch.
      *
      * @param reqId
      * @param externalId
@@ -168,9 +163,8 @@ public final class BatchHelper {
     }
 
     /**
-     * Creates and returns a
-     * {@link org.apache.fineract.batch.command.internal.CreateClientCommandStrategy}
-     * Request as one of the request in Batch.
+     * Creates and returns a {@link org.apache.fineract.batch.command.internal.CreateClientCommandStrategy} Request as
+     * one of the request in Batch.
      *
      * @param reqId
      * @param externalId
@@ -200,9 +194,8 @@ public final class BatchHelper {
     }
 
     /**
-     * Creates and returns a
-     * {@link org.apache.fineract.batch.command.internal.UpdateClientCommandStrategy}
-     * Request with given requestId and reference.
+     * Creates and returns a {@link org.apache.fineract.batch.command.internal.UpdateClientCommandStrategy} Request with
+     * given requestId and reference.
      *
      * @param reqId
      * @param clientId
@@ -222,9 +215,8 @@ public final class BatchHelper {
     }
 
     /**
-     * Creates and returns a
-     * {@link org.apache.fineract.batch.command.internal.ApplyLoanCommandStrategy}
-     * Request with given requestId and reference.
+     * Creates and returns a {@link org.apache.fineract.batch.command.internal.ApplyLoanCommandStrategy} Request with
+     * given requestId and reference.
      *
      * @param requestId
      * @param reference
@@ -253,9 +245,8 @@ public final class BatchHelper {
     }
 
     /**
-     * Creates and returns a
-     * {@link org.apache.fineract.batch.command.internal.ApplySavingsCommandStrategy}
-     * Request with given requestId and reference.
+     * Creates and returns a {@link org.apache.fineract.batch.command.internal.ApplySavingsCommandStrategy} Request with
+     * given requestId and reference.
      *
      * @param requestId
      * @param reference
@@ -279,9 +270,8 @@ public final class BatchHelper {
     }
 
     /**
-     * Creates and returns a
-     * {@link org.apache.fineract.batch.command.internal.CreateChargeCommandStrategy}
-     * Request with given requestId and reference
+     * Creates and returns a {@link org.apache.fineract.batch.command.internal.CreateChargeCommandStrategy} Request with
+     * given requestId and reference
      *
      * @param requestId
      * @param reference
@@ -303,9 +293,8 @@ public final class BatchHelper {
     }
 
     /**
-     * Creates and returns a
-     * {@link org.apache.fineract.batch.command.internal.CollectChargesCommandStrategy}
-     * Request with given requestId and reference.
+     * Creates and returns a {@link org.apache.fineract.batch.command.internal.CollectChargesCommandStrategy} Request
+     * with given requestId and reference.
      *
      * @param requestId
      * @param reference
@@ -325,9 +314,8 @@ public final class BatchHelper {
     }
 
     /**
-     * Creates and returns a
-     * {@link org.apache.fineract.batch.command.internal.ActivateClientCommandStrategy}
-     * Request with given requestId and reference.
+     * Creates and returns a {@link org.apache.fineract.batch.command.internal.ActivateClientCommandStrategy} Request
+     * with given requestId and reference.
      *
      *
      * @param requestId
@@ -348,9 +336,8 @@ public final class BatchHelper {
     }
 
     /**
-     * Creates and returns a
-     * {@link org.apache.fineract.batch.command.internal.ApproveLoanCommandStrategy}
-     * Request with given requestId and reference.
+     * Creates and returns a {@link org.apache.fineract.batch.command.internal.ApproveLoanCommandStrategy} Request with
+     * given requestId and reference.
      *
      *
      * @param requestId
@@ -371,9 +358,8 @@ public final class BatchHelper {
     }
 
     /**
-     * Creates and returns a
-     * {@link org.apache.fineract.batch.command.internal.DisburseLoanCommandStrategy}
-     * Request with given requestId and reference.
+     * Creates and returns a {@link org.apache.fineract.batch.command.internal.DisburseLoanCommandStrategy} Request with
+     * given requestId and reference.
      *
      *
      * @param requestId
@@ -393,9 +379,8 @@ public final class BatchHelper {
     }
 
     /**
-     * Creates and returns a
-     * {@link org.apache.fineract.batch.command.internal.RepayLoanCommandStrategy}
-     * Request with given requestId.
+     * Creates and returns a {@link org.apache.fineract.batch.command.internal.RepayLoanCommandStrategy} Request with
+     * given requestId.
      *
      *
      * @param requestId
@@ -416,8 +401,7 @@ public final class BatchHelper {
     }
 
     /**
-     * Checks that the client with given externalId is not created on the
-     * server.
+     * Checks that the client with given externalId is not created on the server.
      *
      * @param requestSpec
      * @param responseSpec
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 0a0b4af..89c769c 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
@@ -66,9 +66,8 @@ public class ClientChargesTest {
         Assertions.assertNotNull(clientId);
 
         /**
-         * create a charge for loan and try to associate to client created in
-         * the above lines.it will be an invalid scenario the reason is client
-         * is not allowed to have only client charge.
+         * create a charge for loan and try to associate to client created in the above lines.it will be an invalid
+         * scenario the reason is client is not allowed to have only client charge.
          *
          */
         final Integer loanChargeId = ChargesHelper.createCharges(this.requestSpec, this.responseSpec,
@@ -80,8 +79,7 @@ public class ClientChargesTest {
         Assertions.assertNull(clientLoanChargeId);
 
         /**
-         * associates a clientCharge to a client and pay client charge for 10
-         * USD--success scenario
+         * associates a clientCharge to a client and pay client charge for 10 USD--success scenario
          **/
         final Integer clientChargeId = ClientHelper.addChargesForClient(this.requestSpec, this.responseSpec, clientId,
                 ClientHelper.getSpecifiedDueDateChargesClientAsJSON(chargeId.toString(), "29 October 2011"));
@@ -93,16 +91,15 @@ public class ClientChargesTest {
                 (float) 190.0);
 
         /**
-         * Revert the paid client charge transaction by passing the
-         * clientChargePaidTransactionId and ensure the same is reverted.
+         * Revert the paid client charge transaction by passing the clientChargePaidTransactionId and ensure the same is
+         * reverted.
          */
         final Integer undoTrxnId = ClientHelper.revertClientChargeTransaction(this.requestSpec, this.responseSpec, clientId.toString(),
                 clientChargePaidTransactionId);
         Assertions.assertNotNull(undoTrxnId);
         isReversedTransaction(clientId.toString(), undoTrxnId.toString());
         /**
-         * Now pay client charge for 20 USD and ensure the outstanding amount is
-         * updated properly
+         * Now pay client charge for 20 USD and ensure the outstanding amount is updated properly
          */
         ResponseSpecification responseSpecFailure = new ResponseSpecBuilder().expectStatusCode(400).build();
         DateFormat dateFormat = new SimpleDateFormat("dd MMMM yyyy");
@@ -119,32 +116,28 @@ public class ClientChargesTest {
         Assertions.assertNotNull(waiveOffClientChargeTransactionId);
 
         /**
-         * Revert the waived off client charge transaction by passing the
-         * waiveOffClientChargeTransactionId and ensured the transaction is
-         * reversed.
+         * Revert the waived off client charge transaction by passing the waiveOffClientChargeTransactionId and ensured
+         * the transaction is reversed.
          */
         final Integer undoWaiveTrxnId = ClientHelper.revertClientChargeTransaction(this.requestSpec, this.responseSpec, clientId.toString(),
                 waiveOffClientChargeTransactionId);
         Assertions.assertNotNull(undoWaiveTrxnId);
         isReversedTransaction(clientId.toString(), undoWaiveTrxnId.toString());
         /**
-         * pay client charge before client activation date and ensured its a
-         * failure test case
+         * pay client charge before client activation date and ensured its a failure test case
          */
 
         final String responseId_activationDate_failure = ClientHelper.payChargesForClients(this.requestSpec, responseSpecFailure, clientId,
                 clientChargeId, ClientHelper.getPayChargeJSON("30 September 2011", "20"));
         Assertions.assertNull(responseId_activationDate_failure);
         /**
-         * pay client charge more than outstanding amount amount and ensured its
-         * a failure test case
+         * pay client charge more than outstanding amount amount and ensured its a failure test case
          */
         final String responseId_moreAmount_failure = ClientHelper.payChargesForClients(this.requestSpec, responseSpecFailure, clientId,
                 clientChargeId, ClientHelper.getPayChargeJSON("25 AUGUST 2015", "300"));
         Assertions.assertNull(responseId_moreAmount_failure);
         /**
-         * pay client charge for 10 USD and ensure outstanding amount is updated
-         * properly
+         * pay client charge for 10 USD and ensure outstanding amount is updated properly
          */
         final String chargePaid_responseId = ClientHelper.payChargesForClients(this.requestSpec, this.responseSpec, clientId,
                 clientChargeId, ClientHelper.getPayChargeJSON("25 AUGUST 2015", "100"));
@@ -168,8 +161,8 @@ public class ClientChargesTest {
     }
 
     /**
-     * Check whether the outStandingAmount is equal to expected Amount or not
-     * after paying or after waiving off the client charge.
+     * Check whether the outStandingAmount is equal to expected Amount or not after paying or after waiving off the
+     * client charge.
      *
      * @param outStandingAmount
      * @param expectedAmount
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 fa52e44..6710ed2 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
@@ -110,16 +110,13 @@ public class GlobalConfigurationHelper {
     }
 
     /**
-     * Helper method to get the current default instance data of the
-     * /configurations endpoint. Used to reset and verify that no global
-     * configuration affects state between integration tests.
+     * Helper method to get the current default instance data of the /configurations endpoint. Used to reset and verify
+     * that no global configuration affects state between integration tests.
      *
-     * @see <a href=
-     *      "https://issues.apache.org/jira/browse/FINERACT-722">FINERACT-722</a>
-     *      This is a quick, fail fast and early implementation to resolve this
-     *      issue. TODO: A more robust future solution would be isolating all
-     *      integration test state using Spring Framework's integration test
-     *      infrastructure for transaction commits and rollbacks.
+     * @see <a href= "https://issues.apache.org/jira/browse/FINERACT-722">FINERACT-722</a> This is a quick, fail fast
+     *      and early implementation to resolve this issue. TODO: A more robust future solution would be isolating all
+     *      integration test state using Spring Framework's integration test infrastructure for transaction commits and
+     *      rollbacks.
      */
     private static ArrayList<HashMap> getAllDefaultGlobalConfigurations() {
 
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 1a4f287..990c1ff 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
@@ -142,9 +142,7 @@ public class SchedulerJobHelper {
      * Launches a Job and awaits its completion.
      *
      * @param jobName
-     *            displayName (see
-     *            {@link org.apache.fineract.infrastructure.jobs.service.JobName})
-     *            of Scheduler Job
+     *            displayName (see {@link org.apache.fineract.infrastructure.jobs.service.JobName}) of Scheduler Job
      *
      * @author Michael Vorburger.ch
      */
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 512e627..38b3cb7 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
@@ -45,8 +45,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Util for RestAssured tests. This class here in src/integrationTest is
- * copy/pasted to src/test; please keep them in sync.
+ * Util for RestAssured tests. This class here in src/integrationTest is copy/pasted to src/test; please keep them in
+ * sync.
  */
 @SuppressWarnings("unchecked")
 public class Utils {
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 c3c3999..9e81182 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
@@ -334,12 +334,10 @@ public class LoanApplicationTestBuilder {
     }
 
     /**
-     * calendarID parameter is used to sync repayments with group meetings,
-     * especially when using jlg loans
+     * calendarID parameter is used to sync repayments with group meetings, especially when using jlg loans
      *
      * @param calendarId
-     *            the id of the calender record of the group meeting from
-     *            m_calendar table
+     *            the id of the calender record of the group meeting from m_calendar table
      * @return
      */
     public LoanApplicationTestBuilder withCalendarID(String calendarId) {
@@ -348,10 +346,8 @@ public class LoanApplicationTestBuilder {
     }
 
     /**
-     * This indicator is used mainly for jlg loans when we want to sync
-     * disbursement with the group meetings (it seems that if we do use this
-     * parameter we should also use calendarID to sync repayment with group
-     * meetings)
+     * This indicator is used mainly for jlg loans when we want to sync disbursement with the group meetings (it seems
+     * that if we do use this parameter we should also use calendarID to sync repayment with group meetings)
      *
      * @return
      */
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 e2b78eb..70357c5 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
@@ -81,27 +81,18 @@ public class LoanDisbursementTestBuilder {
     }
 
     /*
-     * public HashMap<String, String> build(String dueDate,String
-     * totalOriginalDueForPeriod,String totalOutstandingForPeriod, String
-     * interestOutstanding, String principalOutstanding, String
-     * principalLoanBalanceOutstanding, String principalDue, String
-     * principalOriginalDue, String fromDate) { HashMap<String, String>
-     * expectedRepaymentSchedule = new HashMap<String, String>();
-     * expectedRepaymentSchedule.put("dueDate", dueDate);
-     * expectedRepaymentSchedule.put("totalOriginalDueForPeriod",
-     * totalOriginalDueForPeriod);
-     * expectedRepaymentSchedule.put("totalOutstandingForPeriod",
-     * totalOutstandingForPeriod);
-     * expectedRepaymentSchedule.put("interestOutstanding",
-     * interestOutstanding);
-     * expectedRepaymentSchedule.put("principalOutstanding",
-     * principalOutstanding);
-     * expectedRepaymentSchedule.put("principalLoanBalanceOutstanding",
-     * principalLoanBalanceOutstanding);
+     * public HashMap<String, String> build(String dueDate,String totalOriginalDueForPeriod,String
+     * totalOutstandingForPeriod, String interestOutstanding, String principalOutstanding, String
+     * principalLoanBalanceOutstanding, String principalDue, String principalOriginalDue, String fromDate) {
+     * HashMap<String, String> expectedRepaymentSchedule = new HashMap<String, String>();
+     * expectedRepaymentSchedule.put("dueDate", dueDate); expectedRepaymentSchedule.put("totalOriginalDueForPeriod",
+     * totalOriginalDueForPeriod); expectedRepaymentSchedule.put("totalOutstandingForPeriod",
+     * totalOutstandingForPeriod); expectedRepaymentSchedule.put("interestOutstanding", interestOutstanding);
+     * expectedRepaymentSchedule.put("principalOutstanding", principalOutstanding);
+     * expectedRepaymentSchedule.put("principalLoanBalanceOutstanding", principalLoanBalanceOutstanding);
      * expectedRepaymentSchedule.put("principalDue", principalDue);
-     * expectedRepaymentSchedule.put("principalOriginalDue",
-     * principalOriginalDue); expectedRepaymentSchedule.put("fromDate",
-     * fromDate);
+     * expectedRepaymentSchedule.put("principalOriginalDue", principalOriginalDue);
+     * expectedRepaymentSchedule.put("fromDate", fromDate);
      *
      * return expectedRepaymentSchedule; }
      */
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 630c1ee..f7c82fa 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
@@ -46,8 +46,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Entity Datatable Checks Integration Test for checking Creation, Deletion and
- * Retrieval of Entity-Datatable Check
+ * Entity Datatable Checks Integration Test for checking Creation, Deletion and Retrieval of Entity-Datatable Check
  */
 public class EntityDatatableChecksIntegrationTest {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/ServerApplication.java b/fineract-provider/src/main/java/org/apache/fineract/ServerApplication.java
index 34d3175..aad208e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/ServerApplication.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/ServerApplication.java
@@ -29,16 +29,13 @@ import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.ImportResource;
 
 /**
- * Fineract main() application which launches Fineract in an embedded Tomcat
- * HTTP (using Spring Boot).
+ * Fineract main() application which launches Fineract in an embedded Tomcat HTTP (using Spring Boot).
  *
- * The DataSource used is a to a "normal" external database (not use MariaDB4j).
- * This DataSource can be configured with parameters, see
- * {@link DataSourceProperties}.
+ * The DataSource used is a to a "normal" external database (not use MariaDB4j). This DataSource can be configured with
+ * parameters, see {@link DataSourceProperties}.
  *
- * You can easily launch this via Debug as Java Application in your IDE -
- * without needing command line Gradle stuff, no need to build and deploy a WAR,
- * remote attachment etc.
+ * You can easily launch this via Debug as Java Application in your IDE - without needing command line Gradle stuff, no
+ * need to build and deploy a WAR, remote attachment etc.
  *
  * It's the old/classic Mifos (non-X) Workspace 2.0 reborn for Fineract! ;-)
  *
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 6d42eba..c4ee398 100644
--- 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
@@ -45,8 +45,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
- * Implementation of {@link FromApiJsonDeserializer} for
- * {@link GuarantorCommand}'s.
+ * Implementation of {@link FromApiJsonDeserializer} for {@link GuarantorCommand}'s.
  */
 @Component
 public final class AccrualAccountingDataValidator {
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 703dd33..99345a1 100644
--- 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
@@ -29,8 +29,7 @@ final class GLClosuresApiResourceSwagger {
     }
 
     /**
-     * TODO: describe where this belongs: {@link GLClosuresApiResource }
-     * {@Link GLClosuresApiResource}
+     * TODO: describe where this belongs: {@link GLClosuresApiResource } {@Link GLClosuresApiResource}
      */
     // Check !!
 
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 889d0c0..e346b2d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/data/GLClosureData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/data/GLClosureData.java
@@ -26,8 +26,7 @@ import org.joda.time.LocalDate;
 /**
  * Immutable object representing a General Ledger Account
  *
- * Note: no getter/setters required as google-gson will produce json from fields
- * of object.
+ * Note: no getter/setters required as google-gson will produce json from fields of object.
  */
 public class GLClosureData {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/exception/GLClosureDuplicateException.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/exception/GLClosureDuplicateException.java
index 52862b0..41ea6ef 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/exception/GLClosureDuplicateException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/exception/GLClosureDuplicateException.java
@@ -22,8 +22,7 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainR
 import org.joda.time.LocalDate;
 
 /**
- * A {@link RuntimeException} thrown when a GL Closure for a given date and
- * Office combination is already present
+ * A {@link RuntimeException} thrown when a GL Closure for a given date and Office combination is already present
  */
 public class GLClosureDuplicateException extends AbstractPlatformDomainRuleException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/exception/GLClosureNotFoundException.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/exception/GLClosureNotFoundException.java
index b627444..92fa3f5 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/exception/GLClosureNotFoundException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/exception/GLClosureNotFoundException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.accounting.closure.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
 
 /**
- * A {@link RuntimeException} thrown when GL account closure resources are not
- * found.
+ * A {@link RuntimeException} thrown when GL account closure resources are not found.
  */
 public class GLClosureNotFoundException extends AbstractPlatformResourceNotFoundException {
 
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 a59b503..a0e9a42 100644
--- 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
@@ -36,8 +36,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
- * Implementation of {@link FromApiJsonDeserializer} for
- * {@link GuarantorCommand}'s.
+ * Implementation of {@link FromApiJsonDeserializer} for {@link GuarantorCommand}'s.
  */
 @Component
 public final class GLClosureCommandFromApiJsonDeserializer extends AbstractFromApiJsonDeserializer<GLClosureCommand> {
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 411836a..9f6c768 100644
--- 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
@@ -124,8 +124,7 @@ public class GLClosureWritePlatformServiceJpaRepositoryImpl implements GLClosure
                 .orElseThrow(() -> new GLClosureNotFoundException(glClosureId));
 
         /**
-         * check if any closures are present for this branch at a later date
-         * than this closure date
+         * check if any closures are present for this branch at a later date than this closure date
          **/
         final Date closureDate = glClosure.getClosingDate();
         final GLClosure latestGLClosure = this.glClosureRepository.getLatestGLClosureByBranch(glClosure.getOffice().getId());
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 3df4600..e87a01e 100644
--- 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
@@ -102,8 +102,7 @@ public class AccountingConstants {
     }
 
     /***
-     * Enum of all accounting related input parameter names used while
-     * creating/updating a loan product
+     * Enum of all accounting related input parameter names used while creating/updating a loan product
      ***/
     public static enum LoanProductAccountingParams {
 
@@ -201,8 +200,7 @@ public class AccountingConstants {
     }
 
     /***
-     * Enum of all accounting related input parameter names used while
-     * creating/updating a savings product
+     * Enum of all accounting related input parameter names used while creating/updating a savings product
      ***/
     public static enum SavingProductAccountingParams {
 
@@ -374,8 +372,7 @@ public class AccountingConstants {
     }
 
     /***
-     * Enum of all accounting related input parameter names used while
-     * creating/updating a savings product
+     * Enum of all accounting related input parameter names used while creating/updating a savings product
      ***/
     public static enum SharesProductAccountingParams {
 
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 1691824..6ff241e 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
@@ -25,8 +25,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * Wrapper for {@link FinancialActivityAccountRepository} that adds NULL
- * checking and Error handling capabilities
+ * Wrapper for {@link FinancialActivityAccountRepository} that adds NULL checking and Error handling capabilities
  * </p>
  */
 @Service
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/exception/DuplicateFinancialActivityAccountFoundException.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/exception/DuplicateFinancialActivityAccountFoundException.java
index 070532b..c88139f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/exception/DuplicateFinancialActivityAccountFoundException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/exception/DuplicateFinancialActivityAccountFoundException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.accounting.financialactivityaccount.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
- * A {@link RuntimeException} thrown when product to GL account mapping are not
- * found.
+ * A {@link RuntimeException} thrown when product to GL account mapping are not found.
  */
 public class DuplicateFinancialActivityAccountFoundException extends AbstractPlatformDomainRuleException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/exception/FinancialActivityAccountInvalidException.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/exception/FinancialActivityAccountInvalidException.java
index 1e62cb3..5b4431a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/exception/FinancialActivityAccountInvalidException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/exception/FinancialActivityAccountInvalidException.java
@@ -23,8 +23,7 @@ import org.apache.fineract.accounting.glaccount.domain.GLAccount;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
- * A {@link RuntimeException} thrown when product to GL account mapping are not
- * found.
+ * A {@link RuntimeException} thrown when product to GL account mapping are not found.
  */
 public class FinancialActivityAccountInvalidException extends AbstractPlatformDomainRuleException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/exception/FinancialActivityAccountNotFoundException.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/exception/FinancialActivityAccountNotFoundException.java
index a995239..e6350be 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/exception/FinancialActivityAccountNotFoundException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/exception/FinancialActivityAccountNotFoundException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.accounting.financialactivityaccount.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
 
 /**
- * A {@link RuntimeException} thrown when product to GL account mapping are not
- * found.
+ * A {@link RuntimeException} thrown when product to GL account mapping are not found.
  */
 public class FinancialActivityAccountNotFoundException extends AbstractPlatformResourceNotFoundException {
 
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 7d14a95..e3ccb20 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
@@ -89,8 +89,7 @@ public class FinancialActivityAccountWritePlatformServiceImpl implements Financi
     }
 
     /**
-     * Validate that the GL Account is appropriate for the particular Financial
-     * Activity Type
+     * Validate that the GL Account is appropriate for the particular Financial Activity Type
      **/
     private void validateFinancialActivityAndAccountMapping(FinancialActivityAccount financialActivityAccount) {
         FinancialActivity financialActivity = FinancialActivity.fromInt(financialActivityAccount.getFinancialActivityType());
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 8d725b2..0859cb2 100644
--- 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
@@ -30,8 +30,7 @@ import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 /**
  * Immutable object representing a General Ledger Account
  *
- * Note: no getter/setters required as google-gson will produce json from fields
- * of object.
+ * Note: no getter/setters required as google-gson will produce json from fields of object.
  */
 public class GLAccountData implements Serializable {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountDisableException.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountDisableException.java
index 251e87c..ca47194 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountDisableException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountDisableException.java
@@ -22,8 +22,7 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainR
 
 /**
  *
- * when gl account is attached with any product(loan/saving) then we can not
- * disable the gl account
+ * when gl account is attached with any product(loan/saving) then we can not disable the gl account
  */
 public class GLAccountDisableException extends AbstractPlatformDomainRuleException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountDuplicateException.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountDuplicateException.java
index fb9b831..c7906d7 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountDuplicateException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountDuplicateException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.accounting.glaccount.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
- * A {@link RuntimeException} thrown when a GL Account with a given GL Code of
- * the particular type is already present
+ * A {@link RuntimeException} thrown when a GL Account with a given GL Code of the particular type is already present
  */
 public class GLAccountDuplicateException extends AbstractPlatformDomainRuleException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountInvalidClassificationException.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountInvalidClassificationException.java
index dce9a7e..f0ecc86 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountInvalidClassificationException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountInvalidClassificationException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.accounting.glaccount.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
- * A {@link RuntimeException} thrown when trying to fetch accounts belonging to
- * an Invalid Usage Type
+ * A {@link RuntimeException} thrown when trying to fetch accounts belonging to an Invalid Usage Type
  */
 public class GLAccountInvalidClassificationException extends AbstractPlatformDomainRuleException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountInvalidDeleteException.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountInvalidDeleteException.java
index efd53a2..f90a76f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountInvalidDeleteException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountInvalidDeleteException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.accounting.glaccount.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
- * A {@link RuntimeException} thrown when a GL Account with a given GL Code of
- * the particular type is already present
+ * A {@link RuntimeException} thrown when a GL Account with a given GL Code of the particular type is already present
  */
 public class GLAccountInvalidDeleteException extends AbstractPlatformDomainRuleException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountInvalidParentException.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountInvalidParentException.java
index e541d9c..529d4d2 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountInvalidParentException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountInvalidParentException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.accounting.glaccount.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
- * A {@link RuntimeException} thrown when trying to map invalid parents to a GL
- * account
+ * A {@link RuntimeException} thrown when trying to map invalid parents to a GL account
  */
 public class GLAccountInvalidParentException extends AbstractPlatformDomainRuleException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountInvalidUpdateException.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountInvalidUpdateException.java
index 1c88da2..157a57d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountInvalidUpdateException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountInvalidUpdateException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.accounting.glaccount.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
- * A {@link RuntimeException} thrown when an error is encountered during
- * updating a GL Account
+ * A {@link RuntimeException} thrown when an error is encountered during updating a GL Account
  */
 public class GLAccountInvalidUpdateException extends AbstractPlatformDomainRuleException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountInvalidUsageException.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountInvalidUsageException.java
index b13f3fb..c0996c6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountInvalidUsageException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/exception/GLAccountInvalidUsageException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.accounting.glaccount.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
- * A {@link RuntimeException} thrown when trying to fetch accounts belonging to
- * an Invalid Type
+ * A {@link RuntimeException} thrown when trying to fetch accounts belonging to an Invalid Type
  */
 public class GLAccountInvalidUsageException extends AbstractPlatformDomainRuleException {
 
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 284e979..d960cb2 100644
--- 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
@@ -35,8 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
- * Implementation of {@link FromApiJsonDeserializer} for
- * {@link GuarantorCommand}'s.
+ * Implementation of {@link FromApiJsonDeserializer} for {@link GuarantorCommand}'s.
  */
 @Component
 public final class GLAccountCommandFromApiJsonDeserializer extends AbstractFromApiJsonDeserializer<GLAccountCommand> {
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 88083f0..fd83c9d 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
@@ -151,8 +151,7 @@ public class GLAccountWritePlatformServiceJpaRepositoryImpl implements GLAccount
             }
 
             /**
-             * a detail account cannot be changed to a header account if
-             * transactions are already logged against it
+             * a detail account cannot be changed to a header account if transactions are already logged against it
              **/
             if (changesOnly.containsKey(GLAccountJsonInputParams.USAGE.getValue())) {
                 if (glAccount.isHeaderAccount()) {
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 347ae88..fd4b5e6 100644
--- 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
@@ -28,8 +28,7 @@ import org.joda.time.LocalDate;
 /**
  * Immutable object representing a General Ledger Account
  *
- * Note: no getter/setters required as google will produce json from fields of
- * object.
+ * Note: no getter/setters required as google will produce json from fields of object.
  */
 public class JournalEntryData {
 
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 8014c64..1ad32c7 100644
--- 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
@@ -46,13 +46,11 @@ public interface JournalEntryRepository
      * @Query("select journalEntry from JournalEntry journalEntry where glAccount.id= :accountId and transactionId= :transactionId and transactionDate= :transactionDate"
      * +
      * " and type= :journalEntryType and entityType=1 and entityId= :loanId and loanTransaction.id= :loanTransactionId"
-     * ) JournalEntry findLOANJournalEntryWith(@Param("accountId") Long
-     * accountId, @Param("transactionId") String transactionId,
+     * ) JournalEntry findLOANJournalEntryWith(@Param("accountId") Long accountId, @Param("transactionId") String
+     * transactionId,
      *
-     * @Param("transactionDate") Date
-     * transactionDate, @Param("journalEntryType") Integer journalEntryType,
+     * @Param("transactionDate") Date transactionDate, @Param("journalEntryType") Integer journalEntryType,
      *
-     * @Param("loanId") Long loanId, @Param("loanTransactionId") Long
-     * loanTransactionId);
+     * @Param("loanId") Long loanId, @Param("loanTransactionId") Long loanTransactionId);
      */
 }
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 d98a5df..2741eda 100644
--- 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
@@ -41,8 +41,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
- * Implementation of {@link FromApiJsonDeserializer} for
- * {@link JournalEntryCommand}'s.
+ * Implementation of {@link FromApiJsonDeserializer} for {@link JournalEntryCommand}'s.
  */
 @Component
 public final class JournalEntryCommandFromApiJsonDeserializer extends AbstractFromApiJsonDeserializer<JournalEntryCommand> {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccountingProcessorForSavingsFactory.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccountingProcessorForSavingsFactory.java
old mode 100755
new mode 100644
index 1394722..35e7e21
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccountingProcessorForSavingsFactory.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/AccountingProcessorForSavingsFactory.java
@@ -34,9 +34,8 @@ public class AccountingProcessorForSavingsFactory {
     }
 
     /***
-     * Looks like overkill for now, but wanted to keep the savings side of
-     * accounting identical to that of Loans (would we need an Accrual based
-     * accounting in the future?)
+     * Looks like overkill for now, but wanted to keep the savings side of accounting identical to that of Loans (would
+     * we need an Accrual based accounting in the future?)
      ***/
     public AccountingProcessorForSavings determineProcessor(final SavingsDTO savingsDTO) {
 
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 700668e..b555f74 100644
--- 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
@@ -338,11 +338,9 @@ public class AccountingProcessorHelper {
     }
 
     /**
-     * Convenience method that creates a pair of related Debits and Credits for
-     * Accrual Based accounting.
+     * Convenience method that creates a pair of related Debits and Credits for Accrual Based accounting.
      *
-     * The target accounts for debits and credits are switched in case of a
-     * reversal
+     * The target accounts for debits and credits are switched in case of a reversal
      *
      * @param office
      * @param accountTypeToBeDebited
@@ -372,11 +370,9 @@ public class AccountingProcessorHelper {
     }
 
     /**
-     * Convenience method that creates a pair of related Debits and Credits for
-     * Accrual Based accounting.
+     * Convenience method that creates a pair of related Debits and Credits for Accrual Based accounting.
      *
-     * The target accounts for debits and credits are switched in case of a
-     * reversal
+     * The target accounts for debits and credits are switched in case of a reversal
      *
      * @param office
      *            office
@@ -445,11 +441,9 @@ public class AccountingProcessorHelper {
     }
 
     /**
-     * Convenience method that creates a pair of related Debits and Credits for
-     * Cash Based accounting.
+     * Convenience method that creates a pair of related Debits and Credits for Cash Based accounting.
      *
-     * The target accounts for debits and credits are switched in case of a
-     * reversal
+     * The target accounts for debits and credits are switched in case of a reversal
      *
      * @param office
      * @param accountTypeToBeDebited
@@ -480,11 +474,9 @@ public class AccountingProcessorHelper {
     }
 
     /**
-     * Convenience method that creates a pair of related Debits and Credits for
-     * Cash Based accounting.
+     * Convenience method that creates a pair of related Debits and Credits for Cash Based accounting.
      *
-     * The target accounts for debits and credits are switched in case of a
-     * reversal
+     * The target accounts for debits and credits are switched in case of a reversal
      *
      * @param office
      * @param accountTypeToBeDebited
@@ -535,8 +527,7 @@ public class AccountingProcessorHelper {
      */
     public void checkForBranchClosures(final GLClosure latestGLClosure, final Date transactionDate) {
         /**
-         * check if an accounting closure has happened for this branch after the
-         * transaction Date
+         * check if an accounting closure has happened for this branch after the transaction Date
          **/
         if (latestGLClosure != null) {
             if (latestGLClosure.getClosingDate().after(transactionDate) || latestGLClosure.getClosingDate().equals(transactionDate)) {
@@ -573,11 +564,9 @@ public class AccountingProcessorHelper {
     }
 
     /**
-     * Convenience method that creates a pair of related Debits and Credits for
-     * Cash Based accounting.
+     * Convenience method that creates a pair of related Debits and Credits for Cash Based accounting.
      *
-     * The target accounts for debits and credits are switched in case of a
-     * reversal
+     * The target accounts for debits and credits are switched in case of a reversal
      *
      * @param office
      * @param currencyCode
@@ -695,8 +684,7 @@ public class AccountingProcessorHelper {
             final Date transactionDate, final BigDecimal totalAmount, final Boolean isReversal,
             final List<ChargePaymentDTO> chargePaymentDTOs) {
         /***
-         * Map to track each account and the net credit to be made for a
-         * particular account
+         * Map to track each account and the net credit to be made for a particular account
          ***/
         final Map<GLAccount, BigDecimal> creditDetailsMap = new LinkedHashMap<>();
         for (final ChargePaymentDTO chargePaymentDTO : chargePaymentDTOs) {
@@ -736,11 +724,9 @@ public class AccountingProcessorHelper {
     }
 
     /**
-     * Convenience method that creates a pair of related Debits and Credits for
-     * Cash Based accounting.
+     * Convenience method that creates a pair of related Debits and Credits for Cash Based accounting.
      *
-     * The target accounts for debits and credits are switched in case of a
-     * reversal
+     * The target accounts for debits and credits are switched in case of a reversal
      *
      * @param office
      *            office
@@ -775,10 +761,9 @@ public class AccountingProcessorHelper {
         // TODO Vishwas: Remove this validation, as and when appropriate Junit
         // tests are written for accounting
         /**
-         * Accounting module currently supports a single charge per transaction,
-         * throw an error if this is not the case here so any developers
-         * changing the expected portfolio behavior would also take care of
-         * modifying the accounting code appropriately
+         * Accounting module currently supports a single charge per transaction, throw an error if this is not the case
+         * here so any developers changing the expected portfolio behavior would also take care of modifying the
+         * accounting code appropriately
          **/
         if (chargePaymentDTOs.size() != 1) {
             throw new PlatformDataIntegrityException("Recent Portfolio changes w.r.t Charges for Savings have Broken the accounting code",
@@ -1124,9 +1109,8 @@ public class AccountingProcessorHelper {
                     PortfolioProductType.LOAN.getValue(), accountMappingTypeId);
 
             /****
-             * Get more specific mapping for FUND source accounts (based on
-             * payment channels). Note that fund source placeholder ID would be
-             * same for both cash and accrual accounts
+             * Get more specific mapping for FUND source accounts (based on payment channels). Note that fund source
+             * placeholder ID would be same for both cash and accrual accounts
              ***/
             if (accountMappingTypeId == CashAccountsForLoan.FUND_SOURCE.getValue()) {
                 final ProductToGLAccountMapping paymentChannelSpecificAccountMapping = this.accountMappingRepository
@@ -1150,10 +1134,9 @@ public class AccountingProcessorHelper {
         ProductToGLAccountMapping accountMapping = this.accountMappingRepository.findCoreProductToFinAccountMapping(loanProductId,
                 PortfolioProductType.LOAN.getValue(), accountMappingTypeId);
         /*****
-         * Get more specific mappings for Charges and penalties (based on the
-         * actual charge /penalty coupled with the loan product). Note the
-         * income from fees and income from penalties placeholder ID would be
-         * the same for both cash and accrual based accounts
+         * Get more specific mappings for Charges and penalties (based on the actual charge /penalty coupled with the
+         * loan product). Note the income from fees and income from penalties placeholder ID would be the same for both
+         * cash and accrual based accounts
          *****/
 
         // Vishwas TODO: remove this condition as it should always be true
@@ -1174,10 +1157,9 @@ public class AccountingProcessorHelper {
         ProductToGLAccountMapping accountMapping = this.accountMappingRepository.findCoreProductToFinAccountMapping(savingsProductId,
                 PortfolioProductType.SAVING.getValue(), accountMappingTypeId);
         /*****
-         * Get more specific mappings for Charges and penalties (based on the
-         * actual charge /penalty coupled with the loan product). Note the
-         * income from fees and income from penalties placeholder ID would be
-         * the same for both cash and accrual based accounts
+         * Get more specific mappings for Charges and penalties (based on the actual charge /penalty coupled with the
+         * loan product). Note the income from fees and income from penalties placeholder ID would be the same for both
+         * cash and accrual based accounts
          *****/
 
         // Vishwas TODO: remove this condition as it should always be true
@@ -1204,9 +1186,8 @@ public class AccountingProcessorHelper {
             ProductToGLAccountMapping accountMapping = this.accountMappingRepository.findCoreProductToFinAccountMapping(savingsProductId,
                     PortfolioProductType.SAVING.getValue(), accountMappingTypeId);
             /****
-             * Get more specific mapping for FUND source accounts (based on
-             * payment channels). Note that fund source placeholder ID would be
-             * same for both cash and accrual accounts
+             * Get more specific mapping for FUND source accounts (based on payment channels). Note that fund source
+             * placeholder ID would be same for both cash and accrual accounts
              ***/
             if (accountMappingTypeId == CashAccountsForSavings.SAVINGS_REFERENCE.getValue()) {
                 final ProductToGLAccountMapping paymentChannelSpecificAccountMapping = this.accountMappingRepository
@@ -1249,10 +1230,9 @@ public class AccountingProcessorHelper {
         ProductToGLAccountMapping accountMapping = this.accountMappingRepository.findCoreProductToFinAccountMapping(shareProductId,
                 PortfolioProductType.SHARES.getValue(), accountMappingTypeId);
         /*****
-         * Get more specific mappings for Charges and penalties (based on the
-         * actual charge /penalty coupled with the loan product). Note the
-         * income from fees and income from penalties placeholder ID would be
-         * the same for both cash and accrual based accounts
+         * Get more specific mappings for Charges and penalties (based on the actual charge /penalty coupled with the
+         * loan product). Note the income from fees and income from penalties placeholder ID would be the same for both
+         * cash and accrual based accounts
          *****/
 
         final ProductToGLAccountMapping chargeSpecificIncomeAccountMapping = this.accountMappingRepository
@@ -1276,8 +1256,7 @@ public class AccountingProcessorHelper {
             final Long clientId, final Long transactionId, final Date transactionDate, final Boolean isReversal,
             final List<ClientChargePaymentDTO> clientChargePaymentDTOs) {
         /***
-         * Map to track each account affected and the net credit to be made for
-         * a particular account
+         * Map to track each account affected and the net credit to be made for a particular account
          ***/
         final Map<GLAccount, BigDecimal> creditDetailsMap = new LinkedHashMap<>();
         for (final ClientChargePaymentDTO clientChargePaymentDTO : clientChargePaymentDTOs) {
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 6f9079e..5836042 100644
--- 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
@@ -65,8 +65,7 @@ public class AccrualBasedAccountingProcessorForLoan implements AccountingProcess
             }
 
             /***
-             * Handle repayments, repayments at disbursement and reversal of
-             * Repayments and Repayments at disbursement
+             * Handle repayments, repayments at disbursement and reversal of Repayments and Repayments at disbursement
              ***/
             else if (loanTransactionDTO.getTransactionType().isRepayment()
                     || loanTransactionDTO.getTransactionType().isRepaymentAtDisbursement()
@@ -144,35 +143,27 @@ public class AccrualBasedAccountingProcessorForLoan implements AccountingProcess
      * <br/>
      * <br/>
      *
-     * <b>Principal Repayment</b>: Debits "Fund Source" and Credits "Loan
-     * Portfolio"<br/>
+     * <b>Principal Repayment</b>: Debits "Fund Source" and Credits "Loan Portfolio"<br/>
      *
-     * <b>Interest Repayment</b>:Debits "Fund Source" and and Credits
-     * "Receivable Interest" <br/>
+     * <b>Interest Repayment</b>:Debits "Fund Source" and and Credits "Receivable Interest" <br/>
      *
-     * <b>Fee Repayment</b>:Debits "Fund Source" (or "Interest on Loans" in case
-     * of repayment at disbursement) and and Credits "Receivable Fees" <br/>
+     * <b>Fee Repayment</b>:Debits "Fund Source" (or "Interest on Loans" in case of repayment at disbursement) and and
+     * Credits "Receivable Fees" <br/>
      *
-     * <b>Penalty Repayment</b>: Debits "Fund Source" and and Credits
-     * "Receivable Penalties" <br/>
+     * <b>Penalty Repayment</b>: Debits "Fund Source" and and Credits "Receivable Penalties" <br/>
      * <br/>
      * Handles write offs using the following posting rules <br/>
      * <br/>
-     * <b>Principal Write off</b>: Debits "Losses Written Off" and Credits "Loan
-     * Portfolio"<br/>
+     * <b>Principal Write off</b>: Debits "Losses Written Off" and Credits "Loan Portfolio"<br/>
      *
-     * <b>Interest Write off</b>:Debits "Losses Written off" and and Credits
-     * "Receivable Interest" <br/>
+     * <b>Interest Write off</b>:Debits "Losses Written off" and and Credits "Receivable Interest" <br/>
      *
-     * <b>Fee Write off</b>:Debits "Losses Written off" and and Credits
-     * "Receivable Fees" <br/>
+     * <b>Fee Write off</b>:Debits "Losses Written off" and and Credits "Receivable Fees" <br/>
      *
-     * <b>Penalty Write off</b>: Debits "Losses Written off" and and Credits
-     * "Receivable Penalties" <br/>
+     * <b>Penalty Write off</b>: Debits "Losses Written off" and and Credits "Receivable Penalties" <br/>
      * <br/>
      * <br/>
-     * In case the loan transaction has been reversed, all debits are turned
-     * into credits and vice versa
+     * In case the loan transaction has been reversed, all debits are turned into credits and vice versa
      *
      * @param loanTransactionDTO
      * @param loanDTO
@@ -289,8 +280,7 @@ public class AccrualBasedAccountingProcessorForLoan implements AccountingProcess
         }
 
         /**
-         * Single DEBIT transaction for write-offs or Repayments (and their
-         * reversals)
+         * Single DEBIT transaction for write-offs or Repayments (and their reversals)
          ***/
         if (!(totalDebitAmount.compareTo(BigDecimal.ZERO) == 0)) {
             if (writeOff) {
@@ -315,11 +305,9 @@ public class AccrualBasedAccountingProcessorForLoan implements AccountingProcess
     }
 
     /**
-     * Create a single Debit to fund source and a single credit to "Income from
-     * Recovery"
+     * Create a single Debit to fund source and a single credit to "Income from Recovery"
      *
-     * In case the loan transaction is a reversal, all debits are turned into
-     * credits and vice versa
+     * In case the loan transaction is a reversal, all debits are turned into credits and vice versa
      */
     private void createJournalEntriesForRecoveryRepayments(final LoanDTO loanDTO, final LoanTransactionDTO loanTransactionDTO,
             final Office office) {
@@ -345,11 +333,9 @@ public class AccrualBasedAccountingProcessorForLoan implements AccountingProcess
      * Recognize the receivable interest <br/>
      * Debit "Interest Receivable" and Credit "Income from Interest"
      *
-     * <b>Fees:</b> Debit <i>Fees Receivable</i> and credit <i>Income from
-     * Fees</i> <br/>
+     * <b>Fees:</b> Debit <i>Fees Receivable</i> and credit <i>Income from Fees</i> <br/>
      *
-     * <b>Penalties:</b> Debit <i>Penalties Receivable</i> and credit <i>Income
-     * from Penalties</i>
+     * <b>Penalties:</b> Debit <i>Penalties Receivable</i> and credit <i>Income from Penalties</i>
      *
      * Also handles reversals for both fees and payment applications
      *
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 4f24069..e217592 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
@@ -52,11 +52,10 @@ public class CashBasedAccountingProcessorForClientTransactions implements Accoun
     }
 
     /**
-     * Create a single debit to fund source and multiple credits for the income
-     * account mapped with each charge this payment pays off
+     * Create a single debit to fund source and multiple credits for the income account mapped with each charge this
+     * payment pays off
      *
-     * In case the loan transaction is a reversal, all debits are turned into
-     * credits and vice versa
+     * In case the loan transaction is a reversal, all debits are turned into credits and vice versa
      */
     private void createJournalEntriesForChargePayments(final ClientTransactionDTO clientTransactionDTO, final Office office) {
         // client properties
@@ -74,9 +73,8 @@ public class CashBasedAccountingProcessorForClientTransactions implements Accoun
                     transactionId, transactionDate, isReversal, clientTransactionDTO.getChargePayments());
 
             /***
-             * create a single Debit entry (or reversal) for the entire amount
-             * that was credited (accounting is turned on at the level of for
-             * each charge that has been paid by this transaction)
+             * create a single Debit entry (or reversal) for the entire amount that was credited (accounting is turned
+             * on at the level of for each charge that has been paid by this transaction)
              **/
             this.helper.createDebitJournalEntryOrReversalForClientChargePayments(office, currencyCode, clientId, transactionId,
                     transactionDate, totalCreditedAmount, isReversal);
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 22c42d2..bd7d0a3 100644
--- 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
@@ -63,8 +63,8 @@ public class CashBasedAccountingProcessorForLoan implements AccountingProcessorF
                 createJournalEntriesForDisbursements(loanDTO, loanTransactionDTO, office);
             }
             /***
-             * Logic for repayments, repayments at disbursement and reversal of
-             * Repayments and Repayments at disbursement
+             * Logic for repayments, repayments at disbursement and reversal of Repayments and Repayments at
+             * disbursement
              ***/
             else if (loanTransactionDTO.getTransactionType().isRepayment()
                     || loanTransactionDTO.getTransactionType().isRepaymentAtDisbursement()
@@ -82,9 +82,8 @@ public class CashBasedAccountingProcessorForLoan implements AccountingProcessorF
                 createJournalEntriesForRefund(loanDTO, loanTransactionDTO, office);
             }
             /***
-             * Only principal write off affects cash based accounting (interest
-             * and fee write off need not be considered). Debit losses written
-             * off and credit Loan Portfolio
+             * Only principal write off affects cash based accounting (interest and fee write off need not be
+             * considered). Debit losses written off and credit Loan Portfolio
              **/
             else if (loanTransactionDTO.getTransactionType().isWriteOff()) {
                 final BigDecimal principalAmount = loanTransactionDTO.getPrincipal();
@@ -109,8 +108,7 @@ public class CashBasedAccountingProcessorForLoan implements AccountingProcessorF
     /**
      * Debit loan Portfolio and credit Fund source for a Disbursement <br/>
      *
-     * All debits are turned into credits and vice versa in case of disbursement
-     * reversals
+     * All debits are turned into credits and vice versa in case of disbursement reversals
      *
      *
      * @param loanDTO
@@ -149,8 +147,7 @@ public class CashBasedAccountingProcessorForLoan implements AccountingProcessorF
     /**
      * Debit loan Portfolio and credit Fund source for a Disbursement <br/>
      *
-     * All debits are turned into credits and vice versa in case of disbursement
-     * reversals
+     * All debits are turned into credits and vice versa in case of disbursement reversals
      *
      *
      * @param loanDTO
@@ -182,13 +179,11 @@ public class CashBasedAccountingProcessorForLoan implements AccountingProcessorF
     }
 
     /**
-     * Create a single Debit to fund source and multiple credits if applicable
-     * (loan portfolio for principal repayments, Interest on loans for interest
-     * repayments, Income from fees for fees payment and Income from penalties
-     * for penalty payment)
+     * Create a single Debit to fund source and multiple credits if applicable (loan portfolio for principal repayments,
+     * Interest on loans for interest repayments, Income from fees for fees payment and Income from penalties for
+     * penalty payment)
      *
-     * In case the loan transaction is a reversal, all debits are turned into
-     * credits and vice versa
+     * In case the loan transaction is a reversal, all debits are turned into credits and vice versa
      */
     private void createJournalEntriesForRepayments(final LoanDTO loanDTO, final LoanTransactionDTO loanTransactionDTO,
             final Office office) {
@@ -256,11 +251,9 @@ public class CashBasedAccountingProcessorForLoan implements AccountingProcessorF
     }
 
     /**
-     * Create a single Debit to fund source and a single credit to "Income from
-     * Recovery"
+     * Create a single Debit to fund source and a single credit to "Income from Recovery"
      *
-     * In case the loan transaction is a reversal, all debits are turned into
-     * credits and vice versa
+     * In case the loan transaction is a reversal, all debits are turned into credits and vice versa
      */
     private void createJournalEntriesForRecoveryRepayments(final LoanDTO loanDTO, final LoanTransactionDTO loanTransactionDTO,
             final Office office) {
@@ -283,12 +276,10 @@ public class CashBasedAccountingProcessorForLoan implements AccountingProcessorF
     }
 
     /**
-     * Credit loan Portfolio and Debit Suspense Account for a Transfer
-     * Initiation. A Transfer acceptance would be treated the opposite i.e Debit
-     * Loan Portfolio and Credit Suspense Account <br/>
+     * Credit loan Portfolio and Debit Suspense Account for a Transfer Initiation. A Transfer acceptance would be
+     * treated the opposite i.e Debit Loan Portfolio and Credit Suspense Account <br/>
      *
-     * All debits are turned into credits and vice versa in case of Transfer
-     * Initiation disbursals
+     * All debits are turned into credits and vice versa in case of Transfer Initiation disbursals
      *
      *
      * @param loanDTO
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 6d57f7a..746ffe6 100644
--- 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
@@ -146,8 +146,7 @@ public class CashBasedAccountingProcessorForSavings implements AccountingProcess
                         savingsProductId, paymentTypeId, savingsId, transactionId, transactionDate, amount, isReversal);
             }
             /**
-             * Handle Interest Applications and reversals of Interest
-             * Applications
+             * Handle Interest Applications and reversals of Interest Applications
              **/
             else if (savingsTransactionDTO.getTransactionType().isInterestPosting() && savingsTransactionDTO.isOverdraftTransaction()) {
                 // Post journal entry if earned interest amount is greater than
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 c121fd6..15295e0 100644
--- 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
@@ -226,8 +226,8 @@ public class JournalEntryWritePlatformServiceJpaRepositoryImpl implements Journa
     private void validateDebitOrCreditArrayForExistingGLAccount(final GLAccount glaccount,
             final SingleDebitOrCreditEntryCommand[] creditOrDebits) {
         /**
-         * If a glaccount is assigned for a rule the credits or debits array
-         * should have only one entry and it must be same as existing account
+         * If a glaccount is assigned for a rule the credits or debits array should have only one entry and it must be
+         * same as existing account
          */
         if (creditOrDebits.length != 1) {
             throw new JournalEntryInvalidException(GlJournalEntryInvalidReason.INVALID_DEBIT_OR_CREDIT_ACCOUNTS, null, null, null);
@@ -305,8 +305,7 @@ public class JournalEntryWritePlatformServiceJpaRepositoryImpl implements Journa
 
     private void validateGLAccountForTransaction(final GLAccount creditOrDebitAccountHead) {
         /***
-         * validate that the account allows manual adjustments and is not
-         * disabled
+         * validate that the account allows manual adjustments and is not disabled
          **/
         if (creditOrDebitAccountHead.isDisabled()) {
             throw new JournalEntryInvalidException(GlJournalEntryInvalidReason.GL_ACCOUNT_DISABLED, null,
@@ -644,8 +643,8 @@ public class JournalEntryWritePlatformServiceJpaRepositoryImpl implements Journa
     }
 
     /**
-     * TODO: Need a better implementation with guaranteed uniqueness (but not a
-     * long UUID)...maybe something tied to system clock..
+     * TODO: Need a better implementation with guaranteed uniqueness (but not a long UUID)...maybe something tied to
+     * system clock..
      */
     private String generateTransactionId(final Long officeId) {
         final AppUser user = this.context.authenticatedUser();
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/exception/ProductToGLAccountMappingInvalidException.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/exception/ProductToGLAccountMappingInvalidException.java
index acc0740..1d6717b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/exception/ProductToGLAccountMappingInvalidException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/exception/ProductToGLAccountMappingInvalidException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.accounting.producttoaccountmapping.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
- * A {@link RuntimeException} thrown when product to GL account mapping are not
- * found.
+ * A {@link RuntimeException} thrown when product to GL account mapping are not found.
  */
 public class ProductToGLAccountMappingInvalidException extends AbstractPlatformDomainRuleException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/exception/ProductToGLAccountMappingNotFoundException.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/exception/ProductToGLAccountMappingNotFoundException.java
index 35541be..7ea6512 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/exception/ProductToGLAccountMappingNotFoundException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/exception/ProductToGLAccountMappingNotFoundException.java
@@ -22,8 +22,7 @@ import org.apache.fineract.accounting.producttoaccountmapping.domain.PortfolioPr
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
 
 /**
- * A {@link RuntimeException} thrown when product to GL account mapping are not
- * found.
+ * A {@link RuntimeException} thrown when product to GL account mapping are not found.
  */
 public class ProductToGLAccountMappingNotFoundException extends AbstractPlatformResourceNotFoundException {
 
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 67f12f2..e53fb60 100644
--- 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
@@ -47,25 +47,21 @@ import org.springframework.stereotype.Component;
 /**
  * TODO Vishwas find a better approach for validation
  *
- * Currently, validation of the passed in JSON is done before calling save or
- * update method on the target resource (in our case the loan Product)
+ * Currently, validation of the passed in JSON is done before calling save or update method on the target resource (in
+ * our case the loan Product)
  *
- * However, in the case of a loan product it would be difficult to validate the
- * passed in JSON for valid {@link LoanProduct} to {@link GLAccount} mappings
- * during update because of the following scenario
+ * However, in the case of a loan product it would be difficult to validate the passed in JSON for valid
+ * {@link LoanProduct} to {@link GLAccount} mappings during update because of the following scenario
  *
- * The accounting rule type may be changed in the update command, so we would
- * have to validate if all required account heads for a particular account type
- * have been passed in (would be different for CASH and Accrual based). However,
- * till we have access to the domain object it would not be possible to detect
- * if an accounting rule has actually been changed
+ * The accounting rule type may be changed in the update command, so we would have to validate if all required account
+ * heads for a particular account type have been passed in (would be different for CASH and Accrual based). However,
+ * till we have access to the domain object it would not be possible to detect if an accounting rule has actually been
+ * changed
  *
- * Hence, method {@link #validateForLoanProductCreate(String)} from this class
- * is called separately for validation only if an accounting rule change is
- * detected by {@link ProductToGLAccountMappingWritePlatformService}
+ * Hence, method {@link #validateForLoanProductCreate(String)} from this class is called separately for validation only
+ * if an accounting rule change is detected by {@link ProductToGLAccountMappingWritePlatformService}
  *
- * Also, the class is probably named wrong (*FromApiJsonDeserializer) should
- * probably be named as (*Validator) instead
+ * Also, the class is probably named wrong (*FromApiJsonDeserializer) should probably be named as (*Validator) instead
  *
  */
 @Component
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 8e6f2f5..9dd074e 100644
--- 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
@@ -212,8 +212,7 @@ public class LoanProductToGLAccountMappingHelper extends ProductToGLAccountMappi
     }
 
     /**
-     * Examines and updates each account mapping for given loan product with
-     * changes passed in from the Json element
+     * Examines and updates each account mapping for given loan product with changes passed in from the Json element
      *
      * @param loanProductId
      * @param changes
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 d8c9fba..2db50c5 100644
--- 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
@@ -127,8 +127,8 @@ public class ProductToGLAccountMappingHelper {
     }
 
     /**
-     * Saves the payment type to Fund source mappings for a particular
-     * product/product type (also populates the changes array if passed in)
+     * Saves the payment type to Fund source mappings for a particular product/product type (also populates the changes
+     * array if passed in)
      *
      * @param command
      * @param element
@@ -154,8 +154,8 @@ public class ProductToGLAccountMappingHelper {
     }
 
     /**
-     * Saves the Charge to Income / Liability account mappings for a particular
-     * product/product type (also populates the changes array if passed in)
+     * Saves the Charge to Income / Liability account mappings for a particular product/product type (also populates the
+     * changes array if passed in)
      *
      * @param command
      * @param element
@@ -210,14 +210,12 @@ public class ProductToGLAccountMappingHelper {
 
         final JsonArray chargeToIncomeAccountMappingArray = this.fromApiJsonHelper.extractJsonArrayNamed(arrayFragmentName, element);
         /**
-         * Variable stores a map representation of charges (key) and their
-         * associated income Id's (value) extracted from the passed in
-         * Jsoncommand
+         * Variable stores a map representation of charges (key) and their associated income Id's (value) extracted from
+         * the passed in Jsoncommand
          **/
         final Map<Long, Long> inputChargeToIncomeAccountMap = new HashMap<>();
         /***
-         * Variable stores all charges which have already been mapped to Income
-         * Accounts in the system
+         * Variable stores all charges which have already been mapped to Income Accounts in the system
          **/
         final Set<Long> existingCharges = new HashSet<>();
         if (chargeToIncomeAccountMappingArray != null) {
@@ -238,10 +236,8 @@ public class ProductToGLAccountMappingHelper {
             } /**
                * Else, <br/>
                * update existing mappings OR <br/>
-               * delete old mappings (which are already present, but not passed
-               * in as a part of Jsoncommand)<br/>
-               * Create new mappings for charges that are passed in as a part of
-               * the Jsoncommand but not already present
+               * delete old mappings (which are already present, but not passed in as a part of Jsoncommand)<br/>
+               * Create new mappings for charges that are passed in as a part of the Jsoncommand but not already present
                *
                **/
             else {
@@ -296,13 +292,12 @@ public class ProductToGLAccountMappingHelper {
         final JsonArray paymentChannelMappingArray = this.fromApiJsonHelper
                 .extractJsonArrayNamed(LoanProductAccountingParams.PAYMENT_CHANNEL_FUND_SOURCE_MAPPING.getValue(), element);
         /**
-         * Variable stores a map representation of Payment channels (key) and
-         * their fund sources (value) extracted from the passed in Jsoncommand
+         * Variable stores a map representation of Payment channels (key) and their fund sources (value) extracted from
+         * the passed in Jsoncommand
          **/
         final Map<Long, Long> inputPaymentChannelFundSourceMap = new HashMap<>();
         /***
-         * Variable stores all payment types which have already been mapped to
-         * Fund Sources in the system
+         * Variable stores all payment types which have already been mapped to Fund Sources in the system
          **/
         final Set<Long> existingPaymentTypes = new HashSet<>();
         if (paymentChannelMappingArray != null) {
@@ -324,10 +319,9 @@ public class ProductToGLAccountMappingHelper {
             } /**
                * Else, <br/>
                * update existing mappings OR <br/>
-               * delete old mappings (which re already present, but not passed
-               * in as a part of Jsoncommand)<br/>
-               * Create new mappings for payment types that are passed in as a
-               * part of the Jsoncommand but not already present
+               * delete old mappings (which re already present, but not passed in as a part of Jsoncommand)<br/>
+               * Create new mappings for payment types that are passed in as a part of the Jsoncommand but not already
+               * present
                *
                **/
             else {
@@ -388,8 +382,7 @@ public class ProductToGLAccountMappingHelper {
 
         GLAccount glAccount;
         /**
-         * Both CASH and Accrual placeholders have the same value for income
-         * from Interest and penalties
+         * Both CASH and Accrual placeholders have the same value for income from Interest and penalties
          **/
         CashAccountsForLoan placeHolderAccountType;
         if (isPenalty) {
@@ -415,8 +408,8 @@ public class ProductToGLAccountMappingHelper {
     }
 
     /**
-     * Fetches account with a particular Id and throws and Exception it is not
-     * of the expected Account Category ('ASSET','liability' etc)
+     * Fetches account with a particular Id and throws and Exception it is not of the expected Account Category
+     * ('ASSET','liability' etc)
      *
      * @param paramName
      * @param expectedAccountType
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 8d87f3f..a745a28 100644
--- 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
@@ -288,16 +288,15 @@ public class ProductToGLAccountMappingWritePlatformServiceImpl implements Produc
     public Map<String, Object> updateLoanProductToGLAccountMapping(final Long loanProductId, final JsonCommand command,
             final boolean accountingRuleChanged, final int accountingRuleTypeId) {
         /***
-         * Variable tracks all accounting mapping properties that have been
-         * updated
+         * Variable tracks all accounting mapping properties that have been updated
          ***/
         Map<String, Object> changes = new HashMap<>();
         final JsonElement element = this.fromApiJsonHelper.parse(command.json());
         final AccountingRuleType accountingRuleType = AccountingRuleType.fromInt(accountingRuleTypeId);
 
         /***
-         * If the accounting rule has been changed, delete all existing mapping
-         * for the product and recreate a new set of mappings
+         * If the accounting rule has been changed, delete all existing mapping for the product and recreate a new set
+         * of mappings
          ***/
         if (accountingRuleChanged) {
             this.deserializer.validateForLoanProductCreate(command.json());
@@ -319,16 +318,15 @@ public class ProductToGLAccountMappingWritePlatformServiceImpl implements Produc
     public Map<String, Object> updateSavingsProductToGLAccountMapping(final Long savingsProductId, final JsonCommand command,
             final boolean accountingRuleChanged, final int accountingRuleTypeId, final DepositAccountType accountType) {
         /***
-         * Variable tracks all accounting mapping properties that have been
-         * updated
+         * Variable tracks all accounting mapping properties that have been updated
          ***/
         Map<String, Object> changes = new HashMap<>();
         final JsonElement element = this.fromApiJsonHelper.parse(command.json());
         final AccountingRuleType accountingRuleType = AccountingRuleType.fromInt(accountingRuleTypeId);
 
         /***
-         * If the accounting rule has been changed, delete all existing mapping
-         * for the product and recreate a new set of mappings
+         * If the accounting rule has been changed, delete all existing mapping for the product and recreate a new set
+         * of mappings
          ***/
         if (accountingRuleChanged) {
             this.deserializer.validateForSavingsProductCreate(command.json(), accountType);
@@ -351,16 +349,15 @@ public class ProductToGLAccountMappingWritePlatformServiceImpl implements Produc
     public Map<String, Object> updateShareProductToGLAccountMapping(final Long shareProductId, final JsonCommand command,
             final boolean accountingRuleChanged, final int accountingRuleTypeId) {
         /***
-         * Variable tracks all accounting mapping properties that have been
-         * updated
+         * Variable tracks all accounting mapping properties that have been updated
          ***/
         Map<String, Object> changes = new HashMap<>();
         final JsonElement element = this.fromApiJsonHelper.parse(command.json());
         final AccountingRuleType accountingRuleType = AccountingRuleType.fromInt(accountingRuleTypeId);
 
         /***
-         * If the accounting rule has been changed, delete all existing mapping
-         * for the product and recreate a new set of mappings
+         * If the accounting rule has been changed, delete all existing mapping for the product and recreate a new set
+         * of mappings
          ***/
         if (accountingRuleChanged) {
             this.shareProductToGLAccountMappingHelper.deleteSharesProductToGLAccountMapping(shareProductId);
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 0fd9f9e..37a4dc8 100644
--- 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
@@ -177,8 +177,7 @@ public class SavingsProductToGLAccountMappingHelper extends ProductToGLAccountMa
     }
 
     /**
-     * Examines and updates each account mapping for given loan product with
-     * changes passed in from the Json element
+     * Examines and updates each account mapping for given loan product with changes passed in from the Json element
      *
      * @param savingsProductId
      * @param changes
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 be60910..0ec0483 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
@@ -154,8 +154,7 @@ public class ShareProductToGLAccountMappingHelper extends ProductToGLAccountMapp
     }
 
     /**
-     * Examines and updates each account mapping for given loan product with
-     * changes passed in from the Json element
+     * Examines and updates each account mapping for given loan product with changes passed in from the Json element
      *
      * @param sharesProductId
      * @param changes
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 655e608..70cc8e7 100644
--- 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
@@ -29,8 +29,7 @@ import org.apache.fineract.organisation.office.data.OfficeData;
 /**
  * Immutable object representing a General Ledger Account
  *
- * Note: no getter/setters required as google-gson will produce json from fields
- * of object.
+ * Note: no getter/setters required as google-gson will produce json from fields of object.
  */
 public class AccountingRuleData {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/exception/AccountingRuleDuplicateException.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/exception/AccountingRuleDuplicateException.java
index 7cd76a2..6bc678f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/exception/AccountingRuleDuplicateException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/exception/AccountingRuleDuplicateException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.accounting.rule.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
- * A {@link RuntimeException} thrown when an Accounting rule with a given name
- * already exists
+ * A {@link RuntimeException} thrown when an Accounting rule with a given name already exists
  */
 public class AccountingRuleDuplicateException extends AbstractPlatformDomainRuleException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/exception/AccountingRuleNotFoundException.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/exception/AccountingRuleNotFoundException.java
index 2936799..0768b46 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/exception/AccountingRuleNotFoundException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/exception/AccountingRuleNotFoundException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.accounting.rule.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
 
 /**
- * A {@link RuntimeException} thrown when Accounting rule resources are not
- * found.
+ * A {@link RuntimeException} thrown when Accounting rule resources are not found.
  */
 public class AccountingRuleNotFoundException extends AbstractPlatformResourceNotFoundException {
 
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 4bf6842..5daf44e 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
@@ -59,8 +59,7 @@ import org.springframework.stereotype.Component;
 public class AdHocApiResource {
 
     /**
-     * The set of parameters that are supported in response for
-     * {@link AdhocData}
+     * The set of parameters that are supported in response for {@link AdhocData}
      */
     private final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList("id", "name", "query", "tableName", "tableField",
             "isActive", "createdBy", "createdOn", "createdById", "updatedById", "updatedOn", "email"));
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 bdf513e..08930ea 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
@@ -139,12 +139,9 @@ public final class AdHocDataValidator {
             baseDataValidator.reset().parameter("reportRunEvery").value(reportRunEvery).integerGreaterThanZero();
         }
         /*
-         * if (this.fromApiJsonHelper.parameterExists("isActive", element)) {
-         * final Integer isActive =
-         * this.fromApiJsonHelper.extractIntegerNamed("isActive", element,
-         * Locale.getDefault());
-         * baseDataValidator.reset().parameter("isActive").value(isActive).
-         * notNull().inMinMaxRange(1, 2); }
+         * if (this.fromApiJsonHelper.parameterExists("isActive", element)) { final Integer isActive =
+         * this.fromApiJsonHelper.extractIntegerNamed("isActive", element, Locale.getDefault());
+         * baseDataValidator.reset().parameter("isActive").value(isActive). notNull().inMinMaxRange(1, 2); }
          */
 
         throwExceptionIfValidationWarningsExist(dataValidationErrors);
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 beeefa9..cd58612 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
@@ -73,8 +73,7 @@ public class AdHocWritePlatformServiceJpaRepositoryImpl implements AdHocWritePla
     }
 
     /*
-     * Guaranteed to throw an exception no matter what the data integrity issue
-     * is.
+     * Guaranteed to throw an exception no matter what the data integrity issue is.
      */
     private void handleDataIntegrityIssues(final JsonCommand command, final DataIntegrityViolationException dve) {
 
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 3a7ecd6..2cf8553 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
@@ -50,12 +50,10 @@ import org.springframework.stereotype.Component;
 
 /**
  * Provides a REST resource for Batch Requests. This class acts as a proxy to
- * {@link org.apache.fineract.batch.service.BatchApiService} and de-serializes
- * the incoming JSON string to a list of
- * {@link org.apache.fineract.batch.domain .BatchRequest} type. This list is
- * forwarded to BatchApiService which finally returns a list of
- * {@link org.apache.fineract.batch.domain.BatchResponse} type which is then
- * serialized into JSON response by this Resource class.
+ * {@link org.apache.fineract.batch.service.BatchApiService} and de-serializes the incoming JSON string to a list of
+ * {@link org.apache.fineract.batch.domain .BatchRequest} type. This list is forwarded to BatchApiService which finally
+ * returns a list of {@link org.apache.fineract.batch.domain.BatchResponse} type which is then serialized into JSON
+ * response by this Resource class.
  *
  * @author Rishabh Shukla
  *
@@ -83,8 +81,7 @@ public class BatchApiResource {
     private final BatchRequestJsonHelper batchRequestJsonHelper;
 
     /**
-     * Constructs a 'BatchApiService' with context, toApiJsonSerializer, service
-     * and batchRequestJsonHelper.
+     * Constructs a 'BatchApiService' with context, toApiJsonSerializer, service and batchRequestJsonHelper.
      *
      * @param context
      * @param toApiJsonSerializer
@@ -102,8 +99,7 @@ public class BatchApiResource {
     }
 
     /**
-     * Rest assured POST method to get {@link BatchRequest} and returns back the
-     * consolidated {@link BatchResponse}
+     * Rest assured POST method to get {@link BatchRequest} and returns back the consolidated {@link BatchResponse}
      *
      * @param jsonRequestString
      * @param enclosingTransaction
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandContext.java b/fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandContext.java
index 5ee2dc3..010943a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandContext.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/command/CommandContext.java
@@ -19,10 +19,8 @@
 package org.apache.fineract.batch.command;
 
 /**
- * Provides an object to
- * {@link org.apache.fineract.batch.service.BatchApiService} to get the proper
- * commandStrategy for each request in BatchRequest. It uses Builder pattern to
- * create object of this type.
+ * Provides an object to {@link org.apache.fineract.batch.service.BatchApiService} to get the proper commandStrategy for
+ * each request in BatchRequest. It uses Builder pattern to create object of this type.
  *
  * @author Rishabh Shukla
  *
@@ -69,9 +67,8 @@ public final class CommandContext {
     }
 
     /**
-     * Returns a boolean value if the relativeUrl 'matches' one of the regex
-     * keys in the available commandStrategies. It take CommandContext object as
-     * parameter which contains a 'resource' member as a regex key for available
+     * Returns a boolean value if the relativeUrl 'matches' one of the regex keys in the available commandStrategies. It
+     * take CommandContext object as parameter which contains a 'resource' member as a regex key for available
      * commandStrategies.
      *
      * @param other
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 01fa6ed..62cf789 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
@@ -23,8 +23,8 @@ import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
 
 /**
- * An interface for various Command Strategies. It contains a single function
- * which returns appropriate response from a particular command strategy.
+ * An interface for various Command Strategies. It contains a single function which returns appropriate response from a
+ * particular command strategy.
  *
  * @author Rishabh Shukla
  *
@@ -33,10 +33,8 @@ import org.apache.fineract.batch.domain.BatchResponse;
 public interface CommandStrategy {
 
     /**
-     * Returns an object of type
-     * {@link org.apache.fineract.batch.domain.BatchResponse}. This takes
-     * {@link org.apache.fineract.batch.domain.BatchRequest} as it's single
-     * argument and provides appropriate response.
+     * Returns an object of type {@link org.apache.fineract.batch.domain.BatchResponse}. This takes
+     * {@link org.apache.fineract.batch.domain.BatchRequest} as it's single argument and provides appropriate response.
      *
      * @param batchRequest
      * @param uriInfo
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 4aa4301..47877d7 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
@@ -25,8 +25,8 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
 
 /**
- * Provides an appropriate CommandStrategy using the 'method' and 'resourceUrl'.
- * CommandStrategy bean is created using Spring Application Context.
+ * Provides an appropriate CommandStrategy using the 'method' and 'resourceUrl'. CommandStrategy bean is created using
+ * Spring Application Context.
  *
  * @author Rishabh Shukla
  *
@@ -39,9 +39,8 @@ public class CommandStrategyProvider {
     private final ConcurrentHashMap<CommandContext, String> commandStrategies = new ConcurrentHashMap<>();
 
     /**
-     * Constructs a CommandStrategyProvider with argument of ApplicationContext
-     * type. It also initialize commandStrategies using init() function by
-     * filling it with available CommandStrategies in
+     * Constructs a CommandStrategyProvider with argument of ApplicationContext type. It also initialize
+     * commandStrategies using init() function by filling it with available CommandStrategies in
      * {@link org.apache.fineract.batch.command.internal}.
      *
      * @param applicationContext
@@ -56,9 +55,8 @@ public class CommandStrategyProvider {
     }
 
     /**
-     * Returns an appropriate commandStrategy after determining it using the
-     * CommandContext of the request. If no such Strategy is found then a
-     * default strategy is returned back.
+     * Returns an appropriate commandStrategy after determining it using the CommandContext of the request. If no such
+     * Strategy is found then a default strategy is returned back.
      *
      * @param commandContext
      * @return CommandStrategy
@@ -80,10 +78,8 @@ public class CommandStrategyProvider {
     }
 
     /**
-     * Contains various available command strategies in
-     * {@link org.apache.fineract.batch.command.internal}. Any new command
-     * Strategy will have to be added within this function in order to initiate
-     * it within the constructor.
+     * Contains various available command strategies in {@link org.apache.fineract.batch.command.internal}. Any new
+     * command Strategy will have to be added within this function in order to initiate it within the constructor.
      */
     private void init() {
         this.commandStrategies.put(CommandContext.resource("clients").method("POST").build(), "createClientCommandStrategy");
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 1d8dadf..934641e 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
@@ -31,13 +31,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
- * Implements {@link org.apache.fineract.batch.command.CommandStrategy} to
- * handle activation of a pending client. It passes the contents of the body
- * from the BatchRequest to
- * {@link org.apache.fineract.portfolio.client.api.ClientsApiResource} and gets
- * back the response. This class will also catch any errors raised by
- * {@link org.apache.fineract.portfolio.client.api.ClientsApiResource} and map
- * those errors to appropriate status codes in BatchResponse.
+ * Implements {@link org.apache.fineract.batch.command.CommandStrategy} to handle activation of a pending client. It
+ * passes the contents of the body from the BatchRequest to
+ * {@link org.apache.fineract.portfolio.client.api.ClientsApiResource} and gets back the response. This class will also
+ * catch any errors raised by {@link org.apache.fineract.portfolio.client.api.ClientsApiResource} and map those errors
+ * to appropriate status codes in BatchResponse.
  *
  * @author Rishabh Shukla
  *
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 49142b2..5d5b1b8 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
@@ -29,13 +29,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
- * Implements {@link org.apache.fineract.batch.command.CommandStrategy} and
- * applies a new loan on an existing client. It passes the contents of the body
- * from the BatchRequest to
- * {@link org.apache.fineract.portfolio.loanaccount.api.LoansApiResource} and
- * gets back the response. This class will also catch any errors raised by
- * {@link org.apache.fineract.portfolio.loanaccount.api.LoansApiResource} and
- * map those errors to appropriate status codes in BatchResponse.
+ * Implements {@link org.apache.fineract.batch.command.CommandStrategy} and applies a new loan on an existing client. It
+ * passes the contents of the body from the BatchRequest to
+ * {@link org.apache.fineract.portfolio.loanaccount.api.LoansApiResource} and gets back the response. This class will
+ * also catch any errors raised by {@link org.apache.fineract.portfolio.loanaccount.api.LoansApiResource} and map those
+ * errors to appropriate status codes in BatchResponse.
  *
  * @author Rishabh Shukla
  *
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 042a5e9..e7a5df0 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
@@ -29,13 +29,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
- * Implements {@link org.apache.fineract.batch.command.CommandStrategy} and
- * applies a new savings on an existing client. It passes the contents of the
- * body from the BatchRequest to
- * {@link org.apache.fineract.portfolio.savings.api.SavingsAccountsApiResource}
- * and gets back the response. This class will also catch any errors raised by
- * {@link org.apache.fineract.portfolio.savings.api.SavingsAccountsApiResource}
- * and map those errors to appropriate status codes in BatchResponse.
+ * Implements {@link org.apache.fineract.batch.command.CommandStrategy} and applies a new savings on an existing client.
+ * It passes the contents of the body from the BatchRequest to
+ * {@link org.apache.fineract.portfolio.savings.api.SavingsAccountsApiResource} and gets back the response. This class
+ * will also catch any errors raised by {@link org.apache.fineract.portfolio.savings.api.SavingsAccountsApiResource} and
+ * map those errors to appropriate status codes in BatchResponse.
  *
  * @author Rishabh Shukla
  *
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 5b5ad34..111e1f7 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
@@ -31,13 +31,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
- * Implements {@link org.apache.fineract.batch.command.CommandStrategy} to
- * handle approval of a pending loan. It passes the contents of the body from
- * the BatchRequest to
- * {@link org.apache.fineract.portfolio.loanaccount.api.LoansApiResource} and
- * gets back the response. This class will also catch any errors raised by
- * {@link org.apache.fineract.portfolio.loanaccount.api.LoansApiResource} and
- * map those errors to appropriate status codes in BatchResponse.
+ * Implements {@link org.apache.fineract.batch.command.CommandStrategy} to handle approval of a pending loan. It passes
+ * the contents of the body from the BatchRequest to
+ * {@link org.apache.fineract.portfolio.loanaccount.api.LoansApiResource} and gets back the response. This class will
+ * also catch any errors raised by {@link org.apache.fineract.portfolio.loanaccount.api.LoansApiResource} and map those
+ * errors to appropriate status codes in BatchResponse.
  *
  * @author Rishabh Shukla
  *
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 197d6dd..4fdebcc 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
@@ -31,13 +31,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
- * Implements {@link org.apache.fineract.batch.command.CommandStrategy} and
- * Collect Charges for a Loan. It passes the contents of the body from the
- * BatchRequest to
- * {@link org.apache.fineract.portfolio.loanaccount.api.LoanChargesApiResource}
- * and gets back the response. This class will also catch any errors raised by
- * {@link org.apache.fineract.portfolio.loanaccount.api.LoanChargesApiResource}
- * and map those errors to appropriate status codes in BatchResponse.
+ * Implements {@link org.apache.fineract.batch.command.CommandStrategy} and Collect Charges for a Loan. It passes the
+ * contents of the body from the BatchRequest to
+ * {@link org.apache.fineract.portfolio.loanaccount.api.LoanChargesApiResource} and gets back the response. This class
+ * will also catch any errors raised by {@link org.apache.fineract.portfolio.loanaccount.api.LoanChargesApiResource} and
+ * map those errors to appropriate status codes in BatchResponse.
  *
  * @author Rishabh Shukla
  *
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 39b1867..479f02d 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
@@ -31,13 +31,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
- * Implements {@link org.apache.fineract.batch.command.CommandStrategy} and
- * Create Charge for a Loan. It passes the contents of the body from the
- * BatchRequest to
- * {@link org.apache.fineract.portfolio.loanaccount.api.LoanChargesApiResource}
- * and gets back the response. This class will also catch any errors raised by
- * {@link org.apache.fineract.portfolio.loanaccount.api.LoanChargesApiResource}
- * and map those errors to appropriate status codes in BatchResponse.
+ * Implements {@link org.apache.fineract.batch.command.CommandStrategy} and Create Charge for a Loan. It passes the
+ * contents of the body from the BatchRequest to
+ * {@link org.apache.fineract.portfolio.loanaccount.api.LoanChargesApiResource} and gets back the response. This class
+ * will also catch any errors raised by {@link org.apache.fineract.portfolio.loanaccount.api.LoanChargesApiResource} and
+ * map those errors to appropriate status codes in BatchResponse.
  *
  * @author Rishabh Shukla
  *
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 d599212..4002589 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
@@ -29,13 +29,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
- * Implements {@link org.apache.fineract.batch.command.CommandStrategy} to
- * handle creation of a new client. It passes the contents of the body from the
- * BatchRequest to
- * {@link org.apache.fineract.portfolio.client.api.ClientsApiResource} and gets
- * back the response. This class will also catch any errors raised by
- * {@link org.apache.fineract.portfolio.client.api.ClientsApiResource} and map
- * those errors to appropriate status codes in BatchResponse.
+ * Implements {@link org.apache.fineract.batch.command.CommandStrategy} to handle creation of a new client. It passes
+ * the contents of the body from the BatchRequest to {@link org.apache.fineract.portfolio.client.api.ClientsApiResource}
+ * and gets back the response. This class will also catch any errors raised by
+ * {@link org.apache.fineract.portfolio.client.api.ClientsApiResource} and map those errors to appropriate status codes
+ * in BatchResponse.
  *
  * @author Rishabh Shukla
  *
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 f9074c1..0ac7d82 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
@@ -31,13 +31,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
- * Implements {@link org.apache.fineract.batch.command.CommandStrategy} to
- * handle disburse of a loan. It passes the contents of the body from the
- * BatchRequest to
- * {@link org.apache.fineract.portfolio.loanaccount.api.LoansApiResource} and
- * gets back the response. This class will also catch any errors raised by
- * {@link org.apache.fineract.portfolio.loanaccount.api.LoansApiResource} and
- * map those errors to appropriate status codes in BatchResponse.
+ * Implements {@link org.apache.fineract.batch.command.CommandStrategy} to handle disburse of a loan. It passes the
+ * contents of the body from the BatchRequest to {@link org.apache.fineract.portfolio.loanaccount.api.LoansApiResource}
+ * and gets back the response. This class will also catch any errors raised by
+ * {@link org.apache.fineract.portfolio.loanaccount.api.LoansApiResource} and map those errors to appropriate status
+ * codes in BatchResponse.
  *
  * @author Rishabh Shukla
  *
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 f0b0194..65c8801 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
@@ -31,11 +31,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
- * Implements {@link CommandStrategy} and handles repayment for a Loan. It
- * passes the contents of the body from the BatchRequest to
- * {@link LoanTransactionsApiResource} and gets back the response. This class
- * will also catch any errors raised by {@link LoanTransactionsApiResource} and
- * map those errors to appropriate status codes in BatchResponse.
+ * Implements {@link CommandStrategy} and handles repayment for a Loan. It passes the contents of the body from the
+ * BatchRequest to {@link LoanTransactionsApiResource} and gets back the response. This class will also catch any errors
+ * raised by {@link LoanTransactionsApiResource} and map those errors to appropriate status codes in BatchResponse.
  *
  * @author Mohit Sinha
  *
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 d19dc5d..e76857d 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
@@ -25,9 +25,8 @@ import org.apache.fineract.batch.domain.BatchResponse;
 import org.springframework.stereotype.Component;
 
 /**
- * Provides a default CommandStrategy by implementing
- * {@link org.apache.fineract.batch.command.CommandStrategy} in case there is no
- * appropriate command strategy with requested 'method' and 'resoureUrl'.
+ * Provides a default CommandStrategy by implementing {@link org.apache.fineract.batch.command.CommandStrategy} in case
+ * there is no appropriate command strategy with requested 'method' and 'resoureUrl'.
  *
  * @author Rishabh Shukla
  */
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 470a63e..e09ea4c 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
@@ -29,13 +29,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
- * Implements {@link org.apache.fineract.batch.command.CommandStrategy} and
- * updates the information of an existing client. It passes the contents of the
- * body from the BatchRequest to
- * {@link org.apache.fineract.portfolio.client.api.ClientsApiResource} and gets
- * back the response. This class will also catch any errors raised by
- * {@link org.apache.fineract.portfolio.client.api.ClientsApiResource} and map
- * those errors to appropriate status codes in BatchResponse.
+ * Implements {@link org.apache.fineract.batch.command.CommandStrategy} and updates the information of an existing
+ * client. It passes the contents of the body from the BatchRequest to
+ * {@link org.apache.fineract.portfolio.client.api.ClientsApiResource} and gets back the response. This class will also
+ * catch any errors raised by {@link org.apache.fineract.portfolio.client.api.ClientsApiResource} and map those errors
+ * to appropriate status codes in BatchResponse.
  *
  * @author Rishabh Shukla
  *
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/domain/BatchRequest.java b/fineract-provider/src/main/java/org/apache/fineract/batch/domain/BatchRequest.java
index b5a48ec..c172cd6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/domain/BatchRequest.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/domain/BatchRequest.java
@@ -21,10 +21,9 @@ package org.apache.fineract.batch.domain;
 import java.util.Set;
 
 /**
- * Provides an object for separate HTTP requests in the Batch Request for Batch
- * API. A requestId is also included as data field which takes care of
- * dependency issues among various requests. This class also provides getter and
- * setter functions to access Batch Request data fields.
+ * Provides an object for separate HTTP requests in the Batch Request for Batch API. A requestId is also included as
+ * data field which takes care of dependency issues among various requests. This class also provides getter and setter
+ * functions to access Batch Request data fields.
  *
  * @author Rishabh Shukla
  *
@@ -41,8 +40,8 @@ public class BatchRequest {
     private String body;
 
     /**
-     * Constructs a 'BatchRequest' with requestId, relativeUrl, method, headers,
-     * reference and body of the incoming request.
+     * Constructs a 'BatchRequest' with requestId, relativeUrl, method, headers, reference and body of the incoming
+     * request.
      *
      * @param requestId
      *            of HTTP request.
@@ -131,8 +130,7 @@ public class BatchRequest {
     }
 
     /**
-     * Returns the values of 'headers' of {@link Header} type of an object of
-     * this class.
+     * Returns the values of 'headers' of {@link Header} type of an object of this class.
      *
      * @return headers of the HTTP request.
      * @see Header
@@ -142,8 +140,7 @@ public class BatchRequest {
     }
 
     /**
-     * Sets the values of 'headers' of {@link Header} type of an object of this
-     * class.
+     * Sets the values of 'headers' of {@link Header} type of an object of this class.
      *
      * @param headers
      * @see Header
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/domain/BatchResponse.java b/fineract-provider/src/main/java/org/apache/fineract/batch/domain/BatchResponse.java
index faf83b6..73cbb8b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/domain/BatchResponse.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/domain/BatchResponse.java
@@ -21,10 +21,9 @@ package org.apache.fineract.batch.domain;
 import java.util.Set;
 
 /**
- * Provides an object for separate HTTP responses in the Batch Response for
- * Batch API. It contains all the information about a particular HTTP response
- * in the Batch Response. Getter and Setter functions are also included to
- * access response data fields.
+ * Provides an object for separate HTTP responses in the Batch Response for Batch API. It contains all the information
+ * about a particular HTTP response in the Batch Response. Getter and Setter functions are also included to access
+ * response data fields.
  *
  * @author Rishabh Shukla
  *
@@ -40,8 +39,7 @@ public class BatchResponse {
     private String body;
 
     /**
-     * Constructs a 'BatchResponse' with requestId, statusCode, headers and body
-     * of the HTTP requests.
+     * Constructs a 'BatchResponse' with requestId, statusCode, headers and body of the HTTP requests.
      *
      * @param requestId
      * @param statusCode
@@ -110,8 +108,7 @@ public class BatchResponse {
     }
 
     /**
-     * Sets the value of 'headers' of {@link Header} type of an object of this
-     * class.
+     * Sets the value of 'headers' of {@link Header} type of an object of this class.
      *
      * @param headers
      *            of {@link Header} Type
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/domain/Header.java b/fineract-provider/src/main/java/org/apache/fineract/batch/domain/Header.java
index a3c029e..48b61c6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/domain/Header.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/domain/Header.java
@@ -19,9 +19,8 @@
 package org.apache.fineract.batch.domain;
 
 /**
- * Provides an object to handle HTTP headers as name and value pairs for Batch
- * API. It is used in {@link BatchRequest} and {@link BatchResponse} to store
- * the information regarding the headers in incoming and outgoing JSON Strings.
+ * Provides an object to handle HTTP headers as name and value pairs for Batch API. It is used in {@link BatchRequest}
+ * and {@link BatchResponse} to store the information regarding the headers in incoming and outgoing JSON Strings.
  *
  * @author Rishabh Shukla
  *
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 9bf21ea..df4d37b 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
@@ -38,11 +38,9 @@ import org.springframework.dao.NonTransientDataAccessException;
 import org.springframework.transaction.TransactionException;
 
 /**
- * Provides an Error Handler method that returns an object of type
- * {@link ErrorInfo} to the CommandStrategy which raised the exception. This
- * class uses various subclasses of RuntimeException to check the kind of
- * exception raised and provide appropriate status and error codes for each one
- * of the raised exception.
+ * Provides an Error Handler method that returns an object of type {@link ErrorInfo} to the CommandStrategy which raised
+ * the exception. This class uses various subclasses of RuntimeException to check the kind of exception raised and
+ * provide appropriate status and error codes for each one of the raised exception.
  *
  * @author Rishabh Shukla
  *
@@ -61,8 +59,7 @@ public class ErrorHandler extends RuntimeException {
     }
 
     /**
-     * Returns an object of ErrorInfo type containing the information regarding
-     * the raised error.
+     * Returns an object of ErrorInfo type containing the information regarding the raised error.
      *
      * @param exception
      * @return ErrorInfo
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/exception/ErrorInfo.java b/fineract-provider/src/main/java/org/apache/fineract/batch/exception/ErrorInfo.java
index f1d34f0..f9d7991 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/exception/ErrorInfo.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/exception/ErrorInfo.java
@@ -19,8 +19,7 @@
 package org.apache.fineract.batch.exception;
 
 /**
- * Provides members to hold the basic information about the exceptions raised in
- * commandStrategy classes.
+ * Provides members to hold the basic information about the exceptions raised in commandStrategy classes.
  *
  * @author Rishabh Shukla
  *
@@ -90,8 +89,7 @@ public final class ErrorInfo {
     }
 
     /**
-     * Getter method to provide the message of the error for an object of this
-     * type.
+     * Getter method to provide the message of the error for an object of this type.
      *
      * @return String
      */
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 d206765..42071bb 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
@@ -26,10 +26,8 @@ import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
 import org.springframework.stereotype.Component;
 
 /**
- * Extends
- * {@link org.apache.fineract.infrastructure.core.serialization.FromJsonHelper}
- * to de-serialize the incoming String into a JSON List of type
- * {@link org.apache.fineract.batch.domain.BatchRequest}
+ * Extends {@link org.apache.fineract.infrastructure.core.serialization.FromJsonHelper} to de-serialize the incoming
+ * String into a JSON List of type {@link org.apache.fineract.batch.domain.BatchRequest}
  *
  * @author Rishabh Shukla
  *
@@ -40,8 +38,7 @@ import org.springframework.stereotype.Component;
 public class BatchRequestJsonHelper extends FromJsonHelper {
 
     /**
-     * Returns a list of batchRequests after de-serializing it from the input
-     * JSON string.
+     * Returns a list of batchRequests after de-serializing it from the input JSON string.
      *
      * @param json
      * @return List&lt;BatchRequest&gt;
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 e9d83f8..ea387f0 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
@@ -24,8 +24,7 @@ import org.apache.fineract.batch.domain.BatchRequest;
 import org.apache.fineract.batch.domain.BatchResponse;
 
 /**
- * Provides an interface for service class, that implements the method to handle
- * separate Batch Requests.
+ * Provides an interface for service class, that implements the method to handle separate Batch Requests.
  *
  * @author Rishabh Shukla
  *
@@ -36,10 +35,9 @@ import org.apache.fineract.batch.domain.BatchResponse;
 public interface BatchApiService {
 
     /**
-     * Returns a list of {@link org.apache.fineract.batch.domain.BatchResponse}s
-     * by getting the appropriate CommandStrategy for every
-     * {@link org.apache.fineract.batch.domain.BatchRequest}. It will be used
-     * when the Query Parameter "enclosingTransaction "is set to 'false'.
+     * Returns a list of {@link org.apache.fineract.batch.domain.BatchResponse}s by getting the appropriate
+     * CommandStrategy for every {@link org.apache.fineract.batch.domain.BatchRequest}. It will be used when the Query
+     * Parameter "enclosingTransaction "is set to 'false'.
      *
      * @param requestList
      * @param uriInfo
@@ -48,12 +46,10 @@ public interface BatchApiService {
     List<BatchResponse> handleBatchRequestsWithoutEnclosingTransaction(List<BatchRequest> requestList, UriInfo uriInfo);
 
     /**
-     * returns a list of {@link org.apache.fineract.batch.domain.BatchResponse}s
-     * by getting the appropriate CommandStrategy for every
-     * {@link org.apache.fineract.batch.domain.BatchRequest}. It will be used
-     * when the Query Parameter "enclosingTransaction "is set to 'true'. If one
-     * or more of the requests are not completed properly then whole of the
-     * transaction will be rolled back properly.
+     * returns a list of {@link org.apache.fineract.batch.domain.BatchResponse}s by getting the appropriate
+     * CommandStrategy for every {@link org.apache.fineract.batch.domain.BatchRequest}. It will be used when the Query
+     * Parameter "enclosingTransaction "is set to 'true'. If one or more of the requests are not completed properly then
+     * whole of the transaction will be rolled back properly.
      *
      * @param requestList
      * @param uriInfo
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 c6b0378..b04d739 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
@@ -44,9 +44,8 @@ import org.springframework.transaction.support.TransactionCallback;
 import org.springframework.transaction.support.TransactionTemplate;
 
 /**
- * Implementation for {@link BatchApiService} to iterate through all the
- * incoming requests and obtain the appropriate CommandStrategy from
- * CommandStrategyProvider.
+ * Implementation for {@link BatchApiService} to iterate through all the incoming requests and obtain the appropriate
+ * CommandStrategy from CommandStrategyProvider.
  *
  * @author Rishabh Shukla
  *
@@ -78,10 +77,8 @@ public class BatchApiServiceImpl implements BatchApiService {
     }
 
     /**
-     * Returns the response list by getting a proper
-     * {@link org.apache.fineract.batch.command.CommandStrategy}. execute()
-     * method of acquired commandStrategy is then provided with the separate
-     * Request.
+     * Returns the response list by getting a proper {@link org.apache.fineract.batch.command.CommandStrategy}.
+     * execute() method of acquired commandStrategy is then provided with the separate Request.
      *
      * @param requestList
      * @param uriInfo
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 ecd58b3..0ad028f 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
@@ -34,9 +34,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
- * Provides methods to create dependency map among the various batchRequests. It
- * also provides method that takes care of dependency resolution among related
- * requests.
+ * Provides methods to create dependency map among the various batchRequests. It also provides method that takes care of
+ * dependency resolution among related requests.
  *
  * @author Rishabh Shukla
  * @see BatchApiServiceImpl
@@ -85,10 +84,9 @@ public class ResolutionHelper {
     }
 
     /**
-     * Returns a map containing requests that are divided in accordance of
-     * dependency relations among them. Each different list is identified with a
-     * "Key" which is the "requestId" of the request at topmost level in
-     * dependency hierarchy of that particular list.
+     * Returns a map containing requests that are divided in accordance of dependency relations among them. Each
+     * different list is identified with a "Key" which is the "requestId" of the request at topmost level in dependency
+     * hierarchy of that particular list.
      *
      * @param batchRequests
      * @return List&lt;ArrayList&lt;BatchRequestNode&gt;&gt;
@@ -122,10 +120,8 @@ public class ResolutionHelper {
     }
 
     /**
-     * Returns a BatchRequest after dependency resolution. It takes a request
-     * and the response of the request it is dependent upon as its arguments and
-     * change the body or relativeUrl of the request according to parent
-     * Request.
+     * Returns a BatchRequest after dependency resolution. It takes a request and the response of the request it is
+     * dependent upon as its arguments and change the body or relativeUrl of the request according to parent Request.
      *
      * @param request
      * @param parentResponse
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 351c07f..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
@@ -27,8 +27,7 @@ import java.lang.annotation.Target;
 /**
  * Specifies the command type for the annotated class.<br>
  * <br>
- * The entity name (e.g. CLIENT, SAVINGSACCOUNT, LOANPRODUCT) and the action
- * (e.g. CREATE, DELETE) must be given.
+ * The entity name (e.g. CLIENT, SAVINGSACCOUNT, LOANPRODUCT) and the action (e.g. CREATE, DELETE) must be given.
  *
  * @author Markus Geiss
  * @version 1.0
diff --git a/fineract-provider/src/main/java/org/apache/fineract/commands/exception/RollbackTransactionAsCommandIsNotApprovedByCheckerException.java b/fineract-provider/src/main/java/org/apache/fineract/commands/exception/RollbackTransactionAsCommandIsNotApprovedByCheckerException.java
index 71fea23..b7172ef 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/commands/exception/RollbackTransactionAsCommandIsNotApprovedByCheckerException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/commands/exception/RollbackTransactionAsCommandIsNotApprovedByCheckerException.java
@@ -23,15 +23,12 @@ import org.apache.fineract.commands.domain.CommandSource;
 public class RollbackTransactionAsCommandIsNotApprovedByCheckerException extends RuntimeException {
 
     /**
-     * When maker-checker is configured globally and also for the current
-     * transaction.
+     * When maker-checker is configured globally and also for the current transaction.
      *
-     * An initial save determines if there are any integrity rule or data
-     * problems.
+     * An initial save determines if there are any integrity rule or data problems.
      *
-     * If there isn't... and the transaction is from a maker... then this roll
-     * back is issued and the commandSourceResult is used to write the audit
-     * entry.
+     * If there isn't... and the transaction is from a maker... then this roll back is issued and the
+     * commandSourceResult is used to write the audit entry.
      */
     private final CommandSource commandSourceResult;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/commands/exception/UnsupportedCommandException.java b/fineract-provider/src/main/java/org/apache/fineract/commands/exception/UnsupportedCommandException.java
index 67e8c8c..e4b3d49 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/commands/exception/UnsupportedCommandException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/commands/exception/UnsupportedCommandException.java
@@ -19,8 +19,8 @@
 package org.apache.fineract.commands.exception;
 
 /**
- * A {@link RuntimeException} that is thrown in the case where an invalid or
- * unknown command is attempted to be processed by platform.
+ * A {@link RuntimeException} that is thrown in the case where an invalid or unknown command is attempted to be
+ * processed by platform.
  */
 public class UnsupportedCommandException extends RuntimeException {
 
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 1f94048..260bd5e 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
@@ -34,12 +34,10 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 /**
- * {@link CommandHandlerProvider} provides {@link NewCommandSourceHandler}s for
- * a given entity and action. <br>
+ * {@link CommandHandlerProvider} provides {@link NewCommandSourceHandler}s for a given entity and action. <br>
  * <br>
- * A {@link NewCommandSourceHandler} can be registered and the annotation
- * {@link CommandType} is used to determine the entity and the action the
- * handler is capable to process.
+ * A {@link NewCommandSourceHandler} can be registered and the annotation {@link CommandType} is used to determine the
+ * entity and the action the handler is capable to process.
  *
  * @author Markus Geiss
  * @version 1.0
@@ -63,8 +61,8 @@ public class CommandHandlerProvider implements ApplicationContextAware {
     /**
      * Returns a handler for the given entity and action.<br>
      * <br>
-     * Throws an {@link UnsupportedCommandException} if no handler for the given
-     * entity, action combination can be found.
+     * Throws an {@link UnsupportedCommandException} if no handler for the given entity, action combination can be
+     * found.
      *
      * @param entity
      *            the entity to lookup the handler, must be given.
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 b9804f4..aea732f 100644
--- 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
@@ -99,8 +99,7 @@ public class PortfolioCommandSourceWritePlatformServiceImpl implements Portfolio
             } catch (CannotAcquireLockException | ObjectOptimisticLockingFailureException exception) {
                 LOG.info("The following command {} has been retried  {} time(s)", command.json(), numberOfRetries);
                 /***
-                 * Fail if the transaction has been retired for
-                 * maxNumberOfRetries
+                 * Fail if the transaction has been retired for maxNumberOfRetries
                  **/
                 if (numberOfRetries >= maxNumberOfRetries) {
                     LOG.warn("The following command {} has been retried for the max allowed attempts of {} and will be rolled back",
@@ -108,8 +107,7 @@ public class PortfolioCommandSourceWritePlatformServiceImpl implements Portfolio
                     throw (exception);
                 }
                 /***
-                 * Else sleep for a random time (between 1 to 10 seconds) and
-                 * continue
+                 * Else sleep for a random time (between 1 to 10 seconds) and continue
                  **/
                 try {
                     Random random = new Random();
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 f033410..d519ae7 100644
--- 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
@@ -111,15 +111,13 @@ public class SynchronousCommandProcessingService implements CommandProcessingSer
 
         if ((rollbackTransaction || result.isRollbackTransaction()) && !isApprovedByChecker) {
             /*
-             * JournalEntry will generate a new transactionId every time.
-             * Updating the transactionId with old transactionId, because as
-             * there are no entries are created with new transactionId, will
-             * throw an error when checker approves the transaction
+             * JournalEntry will generate a new transactionId every time. Updating the transactionId with old
+             * transactionId, because as there are no entries are created with new transactionId, will throw an error
+             * when checker approves the transaction
              */
             commandSourceResult.updateTransaction(command.getTransactionId());
             /*
-             * Update CommandSource json data with JsonCommand json data, line
-             * 77 and 81 may update the json data
+             * Update CommandSource json data with JsonCommand json data, line 77 and 81 may update the json data
              */
             commandSourceResult.updateJsonTo(command.json());
             throw new RollbackTransactionAsCommandIsNotApprovedByCheckerException(commandSourceResult);
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 d17a6f9..6be6da9 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
@@ -80,10 +80,8 @@ public class AccountNumberFormatDataValidator {
                     .parameter(AccountNumberFormatConstants.prefixTypeParamName).value(prefixType).notNull().integerGreaterThanZero();
 
             /**
-             * Permitted values for prefix type vary based on the actual
-             * selected accountType, carry out this validation only if data
-             * validation errors do not exist for both entity type and prefix
-             * type
+             * Permitted values for prefix type vary based on the actual selected accountType, carry out this validation
+             * only if data validation errors do not exist for both entity type and prefix type
              **/
             boolean areAccountTypeAndPrefixTypeValid = true;
             for (ApiParameterError apiParameterError : dataValidationErrors) {
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 2eb9fa6..9054a25 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
@@ -46,9 +46,8 @@ public class AccountNumberFormatConstants {
     public static final String prefixTypeOptionsParamName = "prefixTypeOptions";
 
     /**
-     * These parameters will match the class level parameters of
-     * {@link AccountNumberFormatData}. Where possible, we try to get response
-     * parameters to match those of request parameters.
+     * These parameters will match the class level parameters of {@link AccountNumberFormatData}. Where possible, we try
+     * to get response parameters to match those of request parameters.
      */
 
     // Error messages codes
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 b2310b5..d79fe7c 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
@@ -111,9 +111,8 @@ public class AccountNumberFormatReadPlatformServiceImpl implements AccountNumber
 
         Map<String, List<EnumOptionData>> accountNumberPrefixTypeOptions = new HashMap<>();
         /***
-         * If an Account type is passed in, return prefixes only for the passed
-         * in account type, else return all allowed prefixes keyed by all
-         * possible entity type
+         * If an Account type is passed in, return prefixes only for the passed in account type, else return all allowed
+         * prefixes keyed by all possible entity type
          **/
         if (entityAccountTypeForTemplate != null) {
             determinePrefixTypesForAccounts(accountNumberPrefixTypeOptions, entityAccountTypeForTemplate);
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 84fcfe6..1cea111 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
@@ -136,8 +136,7 @@ public class AccountNumberFormatWritePlatformServiceJpaRepositoryImpl implements
     }
 
     /*
-     * Guaranteed to throw an exception no matter what the data integrity issue
-     * is.
+     * Guaranteed to throw an exception no matter what the data integrity issue is.
      */
     private void handleDataIntegrityIssues(final JsonCommand command, final Throwable realCause, final Exception dve) {
         if (realCause.getMessage().contains(AccountNumberFormatConstants.ACCOUNT_TYPE_UNIQUE_CONSTRAINT_NAME)) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/PersonnelSheetPopulator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/PersonnelSheetPopulator.java
index 8b0c48d..96b0f3f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/PersonnelSheetPopulator.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/PersonnelSheetPopulator.java
@@ -40,9 +40,8 @@ public class PersonnelSheetPopulator extends AbstractWorkbookPopulator {
     private Map<String, List<StaffData>> officeToPersonnel;
 
     /*
-     * Guava Multimap would make this more readable. The value Integer[]
-     * contains the beginIndex and endIndex for the staff list of each office.
-     * Required for applying names in excel.
+     * Guava Multimap would make this more readable. The value Integer[] contains the beginIndex and endIndex for the
+     * staff list of each office. Required for applying names in excel.
      */
     private Map<Integer, Integer[]> officeNameToBeginEndIndexesOfStaff;
 
@@ -61,9 +60,8 @@ public class PersonnelSheetPopulator extends AbstractWorkbookPopulator {
         setLayout(staffSheet);
 
         /*
-         * This piece of code could have been avoided by making multiple trips
-         * to the database for the staff of each office but this is more
-         * performance efficient
+         * This piece of code could have been avoided by making multiple trips to the database for the staff of each
+         * office but this is more performance efficient
          */
         setOfficeToPersonnelMap();
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/service/RuntimeDelegatingCacheManager.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/service/RuntimeDelegatingCacheManager.java
index 5fabf79..5ab511d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/service/RuntimeDelegatingCacheManager.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/service/RuntimeDelegatingCacheManager.java
@@ -35,12 +35,10 @@ import org.springframework.cache.support.NoOpCacheManager;
 import org.springframework.stereotype.Component;
 
 /**
- * At present this implementation of {@link CacheManager} just delegates to the
- * real {@link CacheManager} to use.
+ * At present this implementation of {@link CacheManager} just delegates to the real {@link CacheManager} to use.
  *
- * By default it is {@link NoOpCacheManager} but we can change that by checking
- * some persisted configuration in the database on startup and allow user to
- * switch implementation through UI/API
+ * By default it is {@link NoOpCacheManager} but we can change that by checking some persisted configuration in the
+ * database on startup and allow user to switch implementation through UI/API
  */
 @Component(value = "runtimeDelegatingCacheManager")
 public class RuntimeDelegatingCacheManager implements CacheManager {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/api/EmailCampaignApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/api/EmailCampaignApiResource.java
index 7591b67..b0c8bda 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/api/EmailCampaignApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/api/EmailCampaignApiResource.java
@@ -54,8 +54,8 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 /**
- * Created with IntelliJ IDEA. User: andrew Date: 19-5-14 Time: 15:17 To change
- * this template use File | Settings | File Templates.
+ * Created with IntelliJ IDEA. User: andrew Date: 19-5-14 Time: 15:17 To change this template use File | Settings | File
+ * Templates.
  */
 @Path("/email/campaign")
 @Consumes({ MediaType.APPLICATION_JSON })
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailCampaignReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailCampaignReadPlatformServiceImpl.java
index 46a4ac0..e56d988 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailCampaignReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailCampaignReadPlatformServiceImpl.java
@@ -132,9 +132,8 @@ public class EmailCampaignReadPlatformServiceImpl implements EmailCampaignReadPl
             final boolean useReport = rs.getBoolean("useReport");
 
             /*
-             * final ReportData stretchyReport = new ReportData(reportId,
-             * reportName, reportType, reportSubType, reportCategory,
-             * reportDescription, reportSql, coreReport, useReport, null);
+             * final ReportData stretchyReport = new ReportData(reportId, reportName, reportType, reportSubType,
+             * reportCategory, reportDescription, reportSql, coreReport, useReport, null);
              */
 
             final Integer statusId = JdbcSupport.getInteger(rs, "statusEnum");
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailCampaignWritePlatformCommandHandlerImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailCampaignWritePlatformCommandHandlerImpl.java
index 0f8c3db..4165aae 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailCampaignWritePlatformCommandHandlerImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailCampaignWritePlatformCommandHandlerImpl.java
@@ -313,8 +313,7 @@ public class EmailCampaignWritePlatformCommandHandlerImpl implements EmailCampai
         // calculate new trigger date and insert into next trigger date
 
         /**
-         * next run time has to be in the future if not calculate a new future
-         * date
+         * next run time has to be in the future if not calculate a new future date
          */
         LocalDate nextRuntime = CalendarUtils.getNextRecurringDate(emailCampaign.getRecurrence(),
                 emailCampaign.getNextTriggerDate().toLocalDate(), nextTriggerDate.toLocalDate());
@@ -366,9 +365,8 @@ public class EmailCampaignWritePlatformCommandHandlerImpl implements EmailCampai
             if (emailCampaign.isSchedule()) {
 
                 /**
-                 * if recurrence start date is in the future calculate next
-                 * trigger date if not use recurrence start date us next trigger
-                 * date when activating
+                 * if recurrence start date is in the future calculate next trigger date if not use recurrence start
+                 * date us next trigger date when activating
                  */
                 LocalDate nextTriggerDate = null;
                 if (emailCampaign.getRecurrenceStartDateTime().isBefore(tenantDateTime())) {
@@ -391,8 +389,8 @@ public class EmailCampaignWritePlatformCommandHandlerImpl implements EmailCampai
         }
 
         /*
-         * if campaign is direct insert campaign message into email outbound
-         * table else if its a schedule create a job process for it
+         * if campaign is direct insert campaign message into email outbound table else if its a schedule create a job
+         * process for it
          */
         return new CommandProcessingResultBuilder() //
                 .withCommandId(command.commandId()) //
@@ -515,9 +513,8 @@ public class EmailCampaignWritePlatformCommandHandlerImpl implements EmailCampai
         if (emailCampaign.isSchedule()) {
 
             /**
-             * if recurrence start date is in the future calculate next trigger
-             * date if not use recurrence start date us next trigger date when
-             * activating
+             * if recurrence start date is in the future calculate next trigger date if not use recurrence start date us
+             * next trigger date when activating
              */
             LocalDate nextTriggerDate = null;
             if (emailCampaign.getRecurrenceStartDateTime().isBefore(tenantDateTime())) {
@@ -718,8 +715,7 @@ public class EmailCampaignWritePlatformCommandHandlerImpl implements EmailCampai
     }
 
     /**
-     * This generates the the report and converts it to a file by passing the
-     * parameters below
+     * This generates the the report and converts it to a file by passing the parameters below
      *
      * @param emailCampaign
      * @param emailAttachmentFileFormat
@@ -763,8 +759,7 @@ public class EmailCampaignWritePlatformCommandHandlerImpl implements EmailCampai
     }
 
     /**
-     * This matches the the actual values to the key in the report stretchy
-     * parameters map
+     * This matches the the actual values to the key in the report stretchy parameters map
      *
      * @param stretchyParams
      * @param client
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailWritePlatformServiceJpaRepositoryImpl.java
index 44700da..9d8353a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailWritePlatformServiceJpaRepositoryImpl.java
@@ -117,8 +117,7 @@ public class EmailWritePlatformServiceJpaRepositoryImpl implements EmailWritePla
     }
 
     /*
-     * Guaranteed to throw an exception no matter what the data integrity issue
-     * is.
+     * Guaranteed to throw an exception no matter what the data integrity issue is.
      */
     private void handleDataIntegrityIssues(@SuppressWarnings("unused") final JsonCommand command,
             final DataIntegrityViolationException dve) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignDomainServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignDomainServiceImpl.java
index 7199ba8..55b43b0 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignDomainServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignDomainServiceImpl.java
@@ -500,8 +500,7 @@ public class SmsCampaignDomainServiceImpl implements SmsCampaignDomainService {
      *
      * private final Object entity ;
      *
-     * public Task(final FineractPlatformTenant tenant, final String reportName,
-     * final Object entity) { this.tenant = tenant; this.reportName = reportName
-     * ; this.entity = entity ; } }
+     * public Task(final FineractPlatformTenant tenant, final String reportName, final Object entity) { this.tenant =
+     * tenant; this.reportName = reportName ; this.entity = entity ; } }
      */
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignWritePlatformServiceJpaImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignWritePlatformServiceJpaImpl.java
index 9378cca..b243e6c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignWritePlatformServiceJpaImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignWritePlatformServiceJpaImpl.java
@@ -409,8 +409,7 @@ public class SmsCampaignWritePlatformServiceJpaImpl implements SmsCampaignWriteP
         // calculate new trigger date and insert into next trigger date
 
         /**
-         * next run time has to be in the future if not calculate a new future
-         * date
+         * next run time has to be in the future if not calculate a new future date
          */
         LocalDate nextRuntime = CalendarUtils.getNextRecurringDate(smsCampaign.getRecurrence(),
                 smsCampaign.getNextTriggerDate().toLocalDate(), nextTriggerDate.toLocalDate());
@@ -460,9 +459,8 @@ public class SmsCampaignWritePlatformServiceJpaImpl implements SmsCampaignWriteP
         } else if (smsCampaign.isSchedule()) {
 
             /**
-             * if recurrence start date is in the future calculate next trigger
-             * date if not use recurrence start date us next trigger date when
-             * activating
+             * if recurrence start date is in the future calculate next trigger date if not use recurrence start date us
+             * next trigger date when activating
              */
             LocalDate nextTriggerDate = null;
             if (smsCampaign.getRecurrenceStartDateTime().isBefore(tenantDateTime())) {
@@ -484,8 +482,8 @@ public class SmsCampaignWritePlatformServiceJpaImpl implements SmsCampaignWriteP
         }
 
         /*
-         * if campaign is direct insert campaign message into sms outbound table
-         * else if its a schedule create a job process for it
+         * if campaign is direct insert campaign message into sms outbound table else if its a schedule create a job
+         * process for it
          */
         return new CommandProcessingResultBuilder() //
                 .withCommandId(command.commandId()) //
@@ -621,9 +619,8 @@ public class SmsCampaignWritePlatformServiceJpaImpl implements SmsCampaignWriteP
         } else if (smsCampaign.isSchedule()) {
 
             /**
-             * if recurrence start date is in the future calculate next trigger
-             * date if not use recurrence start date us next trigger date when
-             * activating
+             * if recurrence start date is in the future calculate next trigger date if not use recurrence start date us
+             * next trigger date when activating
              */
             LocalDate nextTriggerDate = null;
             if (smsCampaign.getRecurrenceStartDateTime().isBefore(tenantDateTime())) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/CodeConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/CodeConstants.java
index 307b269..5b833ea 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/CodeConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/CodeConstants.java
@@ -24,8 +24,7 @@ import java.util.Set;
 public class CodeConstants {
 
     /***
-     * Enum of all parameters passed in while creating/updating a code and code
-     * value
+     * Enum of all parameters passed in while creating/updating a code and code value
      ***/
     public static enum CodevalueJSONinputParams {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/domain/CodeValueRepositoryWrapper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/domain/CodeValueRepositoryWrapper.java
index 47c2854..5f363c2 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/domain/CodeValueRepositoryWrapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/domain/CodeValueRepositoryWrapper.java
@@ -24,15 +24,14 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * Wrapper for {@link CodeValueRepository} that is responsible for checking if
- * {@link CodeValue} is returned when using <code>findOne</code> and
- * <code>findByCodeNameAndId</code> repository methods and throwing an
- * appropriate not found exception.
+ * Wrapper for {@link CodeValueRepository} that is responsible for checking if {@link CodeValue} is returned when using
+ * <code>findOne</code> and <code>findByCodeNameAndId</code> repository methods and throwing an appropriate not found
+ * exception.
  * </p>
  *
  * <p>
- * This is to avoid need for checking and throwing in multiple areas of code
- * base where {@link CodeValueRepository} is required.
+ * This is to avoid need for checking and throwing in multiple areas of code base where {@link CodeValueRepository} is
+ * required.
  * </p>
  */
 @Service
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/exception/SystemDefinedCodeCannotBeChangedException.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/exception/SystemDefinedCodeCannotBeChangedException.java
index da17e5e..95f815e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/exception/SystemDefinedCodeCannotBeChangedException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/exception/SystemDefinedCodeCannotBeChangedException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.infrastructure.codes.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
- * A {@link AbstractPlatformDomainRuleException} thrown when someone attempts to
- * update or delete a system defined code.
+ * A {@link AbstractPlatformDomainRuleException} thrown when someone attempts to update or delete a system defined code.
  */
 public class SystemDefinedCodeCannotBeChangedException extends AbstractPlatformDomainRuleException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeValueReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeValueReadPlatformService.java
index d6674fc..cfbd528 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeValueReadPlatformService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeValueReadPlatformService.java
@@ -31,13 +31,11 @@ import org.apache.fineract.infrastructure.codes.data.CodeValueData;
  * </ol>
  *
  * <p>
- * System defined codes cannot be altered or removed but their code values may
- * be allowed to be added to or removed.
+ * System defined codes cannot be altered or removed but their code values may be allowed to be added to or removed.
  * </p>
  *
  * <p>
- * User defined codes can be changed in any way by application users with system
- * permissions.
+ * User defined codes can be changed in any way by application users with system permissions.
  * </p>
  */
 public interface CodeValueReadPlatformService {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeValueWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeValueWritePlatformServiceJpaRepositoryImpl.java
index 3538a81..e06e52a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeValueWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeValueWritePlatformServiceJpaRepositoryImpl.java
@@ -90,8 +90,7 @@ public class CodeValueWritePlatformServiceJpaRepositoryImpl implements CodeValue
     }
 
     /*
-     * Guaranteed to throw an exception no matter what the data integrity issue
-     * is.
+     * Guaranteed to throw an exception no matter what the data integrity issue is.
      */
     private void handleCodeValueDataIntegrityIssues(final JsonCommand command, final DataIntegrityViolationException dve) {
         final Throwable realCause = dve.getMostSpecificCause();
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeWritePlatformServiceJpaRepositoryImpl.java
index ead12a0..f0b860d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeWritePlatformServiceJpaRepositoryImpl.java
@@ -139,8 +139,7 @@ public class CodeWritePlatformServiceJpaRepositoryImpl implements CodeWritePlatf
     }
 
     /*
-     * Guaranteed to throw an exception no matter what the data integrity issue
-     * is.
+     * Guaranteed to throw an exception no matter what the data integrity issue is.
      */
     private void handleCodeDataIntegrityIssues(final JsonCommand command, final Throwable realCause, final Exception dve) {
         if (realCause.getMessage().contains("code_name")) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/domain/ConfigurationDomainServiceJpa.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/domain/ConfigurationDomainServiceJpa.java
index 61c14e1..efa1efa 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/domain/ConfigurationDomainServiceJpa.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/domain/ConfigurationDomainServiceJpa.java
@@ -82,8 +82,7 @@ public class ConfigurationDomainServiceJpa implements ConfigurationDomainService
     /*
      * (non-Javadoc)
      *
-     * @see org.apache.fineract.infrastructure.configuration.domain.
-     * ConfigurationDomainService#isHolidaysEnabled()
+     * @see org.apache.fineract.infrastructure.configuration.domain. ConfigurationDomainService#isHolidaysEnabled()
      */
     @Override
     public boolean isRescheduleRepaymentsOnHolidaysEnabled() {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/domain/GlobalConfigurationRepositoryWrapper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/domain/GlobalConfigurationRepositoryWrapper.java
index 5b2b280..7276bcd 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/domain/GlobalConfigurationRepositoryWrapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/domain/GlobalConfigurationRepositoryWrapper.java
@@ -24,8 +24,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * Wrapper for {@link GlobalConfigurationRepository} that adds NULL checking and
- * Error handling capabilities
+ * Wrapper for {@link GlobalConfigurationRepository} that adds NULL checking and Error handling capabilities
  * </p>
  */
 @Service
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/exception/GlobalConfigurationPropertyNotFoundException.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/exception/GlobalConfigurationPropertyNotFoundException.java
index b92926f..f725e5c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/exception/GlobalConfigurationPropertyNotFoundException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/exception/GlobalConfigurationPropertyNotFoundException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.infrastructure.configuration.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
 
 /**
- * A {@link RuntimeException} thrown when global configuration properties are
- * not found.
+ * A {@link RuntimeException} thrown when global configuration properties are not found.
  */
 public class GlobalConfigurationPropertyNotFoundException extends AbstractPlatformResourceNotFoundException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/serialization/GlobalConfigurationCommandFromApiJsonDeserializer.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/serialization/GlobalConfigurationCommandFromApiJsonDeserializer.java
index 94970f6..67ac285 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/serialization/GlobalConfigurationCommandFromApiJsonDeserializer.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/serialization/GlobalConfigurationCommandFromApiJsonDeserializer.java
@@ -34,8 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
- * Implementation of {@link FromApiJsonDeserializer} for
- * {@link UpdateGlobalConfigurationCommand}'s.
+ * Implementation of {@link FromApiJsonDeserializer} for {@link UpdateGlobalConfigurationCommand}'s.
  */
 @Component
 public final class GlobalConfigurationCommandFromApiJsonDeserializer
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/GlobalConfigurationWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/GlobalConfigurationWritePlatformServiceJpaRepositoryImpl.java
index 328e6fe..b63203c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/GlobalConfigurationWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/GlobalConfigurationWritePlatformServiceJpaRepositoryImpl.java
@@ -96,8 +96,7 @@ public class GlobalConfigurationWritePlatformServiceJpaRepositoryImpl implements
     }
 
     /*
-     * Guaranteed to throw an exception no matter what the data integrity issue
-     * is.
+     * Guaranteed to throw an exception no matter what the data integrity issue is.
      */
     private void handleDataIntegrityIssues(final DataIntegrityViolationException dve) {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/ApiRequestParameterHelper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/ApiRequestParameterHelper.java
index 88fb3ec..f6ddae0 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/ApiRequestParameterHelper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/ApiRequestParameterHelper.java
@@ -25,13 +25,12 @@ import org.springframework.stereotype.Component;
 
 /**
  * <p>
- * Used to process the query parameters provided in a API request to see
- * features of the RESTful API are being asked for such as:
+ * Used to process the query parameters provided in a API request to see features of the RESTful API are being asked for
+ * such as:
  * </p>
  * <ul>
  * <li>Pretty printing through pretty=true, defaults to false</li>
- * <li>Partial response through fields=id, name etc, when empty, the full data
- * is returned by default.</li>
+ * <li>Partial response through fields=id, name etc, when empty, the full data is returned by default.</li>
  * </ul>
  */
 @Component
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/DateAdapter.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/DateAdapter.java
index 9a9163b..95a9c15 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/DateAdapter.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/DateAdapter.java
@@ -27,8 +27,8 @@ import java.time.format.DateTimeFormatter;
 import java.util.Date;
 
 /**
- * GSON Serializer for JUL Dates (java.util.Date) in ISO-8601 format using
- * {@link DateTimeFormatter#ISO_INSTANT} (see FINERACT-926).
+ * GSON Serializer for JUL Dates (java.util.Date) in ISO-8601 format using {@link DateTimeFormatter#ISO_INSTANT} (see
+ * FINERACT-926).
  *
  * @author Michael Vorburger.ch
  */
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/JodaDateTimeAdapter.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/JodaDateTimeAdapter.java
index d9d611b..128c2e1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/JodaDateTimeAdapter.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/JodaDateTimeAdapter.java
@@ -26,8 +26,7 @@ import java.lang.reflect.Type;
 import org.joda.time.DateTime;
 
 /**
- * Serializer for Joda Time {@link DateTime} that returns the date as long to
- * match previous (Jackson) functionality.
+ * Serializer for Joda Time {@link DateTime} that returns the date as long to match previous (Jackson) functionality.
  */
 public class JodaDateTimeAdapter implements JsonSerializer<DateTime> {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/JodaLocalDateAdapter.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/JodaLocalDateAdapter.java
index 0e9381e..6004e63 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/JodaLocalDateAdapter.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/JodaLocalDateAdapter.java
@@ -27,8 +27,8 @@ import java.lang.reflect.Type;
 import org.joda.time.LocalDate;
 
 /**
- * Serializer for Joda Time {@link LocalDate} that returns the date in array
- * format to match previous Jackson functionality.
+ * Serializer for Joda Time {@link LocalDate} that returns the date in array format to match previous Jackson
+ * functionality.
  */
 public class JodaLocalDateAdapter implements JsonSerializer<LocalDate> {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/JodaMonthDayAdapter.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/JodaMonthDayAdapter.java
index f8d9724..659c70e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/JodaMonthDayAdapter.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/JodaMonthDayAdapter.java
@@ -27,8 +27,8 @@ import java.lang.reflect.Type;
 import org.joda.time.MonthDay;
 
 /**
- * Serializer for Joda Time {@link MonthDay} that returns the date in array
- * format to match previous Jackson functionality.
+ * Serializer for Joda Time {@link MonthDay} that returns the date in array format to match previous Jackson
+ * functionality.
  */
 public class JodaMonthDayAdapter implements JsonSerializer<MonthDay> {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/JsonCommand.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/JsonCommand.java
index 94df4de..7261640 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/JsonCommand.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/JsonCommand.java
@@ -43,8 +43,8 @@ import org.joda.time.format.DateTimeFormatter;
 /**
  * Immutable representation of a command.
  *
- * Wraps the provided JSON with convenience functions for extracting parameter
- * values and checking for changes against an existing value.
+ * Wraps the provided JSON with convenience functions for extracting parameter values and checking for changes against
+ * an existing value.
  */
 public final class JsonCommand {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/JsonQuery.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/JsonQuery.java
index 9fc5dea..9a5af62 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/JsonQuery.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/JsonQuery.java
@@ -35,8 +35,7 @@ import org.joda.time.LocalDate;
 /**
  * Immutable representation of a query.
  *
- * Wraps the provided JSON with convenience functions for extracting parameter
- * values.
+ * Wraps the provided JSON with convenience functions for extracting parameter values.
  */
 public final class JsonQuery {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/boot/AbstractApplicationConfiguration.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/boot/AbstractApplicationConfiguration.java
index c9eef4f..42a9366 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/boot/AbstractApplicationConfiguration.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/boot/AbstractApplicationConfiguration.java
@@ -36,13 +36,12 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 /**
  * Base Spring Configuration with what's common to all Configuration subclasses.
  *
- * Notably the EnableAutoConfiguration excludes relevant for (and often adjusted
- * when upgrading versions of) Spring Boot, the "old" (pre. Spring Boot &amp;
- * MariaDB4j) fineract appContext.xml which all configurations need, and the
+ * Notably the EnableAutoConfiguration excludes relevant for (and often adjusted when upgrading versions of) Spring
+ * Boot, the "old" (pre. Spring Boot &amp; MariaDB4j) fineract appContext.xml which all configurations need, and the
  * web.xml successor WebXmlConfiguration.
  *
- * Should NOT include Configuration related to embedded Tomcat, data sources,
- * and MariaDB4j (because those differ in the subclasses).
+ * Should NOT include Configuration related to embedded Tomcat, data sources, and MariaDB4j (because those differ in the
+ * subclasses).
  */
 @Configuration
 @Import({ WebXmlConfiguration.class, WebXmlOauthConfiguration.class, WebFrontEndConfiguration.class, MessagingConfiguration.class,
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/boot/EmbeddedTomcatWithSSLConfiguration.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/boot/EmbeddedTomcatWithSSLConfiguration.java
index ccd58c8..8f5d26c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/boot/EmbeddedTomcatWithSSLConfiguration.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/boot/EmbeddedTomcatWithSSLConfiguration.java
@@ -88,13 +88,10 @@ public class EmbeddedTomcatWithSSLConfiguration {
         try {
             URL url = resource.getURL();
             /**
-             * // If this creates filenames that are too long on Win, // then
-             * could just use resource.getFilename(), // even though not unique,
-             * real risk prob. min.bon String tempDir =
-             * System.getProperty("java.io.tmpdir"); tempDir = tempDir + "/" +
-             * getClass().getSimpleName() + "/"; String path = url.getPath();
-             * String uniqName = path.replace("file:/", "").replace('!', '_');
-             * String tempFullPath = tempDir + uniqName;
+             * // If this creates filenames that are too long on Win, // then could just use resource.getFilename(), //
+             * even though not unique, real risk prob. min.bon String tempDir = System.getProperty("java.io.tmpdir");
+             * tempDir = tempDir + "/" + getClass().getSimpleName() + "/"; String path = url.getPath(); String uniqName
+             * = path.replace("file:/", "").replace('!', '_'); String tempFullPath = tempDir + uniqName;
              **/
             // instead of File.createTempFile(prefix?, suffix?);
             File targetFile = new File(resource.getFilename());
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/boot/WebXmlOauthConfiguration.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/boot/WebXmlOauthConfiguration.java
index 6338789..6e558e8 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/boot/WebXmlOauthConfiguration.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/boot/WebXmlOauthConfiguration.java
@@ -26,8 +26,7 @@ import org.springframework.context.annotation.Profile;
 import org.springframework.web.servlet.DispatcherServlet;
 
 /**
- * This Configuration replaces what formerly was in web.xml. Beans are loaded
- * only when "oauth" Profile is enabled.
+ * This Configuration replaces what formerly was in web.xml. Beans are loaded only when "oauth" Profile is enabled.
  *
  * @see <a href=
  *      "http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#howto-convert-an-existing-application-to-spring-boot">#howto-convert-an-existing-application-to-spring-boot</a>
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/data/ApiGlobalErrorResponse.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/data/ApiGlobalErrorResponse.java
index 15b9720..8c648e4 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/data/ApiGlobalErrorResponse.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/data/ApiGlobalErrorResponse.java
@@ -29,8 +29,7 @@ import javax.xml.bind.annotation.XmlElementWrapper;
 public class ApiGlobalErrorResponse {
 
     /**
-     * A developer friendly plain English description of why the HTTP error
-     * response was returned from the API.
+     * A developer friendly plain English description of why the HTTP error response was returned from the API.
      */
     private String developerMessage;
 
@@ -40,21 +39,19 @@ public class ApiGlobalErrorResponse {
     private String httpStatusCode;
 
     /**
-     * A user friendly plain English description of why the HTTP error response
-     * was returned from the API that can be presented to end users.
+     * A user friendly plain English description of why the HTTP error response was returned from the API that can be
+     * presented to end users.
      */
     private String defaultUserMessage;
 
     /**
-     * A code that can be used for globalisation support by client applications
-     * of the API.
+     * A code that can be used for globalisation support by client applications of the API.
      */
     private String userMessageGlobalisationCode;
 
     /**
-     * A list of zero or more of the actual reasons for the HTTP error should
-     * they be needed. Typically used to express data validation errors with
-     * parameters passed to API.
+     * A list of zero or more of the actual reasons for the HTTP error should they be needed. Typically used to express
+     * data validation errors with parameters passed to API.
      */
     private List<ApiParameterError> errors = new ArrayList<>();
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/data/ApiParameterError.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/data/ApiParameterError.java
index 5535c0e..b34217e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/data/ApiParameterError.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/data/ApiParameterError.java
@@ -26,26 +26,23 @@ import java.util.List;
 public class ApiParameterError {
 
     /**
-     * A developer friendly plain English description of why the HTTP error
-     * response was returned from the API.
+     * A developer friendly plain English description of why the HTTP error response was returned from the API.
      */
     private String developerMessage;
 
     /**
-     * A user friendly plain English description of why the HTTP error response
-     * was returned from the API that can be presented to end users.
+     * A user friendly plain English description of why the HTTP error response was returned from the API that can be
+     * presented to end users.
      */
     private String defaultUserMessage;
 
     /**
-     * A code that can be used for globalisation support by client applications
-     * of the API.
+     * A code that can be used for globalisation support by client applications of the API.
      */
     private String userMessageGlobalisationCode;
 
     /**
-     * The name of the field or parameter passed to the API that this error
-     * relates to.
+     * The name of the field or parameter passed to the API that this error relates to.
      */
     private String parameterName;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/data/CommandProcessingResult.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/data/CommandProcessingResult.java
index f456902..fefae0e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/data/CommandProcessingResult.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/data/CommandProcessingResult.java
@@ -23,8 +23,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * Represents the successful result of an REST API call that results in
- * processing a command.
+ * Represents the successful result of an REST API call that results in processing a command.
  */
 public class CommandProcessingResult implements Serializable {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/data/CommandProcessingResultBuilder.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/data/CommandProcessingResultBuilder.java
index 606a6d2..1fdd91f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/data/CommandProcessingResultBuilder.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/data/CommandProcessingResultBuilder.java
@@ -21,8 +21,7 @@ package org.apache.fineract.infrastructure.core.data;
 import java.util.Map;
 
 /**
- * Represents the successful result of an REST API call that results in
- * processing a command.
+ * Represents the successful result of an REST API call that results in processing a command.
  */
 public class CommandProcessingResultBuilder {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/data/DataValidatorBuilder.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/data/DataValidatorBuilder.java
index 4c071b8..f48d327 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/data/DataValidatorBuilder.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/data/DataValidatorBuilder.java
@@ -160,9 +160,8 @@ public class DataValidatorBuilder {
 
     /*** FIXME: Vishwas, why does this method have a parameter? Seems wrong ***/
     /*
-     * This method is not meant for validation, if you have mandatory boolean
-     * param and if it has invalid value or value not passed then call this
-     * method, this method is always used with input as false
+     * This method is not meant for validation, if you have mandatory boolean param and if it has invalid value or value
+     * not passed then call this method, this method is always used with input as false
      */
     public DataValidatorBuilder trueOrFalseRequired1(final boolean trueOfFalseFieldProvided) {
         if (!trueOfFalseFieldProvided && !this.ignoreNullValue) {
@@ -982,9 +981,8 @@ public class DataValidatorBuilder {
         }
         boolean validationErr = true;
         /*
-         * supports numbers, parentheses(), hyphens and may contain + sign in
-         * the beginning and can contain whitespaces in between and length
-         * allowed is 0-25 chars.
+         * supports numbers, parentheses(), hyphens and may contain + sign in the beginning and can contain whitespaces
+         * in between and length allowed is 0-25 chars.
          */
         final String regex = "^\\+?[0-9. ()-]{0,25}$";
         final Pattern pattern = Pattern.compile(regex);
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/debug/EchoHeadersResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/debug/EchoHeadersResource.java
index 97c94f3..f2cd0dc 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/debug/EchoHeadersResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/debug/EchoHeadersResource.java
@@ -29,15 +29,12 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 /**
- * Returns HTTP Request headers. Useful for debugging (e.g. for <a href=
- * "https://issues.apache.org/jira/browse/FINERACT-914">FINERACT-914</a>. Could
- * later be replaced with <a href=
+ * Returns HTTP Request headers. Useful for debugging (e.g. for
+ * <a href= "https://issues.apache.org/jira/browse/FINERACT-914">FINERACT-914</a>. Could later be replaced with <a href=
  * "https://docs.spring.io/spring-boot/docs/current/reference/html/production-ready-features.html#production-ready-http-tracing">Spring
- * Boot's Actuator HTTP Tracing</a> (see also
- * <a href="https://www.baeldung.com/spring-boot-actuator-http">related tutorial
- * on Baeldung.com</a>), but that exposes a lot more than just the current
- * request out of the box, and would to be properly authenticated for a
- * dedicated new debug role.
+ * Boot's Actuator HTTP Tracing</a> (see also <a href="https://www.baeldung.com/spring-boot-actuator-http">related
+ * tutorial on Baeldung.com</a>), but that exposes a lot more than just the current request out of the box, and would to
+ * be properly authenticated for a dedicated new debug role.
  *
  * @author Michael Vorburger.ch
  */
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/AbstractAuditableCustom.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/AbstractAuditableCustom.java
index c674e9c..4bb1097 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/AbstractAuditableCustom.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/AbstractAuditableCustom.java
@@ -33,12 +33,10 @@ import org.springframework.data.domain.Auditable;
 import org.springframework.data.jpa.domain.AbstractAuditable;
 
 /**
- * A custom copy of {@link AbstractAuditable} to override the column names used
- * on database. It also uses Instant instead of LocalDateTime for created and
- * modified.
+ * A custom copy of {@link AbstractAuditable} to override the column names used on database. It also uses Instant
+ * instead of LocalDateTime for created and modified.
  *
- * Abstract base class for auditable entities. Stores the audit values in
- * persistent fields.
+ * Abstract base class for auditable entities. Stores the audit values in persistent fields.
  *
  * @param <U>
  *            the auditing type. Typically some kind of user.
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/AbstractPersistableCustom.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/AbstractPersistableCustom.java
index 3b7976d..be134dc 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/AbstractPersistableCustom.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/AbstractPersistableCustom.java
@@ -29,14 +29,12 @@ import org.springframework.data.domain.Persistable;
 /**
  * Abstract base class for entities.
  *
- * Inspired by {@link org.springframework.data.jpa.domain.AbstractPersistable},
- * but Id is always Long (and this class thus does not require generic
- * parameterization), and auto-generation is of strategy
+ * Inspired by {@link org.springframework.data.jpa.domain.AbstractPersistable}, but Id is always Long (and this class
+ * thus does not require generic parameterization), and auto-generation is of strategy
  * {@link javax.persistence.GenerationType#IDENTITY}.
  *
- * The {@link #equals(Object)} and {@link #hashCode()} methods are NOT
- * implemented here, which is untypical for JPA (it's usually implemented based
- * on the Id), because "we end up with issues on OpenJPA" (TODO clarify this).
+ * The {@link #equals(Object)} and {@link #hashCode()} methods are NOT implemented here, which is untypical for JPA
+ * (it's usually implemented based on the Id), because "we end up with issues on OpenJPA" (TODO clarify this).
  */
 @MappedSuperclass
 public abstract class AbstractPersistableCustom implements Persistable<Long>, Serializable {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/JdbcSupport.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/JdbcSupport.java
index cbb3bfa..3b2d727 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/JdbcSupport.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/JdbcSupport.java
@@ -31,8 +31,8 @@ import org.joda.time.LocalTime;
 import org.springframework.jdbc.support.JdbcUtils;
 
 /**
- * Support for retrieving possibly null values from jdbc recordset delegating to
- * springs {@link JdbcUtils} where possible.
+ * Support for retrieving possibly null values from jdbc recordset delegating to springs {@link JdbcUtils} where
+ * possible.
  */
 public class JdbcSupport {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/AbstractPlatformDomainRuleException.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/AbstractPlatformDomainRuleException.java
index bb57263..5d830ef 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/AbstractPlatformDomainRuleException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/AbstractPlatformDomainRuleException.java
@@ -19,8 +19,7 @@
 package org.apache.fineract.infrastructure.core.exception;
 
 /**
- * A {@link RuntimeException} thrown when valid api request end up violating
- * some domain rule.
+ * A {@link RuntimeException} thrown when valid api request end up violating some domain rule.
  */
 public abstract class AbstractPlatformDomainRuleException extends RuntimeException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/AbstractPlatformResourceNotFoundException.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/AbstractPlatformResourceNotFoundException.java
index 7f66684..1f0d7c7 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/AbstractPlatformResourceNotFoundException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/AbstractPlatformResourceNotFoundException.java
@@ -19,8 +19,7 @@
 package org.apache.fineract.infrastructure.core.exception;
 
 /**
- * A {@link RuntimeException} thrown when resources that are queried for are not
- * found.
+ * A {@link RuntimeException} thrown when resources that are queried for are not found.
  */
 public abstract class AbstractPlatformResourceNotFoundException extends RuntimeException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/AbstractPlatformServiceUnavailableException.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/AbstractPlatformServiceUnavailableException.java
index e718b9c..cf905ec 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/AbstractPlatformServiceUnavailableException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/AbstractPlatformServiceUnavailableException.java
@@ -19,8 +19,7 @@
 package org.apache.fineract.infrastructure.core.exception;
 
 /**
- * A {@link RuntimeException} thrown when resources that are queried for are not
- * found.
+ * A {@link RuntimeException} thrown when resources that are queried for are not found.
  */
 public abstract class AbstractPlatformServiceUnavailableException extends RuntimeException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/GeneralPlatformDomainRuleException.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/GeneralPlatformDomainRuleException.java
index b5b9139..be6574e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/GeneralPlatformDomainRuleException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/GeneralPlatformDomainRuleException.java
@@ -19,8 +19,7 @@
 package org.apache.fineract.infrastructure.core.exception;
 
 /**
- * A {@link RuntimeException} thrown when valid api request end up violating
- * some domain rule.
+ * A {@link RuntimeException} thrown when valid api request end up violating some domain rule.
  */
 public final class GeneralPlatformDomainRuleException extends AbstractPlatformDomainRuleException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/InvalidJsonException.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/InvalidJsonException.java
index 2be9348..56cc5de 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/InvalidJsonException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/InvalidJsonException.java
@@ -19,8 +19,8 @@
 package org.apache.fineract.infrastructure.core.exception;
 
 /**
- * A {@link RuntimeException} that is thrown in the case where invalid JSON is
- * sent in the body of the request to the platform api.
+ * A {@link RuntimeException} that is thrown in the case where invalid JSON is sent in the body of the request to the
+ * platform api.
  */
 public class InvalidJsonException extends RuntimeException {
     //
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/MultiException.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/MultiException.java
index 1e51d74..7f8e175 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/MultiException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/MultiException.java
@@ -31,14 +31,12 @@ import org.slf4j.LoggerFactory;
 /**
  * Exception with multiple root causes.
  *
- * Intended to be used in places where N operations are performed in a loop over
- * something, each of which could fail, but where we don't want to fail
- * immediately but continue, and then fail at end.
+ * Intended to be used in places where N operations are performed in a loop over something, each of which could fail,
+ * but where we don't want to fail immediately but continue, and then fail at end.
  *
  * <p>
- * The failures should typically also each be logged within the loop, as they
- * occur; this exception is only thrown to propagate the failure, and the caller
- * may or may not log this with the details.
+ * The failures should typically also each be logged within the loop, as they occur; this exception is only thrown to
+ * propagate the failure, and the caller may or may not log this with the details.
  *
  * <p>
  * Originally inspired by org.junit.runners.model.MultipleFailureException
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/PlatformDataIntegrityException.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/PlatformDataIntegrityException.java
index 0b58ae9..d2a0c4a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/PlatformDataIntegrityException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/PlatformDataIntegrityException.java
@@ -19,8 +19,7 @@
 package org.apache.fineract.infrastructure.core.exception;
 
 /**
- * A {@link RuntimeException} thrown when data integrity problems happen due to
- * state modifying actions.
+ * A {@link RuntimeException} thrown when data integrity problems happen due to state modifying actions.
  */
 public class PlatformDataIntegrityException extends RuntimeException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/UnsupportedParameterException.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/UnsupportedParameterException.java
index cb0fa11..64d2c4d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/UnsupportedParameterException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/UnsupportedParameterException.java
@@ -21,8 +21,8 @@ package org.apache.fineract.infrastructure.core.exception;
 import java.util.List;
 
 /**
- * A {@link RuntimeException} that is thrown in the case where invalid
- * parameters are sent in the body of the request to the platform api.
+ * A {@link RuntimeException} that is thrown in the case where invalid parameters are sent in the body of the request to
+ * the platform api.
  */
 public class UnsupportedParameterException extends RuntimeException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/AccessDeniedExceptionMapper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/AccessDeniedExceptionMapper.java
index 41b8af8..a4f78d6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/AccessDeniedExceptionMapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/AccessDeniedExceptionMapper.java
@@ -29,12 +29,10 @@ import org.springframework.security.access.AccessDeniedException;
 import org.springframework.stereotype.Component;
 
 /**
- * An {@link ExceptionMapper} to map {@link AccessDeniedException} thrown by
- * platform into a HTTP API friendly format.
+ * An {@link ExceptionMapper} to map {@link AccessDeniedException} thrown by platform into a HTTP API friendly format.
  *
- * The {@link AccessDeniedException} is thrown by spring security on platform
- * when an attempt is made to use functionality for which the user does have
- * sufficient privileges.
+ * The {@link AccessDeniedException} is thrown by spring security on platform when an attempt is made to use
+ * functionality for which the user does have sufficient privileges.
  */
 @Provider
 @Component
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/BadCredentialsExceptionMapper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/BadCredentialsExceptionMapper.java
index 58a0da7..f458ea8 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/BadCredentialsExceptionMapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/BadCredentialsExceptionMapper.java
@@ -29,12 +29,11 @@ import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.stereotype.Component;
 
 /**
- * An {@link ExceptionMapper} to map {@link BadCredentialsException} thrown by
- * platform during authentication into a HTTP API friendly format.
+ * An {@link ExceptionMapper} to map {@link BadCredentialsException} thrown by platform during authentication into a
+ * HTTP API friendly format.
  *
- * The {@link BadCredentialsException} is thrown by spring security on platform
- * when an attempt is made to authenticate using invalid username/password
- * credentials.
+ * The {@link BadCredentialsException} is thrown by spring security on platform when an attempt is made to authenticate
+ * using invalid username/password credentials.
  */
 @Provider
 @Component
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/InvalidJsonExceptionMapper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/InvalidJsonExceptionMapper.java
index ed4e542..a1799ca 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/InvalidJsonExceptionMapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/InvalidJsonExceptionMapper.java
@@ -29,8 +29,7 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 /**
- * An {@link ExceptionMapper} to map {@link InvalidJsonException} thrown by
- * platform into a HTTP API friendly format.
+ * An {@link ExceptionMapper} to map {@link InvalidJsonException} thrown by platform into a HTTP API friendly format.
  */
 @Provider
 @Component
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/InvalidTenantIdentifierExceptionMapper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/InvalidTenantIdentifierExceptionMapper.java
index b59e2ab..e17fb36 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/InvalidTenantIdentifierExceptionMapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/InvalidTenantIdentifierExceptionMapper.java
@@ -29,11 +29,11 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 /**
- * An {@link ExceptionMapper} to map {@link InvalidTenantIdentiferException}
- * thrown by platform during authentication into a HTTP API friendly format.
+ * An {@link ExceptionMapper} to map {@link InvalidTenantIdentiferException} thrown by platform during authentication
+ * into a HTTP API friendly format.
  *
- * The {@link InvalidTenantIdentiferException} is thrown by spring security on
- * platform when a request contains an invalid tenant identifier.
+ * The {@link InvalidTenantIdentiferException} is thrown by spring security on platform when a request contains an
+ * invalid tenant identifier.
  */
 @Provider
 @Component
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/JsonSyntaxExceptionMapper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/JsonSyntaxExceptionMapper.java
index 5c4a7ba..dd3664a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/JsonSyntaxExceptionMapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/JsonSyntaxExceptionMapper.java
@@ -29,8 +29,7 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 /**
- * An {@link ExceptionMapper} to map {@link JsonSyntaxException} thrown by
- * platform into a HTTP API friendly format.
+ * An {@link ExceptionMapper} to map {@link JsonSyntaxException} thrown by platform into a HTTP API friendly format.
  */
 @Provider
 @Component
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/MalformedJsonExceptionMapper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/MalformedJsonExceptionMapper.java
index ceff4a7..92ac18f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/MalformedJsonExceptionMapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/MalformedJsonExceptionMapper.java
@@ -29,8 +29,7 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 /**
- * An {@link ExceptionMapper} to map {@link MalformedJsonException} thrown by
- * platform into a HTTP API friendly format.
+ * An {@link ExceptionMapper} to map {@link MalformedJsonException} thrown by platform into a HTTP API friendly format.
  */
 @Provider
 @Component
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/NoAuthorizationExceptionMapper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/NoAuthorizationExceptionMapper.java
index 81da823..7fc2b34 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/NoAuthorizationExceptionMapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/NoAuthorizationExceptionMapper.java
@@ -29,11 +29,11 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 /**
- * An {@link ExceptionMapper} to map {@link NoAuthorizationException} thrown by
- * platform into a HTTP API friendly format.
+ * An {@link ExceptionMapper} to map {@link NoAuthorizationException} thrown by platform into a HTTP API friendly
+ * format.
  *
- * The {@link NoAuthorizationException} is thrown on platform when an attempt is
- * made to use functionality for which the user does have sufficient privileges.
+ * The {@link NoAuthorizationException} is thrown on platform when an attempt is made to use functionality for which the
+ * user does have sufficient privileges.
  */
 @Provider
 @Component
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/PlatformApiDataValidationExceptionMapper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/PlatformApiDataValidationExceptionMapper.java
index 5568d70..14a0045 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/PlatformApiDataValidationExceptionMapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/PlatformApiDataValidationExceptionMapper.java
@@ -29,11 +29,11 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 /**
- * An {@link ExceptionMapper} to map {@link PlatformApiDataValidationException}
- * thrown by platform into a HTTP API friendly format.
+ * An {@link ExceptionMapper} to map {@link PlatformApiDataValidationException} thrown by platform into a HTTP API
+ * friendly format.
  *
- * The {@link PlatformApiDataValidationException} is typically thrown in data
- * validation of the parameters passed in with an api request.
+ * The {@link PlatformApiDataValidationException} is typically thrown in data validation of the parameters passed in
+ * with an api request.
  */
 @Provider
 @Component
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/PlatformDataIntegrityExceptionMapper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/PlatformDataIntegrityExceptionMapper.java
index b58b80b..304ec2a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/PlatformDataIntegrityExceptionMapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/PlatformDataIntegrityExceptionMapper.java
@@ -29,11 +29,11 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 /**
- * An {@link ExceptionMapper} to map {@link PlatformDataIntegrityException}
- * thrown by platform into a HTTP API friendly format.
+ * An {@link ExceptionMapper} to map {@link PlatformDataIntegrityException} thrown by platform into a HTTP API friendly
+ * format.
  *
- * The {@link PlatformDataIntegrityException} is thrown when modifying api call
- * result in data integrity checks to be fired.
+ * The {@link PlatformDataIntegrityException} is thrown when modifying api call result in data integrity checks to be
+ * fired.
  */
 @Provider
 @Component
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/PlatformDomainRuleExceptionMapper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/PlatformDomainRuleExceptionMapper.java
index 4d4dc2f..6ca3fd0 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/PlatformDomainRuleExceptionMapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/PlatformDomainRuleExceptionMapper.java
@@ -29,11 +29,11 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 /**
- * An {@link ExceptionMapper} to map {@link AbstractPlatformDomainRuleException}
- * thrown by platform into a HTTP API friendly format.
+ * An {@link ExceptionMapper} to map {@link AbstractPlatformDomainRuleException} thrown by platform into a HTTP API
+ * friendly format.
  *
- * The {@link AbstractPlatformDomainRuleException} is thrown when an api call
- * results is some internal business/domain logic been violated.
+ * The {@link AbstractPlatformDomainRuleException} is thrown when an api call results is some internal business/domain
+ * logic been violated.
  */
 @Provider
 @Component
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/PlatformInternalServerExceptionMapper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/PlatformInternalServerExceptionMapper.java
index 77d4d85..d10a0af 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/PlatformInternalServerExceptionMapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/PlatformInternalServerExceptionMapper.java
@@ -29,11 +29,10 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 /**
- * An {@link ExceptionMapper} to map {@link PlatformInternalServerException}
- * thrown by platform into a HTTP API friendly format.
+ * An {@link ExceptionMapper} to map {@link PlatformInternalServerException} thrown by platform into a HTTP API friendly
+ * format.
  *
- * The {@link PlatformInternalServerException} is thrown when an api call
- * results in unexpected server side exceptions.
+ * The {@link PlatformInternalServerException} is thrown when an api call results in unexpected server side exceptions.
  */
 @Provider
 @Component
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/PlatformResourceNotFoundExceptionMapper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/PlatformResourceNotFoundExceptionMapper.java
index 1a61b22..6cd9835 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/PlatformResourceNotFoundExceptionMapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/PlatformResourceNotFoundExceptionMapper.java
@@ -29,12 +29,11 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 /**
- * An {@link ExceptionMapper} to map
- * {@link AbstractPlatformResourceNotFoundException} thrown by platform into a
- * HTTP API friendly format.
+ * An {@link ExceptionMapper} to map {@link AbstractPlatformResourceNotFoundException} thrown by platform into a HTTP
+ * API friendly format.
  *
- * The {@link AbstractPlatformResourceNotFoundException} is thrown when an api
- * call for a resource that is expected to exist does not.
+ * The {@link AbstractPlatformResourceNotFoundException} is thrown when an api call for a resource that is expected to
+ * exist does not.
  */
 @Provider
 @Component
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/PlatformServiceUnavailableExceptionMapper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/PlatformServiceUnavailableExceptionMapper.java
old mode 100755
new mode 100644
index 2d64ae7..b9c216c
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/PlatformServiceUnavailableExceptionMapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/PlatformServiceUnavailableExceptionMapper.java
@@ -29,12 +29,11 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 /**
- * An {@link ExceptionMapper} to map
- * {@link AbstractPlatformServiceUnavailableException} thrown by platform into a
- * HTTP API friendly format.
+ * An {@link ExceptionMapper} to map {@link AbstractPlatformServiceUnavailableException} thrown by platform into a HTTP
+ * API friendly format.
  *
- * The {@link AbstractPlatformServiceUnavailableException} is thrown when an api
- * call for a resource that is expected to exist does not.
+ * The {@link AbstractPlatformServiceUnavailableException} is thrown when an api call for a resource that is expected to
+ * exist does not.
  */
 
 @Provider
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/UnAuthenticatedUserExceptionMapper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/UnAuthenticatedUserExceptionMapper.java
index beb2c90..aa8092d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/UnAuthenticatedUserExceptionMapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/UnAuthenticatedUserExceptionMapper.java
@@ -29,8 +29,8 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 /**
- * An {@link ExceptionMapper} to map {@link UnAuthenticatedUserException} thrown
- * by platform into a HTTP API friendly format.
+ * An {@link ExceptionMapper} to map {@link UnAuthenticatedUserException} thrown by platform into a HTTP API friendly
+ * format.
  */
 @Provider
 @Component
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/UnrecognizedQueryParamExceptionMapper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/UnrecognizedQueryParamExceptionMapper.java
index 7e9760f..b441a2c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/UnrecognizedQueryParamExceptionMapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/UnrecognizedQueryParamExceptionMapper.java
@@ -32,11 +32,11 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 /**
- * An {@link ExceptionMapper} to map {@link UnrecognizedQueryParamException}
- * thrown by platform into a HTTP API friendly format.
+ * An {@link ExceptionMapper} to map {@link UnrecognizedQueryParamException} thrown by platform into a HTTP API friendly
+ * format.
  *
- * The {@link UnrecognizedQueryParamException} is typically thrown when a
- * parameter is passed during and post or put that is not expected.
+ * The {@link UnrecognizedQueryParamException} is typically thrown when a parameter is passed during and post or put
+ * that is not expected.
  */
 @Provider
 @Component
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/UnsupportedCommandExceptionMapper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/UnsupportedCommandExceptionMapper.java
index 1d1f2a7..2358e44 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/UnsupportedCommandExceptionMapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/UnsupportedCommandExceptionMapper.java
@@ -32,8 +32,8 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 /**
- * An {@link ExceptionMapper} to map {@link UnsupportedCommandException} thrown
- * by platform into a HTTP API friendly format.
+ * An {@link ExceptionMapper} to map {@link UnsupportedCommandException} thrown by platform into a HTTP API friendly
+ * format.
  */
 @Provider
 @Component
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/UnsupportedParameterExceptionMapper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/UnsupportedParameterExceptionMapper.java
index 21cb4fd..9f3b40f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/UnsupportedParameterExceptionMapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exceptionmapper/UnsupportedParameterExceptionMapper.java
@@ -32,8 +32,8 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 /**
- * An {@link ExceptionMapper} to map {@link UnsupportedParameterException}
- * thrown by platform into a HTTP API friendly format.
+ * An {@link ExceptionMapper} to map {@link UnsupportedParameterException} thrown by platform into a HTTP API friendly
+ * format.
  */
 @Provider
 @Component
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/filters/ResponseCorsFilter.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/filters/ResponseCorsFilter.java
index 1ad64e6..a3fad86 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/filters/ResponseCorsFilter.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/filters/ResponseCorsFilter.java
@@ -25,8 +25,8 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.ResponseBuilder;
 
 /**
- * Filter that returns a response with headers that allows for Cross-Origin
- * Requests (CORs) to be performed against the platform API.
+ * Filter that returns a response with headers that allows for Cross-Origin Requests (CORs) to be performed against the
+ * platform API.
  */
 public class ResponseCorsFilter implements ContainerResponseFilter {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/AbstractFromApiJsonDeserializer.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/AbstractFromApiJsonDeserializer.java
index 5b2db9f..643c4ca 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/AbstractFromApiJsonDeserializer.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/AbstractFromApiJsonDeserializer.java
@@ -19,8 +19,7 @@
 package org.apache.fineract.infrastructure.core.serialization;
 
 /**
- * Abstract implementation of {@link FromApiJsonDeserializer} that can be
- * extended for specific commands.
+ * Abstract implementation of {@link FromApiJsonDeserializer} that can be extended for specific commands.
  */
 public abstract class AbstractFromApiJsonDeserializer<T> implements FromApiJsonDeserializer<T> {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/AbstractFromCommandJsonDeserializer.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/AbstractFromCommandJsonDeserializer.java
index 63ff3c6..c74abbf 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/AbstractFromCommandJsonDeserializer.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/AbstractFromCommandJsonDeserializer.java
@@ -19,8 +19,7 @@
 package org.apache.fineract.infrastructure.core.serialization;
 
 /**
- * Abstract implementation of {@link FromCommandJsonDeserializer} that can be
- * extended for specific commands.
+ * Abstract implementation of {@link FromCommandJsonDeserializer} that can be extended for specific commands.
  */
 public abstract class AbstractFromCommandJsonDeserializer<T> implements FromCommandJsonDeserializer<T> {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/ApiRequestJsonSerializationSettings.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/ApiRequestJsonSerializationSettings.java
index 7f1b501..2104a63 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/ApiRequestJsonSerializationSettings.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/ApiRequestJsonSerializationSettings.java
@@ -21,8 +21,8 @@ package org.apache.fineract.infrastructure.core.serialization;
 import java.util.Set;
 
 /**
- * A class to encapsulate settings we allow on API that affect how JSON is to be
- * serialized for the response to api call.
+ * A class to encapsulate settings we allow on API that affect how JSON is to be serialized for the response to api
+ * call.
  */
 public class ApiRequestJsonSerializationSettings {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/CommandSerializerDefaultToJson.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/CommandSerializerDefaultToJson.java
index 301f9d8..8d9f5db 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/CommandSerializerDefaultToJson.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/CommandSerializerDefaultToJson.java
@@ -22,8 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
- * Implementation of {@link CommandSerializer} that serializes the commands into
- * JSON using google-gson.
+ * Implementation of {@link CommandSerializer} that serializes the commands into JSON using google-gson.
  */
 @Component
 public class CommandSerializerDefaultToJson implements CommandSerializer {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/DefaultToApiJsonSerializer.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/DefaultToApiJsonSerializer.java
index df21a88..12251ce 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/DefaultToApiJsonSerializer.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/DefaultToApiJsonSerializer.java
@@ -26,8 +26,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
- * An abstract helper implementation of {@link ToApiJsonSerializer} for
- * resources to serialize their Java data objects into JSON.
+ * An abstract helper implementation of {@link ToApiJsonSerializer} for resources to serialize their Java data objects
+ * into JSON.
  */
 @Component
 public final class DefaultToApiJsonSerializer<T> implements ToApiJsonSerializer<T> {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/FromJsonHelper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/FromJsonHelper.java
index 26d66c2..b990439 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/FromJsonHelper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/FromJsonHelper.java
@@ -118,10 +118,9 @@ public class FromJsonHelper {
 
     /**
      * @param parentPropertyName
-     *            The full json path to this property,the value is appended to
-     *            the parameter name while generating an error message <br>
-     *            Ex: property "name" in Object "person" would be named as
-     *            "person.name"
+     *            The full json path to this property,the value is appended to the parameter name while generating an
+     *            error message <br>
+     *            Ex: property "name" in Object "person" would be named as "person.name"
      * @param object
      * @param supportedParams
      */
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/JsonParserHelper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/JsonParserHelper.java
index 7286244..a1f8278 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/JsonParserHelper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/JsonParserHelper.java
@@ -157,11 +157,10 @@ public class JsonParserHelper {
     }
 
     /**
-     * Method used to extract integers from unformatted strings. Ex: "1" ,
-     * "100002" etc
+     * Method used to extract integers from unformatted strings. Ex: "1" , "100002" etc
      *
-     * Please note that this method does not support extracting Integers from
-     * locale specific formatted strings Ex "1,000" etc
+     * Please note that this method does not support extracting Integers from locale specific formatted strings Ex
+     * "1,000" etc
      *
      * @param parameterName
      * @param element
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/AbandonedConnectionCleanupShutdownListener.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/AbandonedConnectionCleanupShutdownListener.java
index cad8f5c..f7d2975 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/AbandonedConnectionCleanupShutdownListener.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/AbandonedConnectionCleanupShutdownListener.java
@@ -34,8 +34,8 @@ public class AbandonedConnectionCleanupShutdownListener implements ApplicationLi
     private static final Logger LOG = LoggerFactory.getLogger(AbandonedConnectionCleanupShutdownListener.class);
 
     /**
-     * @see JobRegisterServiceImpl#onApplicationEvent(ContextClosedEvent) doc
-     *      re. why we use ContextClosedEvent instead of ContextStoppedEvent
+     * @see JobRegisterServiceImpl#onApplicationEvent(ContextClosedEvent) doc re. why we use ContextClosedEvent instead
+     *      of ContextStoppedEvent
      */
     @Override
     public void onApplicationEvent(@SuppressWarnings("unused") ContextClosedEvent event) {
@@ -46,12 +46,9 @@ public class AbandonedConnectionCleanupShutdownListener implements ApplicationLi
         /*
          * try {
          *
-         * AbandonedConnectionCleanupThread.shutdown(); tomcat memoroy leak with
-         * mysql connector. With Drizzle not required
-         * LOG.info("Shut-down of AbandonedConnectionCleanupThread successful");
-         * } catch (Throwable t) { LOG.
-         * error("Exception occurred while shut-down of AbandonedConnectionCleanupThread"
-         * , t); }
+         * AbandonedConnectionCleanupThread.shutdown(); tomcat memoroy leak with mysql connector. With Drizzle not
+         * required LOG.info("Shut-down of AbandonedConnectionCleanupThread successful"); } catch (Throwable t) { LOG.
+         * error("Exception occurred while shut-down of AbandonedConnectionCleanupThread" , t); }
          */
 
         // This manually deregisters JDBC driver, which prevents Tomcat 7 from
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/RoutingDataSource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/RoutingDataSource.java
index fb2117c..0a63c77 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/RoutingDataSource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/RoutingDataSource.java
@@ -27,14 +27,13 @@ import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
 import org.springframework.stereotype.Service;
 
 /**
- * Based on springs {@link AbstractRoutingDataSource} idea, this is a
- * {@link DataSource} that routes or delegates to another data source depending
- * on the tenant details passed in the request.
+ * Based on springs {@link AbstractRoutingDataSource} idea, this is a {@link DataSource} that routes or delegates to
+ * another data source depending on the tenant details passed in the request.
  *
  * The tenant details are process earlier and stored in a {@link ThreadLocal}.
  *
- * The {@link RoutingDataSourceService} is responsible for returning the
- * appropriate {@link DataSource} for the tenant of this request.
+ * The {@link RoutingDataSourceService} is responsible for returning the appropriate {@link DataSource} for the tenant
+ * of this request.
  */
 @Service(value = "routingDataSource")
 public class RoutingDataSource extends AbstractDataSource {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/RoutingDataSourceService.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/RoutingDataSourceService.java
index dff9b53..343ef1c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/RoutingDataSourceService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/RoutingDataSourceService.java
@@ -21,8 +21,7 @@ package org.apache.fineract.infrastructure.core.service;
 import javax.sql.DataSource;
 
 /**
- * A service for getting hold of the appropriate {@link DataSource} connection
- * pool.
+ * A service for getting hold of the appropriate {@link DataSource} connection pool.
  */
 public interface RoutingDataSourceService {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/RoutingDataSourceServiceFactory.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/RoutingDataSourceServiceFactory.java
old mode 100755
new mode 100644
index f16a5a4..112cd44
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/RoutingDataSourceServiceFactory.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/RoutingDataSourceServiceFactory.java
@@ -23,8 +23,7 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
 
 /**
- * Factory class to get data source service based on the details stored in
- * {@link ThreadLocal} variable for this request
+ * Factory class to get data source service based on the details stored in {@link ThreadLocal} variable for this request
  *
  * {@link ThreadLocalContextUtil} is used to retrieve the Context
  *
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/SearchParameters.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/SearchParameters.java
index 0d42505..f51efd6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/SearchParameters.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/SearchParameters.java
@@ -478,8 +478,7 @@ public final class SearchParameters {
     }
 
     /**
-     * creates an instance of the SearchParameters from a request for the report
-     * mailing job run history
+     * creates an instance of the SearchParameters from a request for the report mailing job run history
      *
      * @return SearchParameters object
      **/
@@ -492,8 +491,7 @@ public final class SearchParameters {
     }
 
     /**
-     * creates an instance of the {@link SearchParameters} from a request for
-     * the report mailing job
+     * creates an instance of the {@link SearchParameters} from a request for the report mailing job
      *
      * @return {@link SearchParameters} object
      */
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/TenantDatabaseUpgradeService.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/TenantDatabaseUpgradeService.java
index b4ac1e5..c6a0aa6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/TenantDatabaseUpgradeService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/TenantDatabaseUpgradeService.java
@@ -38,8 +38,7 @@ import org.springframework.jdbc.support.rowset.SqlRowSet;
 import org.springframework.stereotype.Service;
 
 /**
- * A service that picks up on tenants that are configured to auto-update their
- * specific schema on application startup.
+ * A service that picks up on tenants that are configured to auto-update their specific schema on application startup.
  */
 @Service
 public class TenantDatabaseUpgradeService {
@@ -94,8 +93,7 @@ public class TenantDatabaseUpgradeService {
     }
 
     /**
-     * Initializes, and if required upgrades (using Flyway) the Tenant DB
-     * itself.
+     * Initializes, and if required upgrades (using Flyway) the Tenant DB itself.
      */
     private void upgradeTenantDB() {
         String dbHostname = getEnvVar("FINERACT_DEFAULT_TENANTDB_HOSTNAME", "localhost");
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/TomcatJdbcDataSourcePerTenantService.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/TomcatJdbcDataSourcePerTenantService.java
index c363ceb..d9e941b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/TomcatJdbcDataSourcePerTenantService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/TomcatJdbcDataSourcePerTenantService.java
@@ -31,12 +31,10 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 /**
- * Implementation that returns a new or existing connection pool datasource
- * based on the tenant details stored in a {@link ThreadLocal} variable for this
- * request.
+ * Implementation that returns a new or existing connection pool datasource based on the tenant details stored in a
+ * {@link ThreadLocal} variable for this request.
  *
- * {@link ThreadLocalContextUtil} is used to retrieve the
- * {@link FineractPlatformTenant} for the request.
+ * {@link ThreadLocalContextUtil} is used to retrieve the {@link FineractPlatformTenant} for the request.
  */
 @Service
 public class TomcatJdbcDataSourcePerTenantService implements RoutingDataSourceService {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/data/ResultsetColumnValueData.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/data/ResultsetColumnValueData.java
index 7f561fc..9a9e8a1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/data/ResultsetColumnValueData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/data/ResultsetColumnValueData.java
@@ -21,8 +21,7 @@ package org.apache.fineract.infrastructure.dataqueries.data;
 import java.io.Serializable;
 
 /**
- * Immutable data object representing a possible value for a given resultset
- * column.
+ * Immutable data object representing a possible value for a given resultset column.
  */
 public class ResultsetColumnValueData implements Serializable {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/domain/ReportParameterUsage.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/domain/ReportParameterUsage.java
index 6665154..2cdc460 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/domain/ReportParameterUsage.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/domain/ReportParameterUsage.java
@@ -51,19 +51,14 @@ public final class ReportParameterUsage extends AbstractPersistableCustom {
     }
 
     /*
-     * @Override public boolean equals(final Object obj) { if (obj == null) {
-     * return false; } if (obj == this) { return true; } if (obj.getClass() !=
-     * getClass()) { return false; } final ReportParameterUsage rhs =
-     * (ReportParameterUsage) obj; return new
-     * EqualsBuilder().appendSuper(super.equals(obj)) // .append(getId(),
-     * rhs.getId()) // .append(this.report.getId(), rhs.report.getId()) //
-     * .append(this.parameter.getId(), rhs.parameter.getId()) //
-     * .append(this.reportParameterName, rhs.reportParameterName) //
-     * .isEquals(); }
+     * @Override public boolean equals(final Object obj) { if (obj == null) { return false; } if (obj == this) { return
+     * true; } if (obj.getClass() != getClass()) { return false; } final ReportParameterUsage rhs =
+     * (ReportParameterUsage) obj; return new EqualsBuilder().appendSuper(super.equals(obj)) // .append(getId(),
+     * rhs.getId()) // .append(this.report.getId(), rhs.report.getId()) // .append(this.parameter.getId(),
+     * rhs.parameter.getId()) // .append(this.reportParameterName, rhs.reportParameterName) // .isEquals(); }
      *
-     * @Override public int hashCode() { return new HashCodeBuilder(3, 5) //
-     * .append(getId()) // .append(this.report.getId()) //
-     * .append(this.parameter.getId()) // .append(this.reportParameterName) //
+     * @Override public int hashCode() { return new HashCodeBuilder(3, 5) // .append(getId()) //
+     * .append(this.report.getId()) // .append(this.parameter.getId()) // .append(this.reportParameterName) //
      * .toHashCode(); }
      */
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/domain/ReportRepositoryWrapper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/domain/ReportRepositoryWrapper.java
index 3772c04..ef22cb2 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/domain/ReportRepositoryWrapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/domain/ReportRepositoryWrapper.java
@@ -23,9 +23,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
- * A wrapper class for the ReportRepository that provides a method that returns
- * a Report entity if it exists, else throws "ReportNotFoundException" exception
- * if the Report does not exist
+ * A wrapper class for the ReportRepository that provides a method that returns a Report entity if it exists, else
+ * throws "ReportNotFoundException" exception if the Report does not exist
  **/
 @Service
 public class ReportRepositoryWrapper {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/exception/DatatableEntryRequiredException.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/exception/DatatableEntryRequiredException.java
index 90a540e..5f78ead 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/exception/DatatableEntryRequiredException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/exception/DatatableEntryRequiredException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.infrastructure.dataqueries.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
- * A {@link AbstractPlatformDomainRuleException} thrown when datatable resources
- * are not found.
+ * A {@link AbstractPlatformDomainRuleException} thrown when datatable resources are not found.
  */
 public class DatatableEntryRequiredException extends AbstractPlatformDomainRuleException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/EntityDatatableChecksWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/EntityDatatableChecksWritePlatformServiceImpl.java
index e28e5b5..6fdebe7 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/EntityDatatableChecksWritePlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/EntityDatatableChecksWritePlatformServiceImpl.java
@@ -263,8 +263,7 @@ public class EntityDatatableChecksWritePlatformServiceImpl implements EntityData
     }
 
     /*
-     * Guaranteed to throw an exception no matter what the data integrity issue
-     * is.
+     * Guaranteed to throw an exception no matter what the data integrity issue is.
      */
     private void handleReportDataIntegrityIssues(final JsonCommand command, final Throwable realCause, final Exception dae) {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/GenericDataServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/GenericDataServiceImpl.java
index 288ffac..824fe44 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/GenericDataServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/GenericDataServiceImpl.java
@@ -254,8 +254,7 @@ public class GenericDataServiceImpl implements GenericDataService {
     }
 
     /*
-     * Candidate for using caching there to get allowed 'column values' from
-     * code/codevalue tables
+     * Candidate for using caching there to get allowed 'column values' from code/codevalue tables
      */
     private List<ResultsetColumnValueData> retreiveColumnValues(final String codeName) {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingServiceImpl.java
index c39d281..b0e72b1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingServiceImpl.java
@@ -449,16 +449,12 @@ public class ReadReportingServiceImpl implements ReadReportingService {
             return sql;
 
             /*
-             * used to only return reports that the use can run as done in
-             * report UI but not necessary as there is a read_report permission
-             * which should give user access to look all reports +
-             * " where exists" + " (select 'f'" + " from m_appuser_role ur " +
-             * " join m_role r on r.id = ur.role_id" +
+             * used to only return reports that the use can run as done in report UI but not necessary as there is a
+             * read_report permission which should give user access to look all reports + " where exists" +
+             * " (select 'f'" + " from m_appuser_role ur " + " join m_role r on r.id = ur.role_id" +
              * " left join m_role_permission rp on rp.role_id = r.id" +
-             * " left join m_permission p on p.id = rp.permission_id" +
-             * " where ur.appuser_id = " + userId +
-             * " and (p.code in ('ALL_FUNCTIONS', 'ALL_FUNCTIONS_READ') or p.code = concat('READ_', r.report_name))) "
-             * ;
+             * " left join m_permission p on p.id = rp.permission_id" + " where ur.appuser_id = " + userId +
+             * " and (p.code in ('ALL_FUNCTIONS', 'ALL_FUNCTIONS_READ') or p.code = concat('READ_', r.report_name))) " ;
              */
         }
 
@@ -547,73 +543,56 @@ public class ReadReportingServiceImpl implements ReadReportingService {
         // This complete implementation should be moved to Pentaho Report
         // Service
         /*
-         * String outputType = "HTML"; if
-         * (StringUtils.isNotBlank(outputTypeParam)) { outputType =
-         * outputTypeParam; }
+         * String outputType = "HTML"; if (StringUtils.isNotBlank(outputTypeParam)) { outputType = outputTypeParam; }
          *
-         * if (!(outputType.equalsIgnoreCase("HTML") ||
-         * outputType.equalsIgnoreCase("PDF") ||
-         * outputType.equalsIgnoreCase("XLS") || outputType
-         * .equalsIgnoreCase("CSV"))) { throw new
-         * PlatformDataIntegrityException("error.msg.invalid.outputType",
-         * "No matching Output Type: " + outputType); }
+         * if (!(outputType.equalsIgnoreCase("HTML") || outputType.equalsIgnoreCase("PDF") ||
+         * outputType.equalsIgnoreCase("XLS") || outputType .equalsIgnoreCase("CSV"))) { throw new
+         * PlatformDataIntegrityException("error.msg.invalid.outputType", "No matching Output Type: " + outputType); }
          *
-         * if (this.noPentaho) { throw new
-         * PlatformDataIntegrityException("error.msg.no.pentaho",
+         * if (this.noPentaho) { throw new PlatformDataIntegrityException("error.msg.no.pentaho",
          * "Pentaho is not enabled", "Pentaho is not enabled"); }
          *
-         * final String reportPath =
-         * FileSystemContentRepository.FINERACT_BASE_DIR + File.separator +
-         * "pentahoReports" + File.separator + reportName + ".prpt";
-         * LOG.info("Report path: {}", reportPath);
+         * final String reportPath = FileSystemContentRepository.FINERACT_BASE_DIR + File.separator + "pentahoReports" +
+         * File.separator + reportName + ".prpt"; LOG.info("Report path: {}", reportPath);
          *
-         * // load report definition final ResourceManager manager = new
-         * ResourceManager(); manager.registerDefaults(); Resource res;
+         * // load report definition final ResourceManager manager = new ResourceManager(); manager.registerDefaults();
+         * Resource res;
          *
-         * try { res = manager.createDirectly(reportPath, MasterReport.class);
-         * final MasterReport masterReport = (MasterReport) res.getResource();
-         * final DefaultReportEnvironment reportEnvironment =
+         * try { res = manager.createDirectly(reportPath, MasterReport.class); final MasterReport masterReport =
+         * (MasterReport) res.getResource(); final DefaultReportEnvironment reportEnvironment =
          * (DefaultReportEnvironment) masterReport.getReportEnvironment();
          *
-         * if (locale != null) { reportEnvironment.setLocale(locale); }
-         * addParametersToReport(masterReport, queryParams, runReportAsUser,
-         * errorLog);
+         * if (locale != null) { reportEnvironment.setLocale(locale); } addParametersToReport(masterReport, queryParams,
+         * runReportAsUser, errorLog);
          *
          * final ByteArrayOutputStream baos = new ByteArrayOutputStream();
          *
-         * if ("PDF".equalsIgnoreCase(outputType)) {
-         * PdfReportUtil.createPDF(masterReport, baos); return baos; }
+         * if ("PDF".equalsIgnoreCase(outputType)) { PdfReportUtil.createPDF(masterReport, baos); return baos; }
          *
-         * if ("XLS".equalsIgnoreCase(outputType)) {
-         * ExcelReportUtil.createXLS(masterReport, baos); return baos; }
+         * if ("XLS".equalsIgnoreCase(outputType)) { ExcelReportUtil.createXLS(masterReport, baos); return baos; }
          *
-         * if ("CSV".equalsIgnoreCase(outputType)) {
-         * CSVReportUtil.createCSV(masterReport, baos, "UTF-8"); return baos; }
+         * if ("CSV".equalsIgnoreCase(outputType)) { CSVReportUtil.createCSV(masterReport, baos, "UTF-8"); return baos;
+         * }
          *
-         * if ("HTML".equalsIgnoreCase(outputType)) {
-         * HtmlReportUtil.createStreamHTML(masterReport, baos); return baos; }
+         * if ("HTML".equalsIgnoreCase(outputType)) { HtmlReportUtil.createStreamHTML(masterReport, baos); return baos;
+         * }
          *
          * } catch (final ResourceException e) { errorLog.
          * append("ReadReportingServiceImpl.generatePentahoReportAsOutputStream method threw a Pentaho ResourceException "
          * + "exception: " + e.getMessage() + " ---------- "); throw new
-         * PlatformDataIntegrityException("error.msg.reporting.error",
-         * e.getMessage()); } catch (final ReportProcessingException e) {
-         * errorLog.
+         * PlatformDataIntegrityException("error.msg.reporting.error", e.getMessage()); } catch (final
+         * ReportProcessingException e) { errorLog.
          * append("ReadReportingServiceImpl.generatePentahoReportAsOutputStream method threw a Pentaho ReportProcessingException "
          * + "exception: " + e.getMessage() + " ---------- "); throw new
-         * PlatformDataIntegrityException("error.msg.reporting.error",
-         * e.getMessage()); } catch (final IOException e) { errorLog.
-         * append("ReadReportingServiceImpl.generatePentahoReportAsOutputStream method threw an IOException "
+         * PlatformDataIntegrityException("error.msg.reporting.error", e.getMessage()); } catch (final IOException e) {
+         * errorLog. append("ReadReportingServiceImpl.generatePentahoReportAsOutputStream method threw an IOException "
          * + "exception: " + e.getMessage() + " ---------- "); throw new
-         * PlatformDataIntegrityException("error.msg.reporting.error",
-         * e.getMessage()); }
+         * PlatformDataIntegrityException("error.msg.reporting.error", e.getMessage()); }
          *
          * errorLog.
          * append("ReadReportingServiceImpl.generatePentahoReportAsOutputStream method threw a PlatformDataIntegrityException "
-         * + "exception: No matching Output Type: " + outputType +
-         * " ---------- "); throw new
-         * PlatformDataIntegrityException("error.msg.invalid.outputType",
-         * "No matching Output Type: " + outputType);
+         * + "exception: No matching Output Type: " + outputType + " ---------- "); throw new
+         * PlatformDataIntegrityException("error.msg.invalid.outputType", "No matching Output Type: " + outputType);
          *
          */
         return null;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java
index 4d52941..69a18f9 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java
@@ -571,11 +571,10 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
             Boolean multiRow = this.fromJsonHelper.extractBooleanNamed("multiRow", element);
 
             /***
-             * In cases of tables storing hierarchical entities (like m_group),
-             * different entities would end up being stored in the same table.
+             * In cases of tables storing hierarchical entities (like m_group), different entities would end up being
+             * stored in the same table.
              *
-             * Ex: Centers are a specific type of group, add abstractions for
-             * the same
+             * Ex: Centers are a specific type of group, add abstractions for the same
              ***/
             final String actualAppTableName = mapToActualAppTable(apptableName);
 
@@ -850,8 +849,8 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
     }
 
     /**
-     * Update data table, set column value to empty string where current value
-     * is NULL. Run update SQL only if the "mandatory" property is set to true
+     * Update data table, set column value to empty string where current value is NULL. Run update SQL only if the
+     * "mandatory" property is set to true
      *
      * @param datatableName
      *            Name of data table
@@ -1303,18 +1302,15 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
 
     private String dataScopedSQL(final String appTable, final Long appTableId) {
         /*
-         * unfortunately have to, one way or another, be able to restrict data
-         * to the users office hierarchy. Here, a few key tables are done. But
-         * if additional fields are needed on other tables the same pattern
-         * applies
+         * unfortunately have to, one way or another, be able to restrict data to the users office hierarchy. Here, a
+         * few key tables are done. But if additional fields are needed on other tables the same pattern applies
          */
 
         final AppUser currentUser = this.context.authenticatedUser();
         String scopedSQL = null;
         /*
-         * m_loan and m_savings_account are connected to an m_office thru either
-         * an m_client or an m_group If both it means it relates to an m_client
-         * that is in a group (still an m_client account)
+         * m_loan and m_savings_account are connected to an m_office thru either an m_client or an m_group If both it
+         * means it relates to an m_client that is in a group (still an m_client account)
          */
         if (appTable.equalsIgnoreCase("m_loan")) {
             scopedSQL = "select  distinctrow x.* from ("
@@ -1488,8 +1484,7 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
     }
 
     /**
-     * This method is used special for ppi cases Where the score need to be
-     * computed
+     * This method is used special for ppi cases Where the score need to be computed
      *
      * @param columnHeaders
      * @param datatable
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReportWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReportWritePlatformServiceImpl.java
index 1e507a5..61f7e8d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReportWritePlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReportWritePlatformServiceImpl.java
@@ -174,8 +174,7 @@ public class ReportWritePlatformServiceImpl implements ReportWritePlatformServic
     }
 
     /*
-     * Guaranteed to throw an exception no matter what the data integrity issue
-     * is.
+     * Guaranteed to throw an exception no matter what the data integrity issue is.
      */
     private void handleReportDataIntegrityIssues(final JsonCommand command, final Throwable realCause, final Exception dve) {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/DocumentManagementApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/DocumentManagementApiResource.java
index d5b8a8b..2aa88d3 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/DocumentManagementApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/DocumentManagementApiResource.java
@@ -132,13 +132,12 @@ public class DocumentManagementApiResource {
             @FormDataParam("description") @ApiParam(value = "description") final String description) {
 
         /**
-         * TODO: also need to have a backup and stop reading from stream after
-         * max size is reached to protect against malicious clients
+         * TODO: also need to have a backup and stop reading from stream after max size is reached to protect against
+         * malicious clients
          **/
 
         /**
-         * TODO: need to extract the actual file type and determine if they are
-         * permissable
+         * TODO: need to extract the actual file type and determine if they are permissable
          **/
         final DocumentCommand documentCommand = new DocumentCommand(null, null, entityType, entityId, name, fileDetails.getFileName(),
                 fileSize, bodyPart.getMediaType().toString(), description, null);
@@ -172,8 +171,7 @@ public class DocumentManagementApiResource {
         modifiedParams.add("description");
 
         /***
-         * Populate Document command based on whether a file has also been
-         * passed in as a part of the update
+         * Populate Document command based on whether a file has also been passed in as a part of the update
          ***/
         DocumentCommand documentCommand = null;
         if (inputStream != null && fileDetails.getFileName() != null) {
@@ -188,8 +186,7 @@ public class DocumentManagementApiResource {
                     null);
         }
         /***
-         * TODO: does not return list of changes, should be done for consistency
-         * with rest of API
+         * TODO: does not return list of changes, should be done for consistency with rest of API
          **/
         final CommandProcessingResult identifier = this.documentWritePlatformService.updateDocument(documentCommand, inputStream);
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/ImagesApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/ImagesApiResource.java
index f042b16..d587b7b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/ImagesApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/ImagesApiResource.java
@@ -173,8 +173,8 @@ public class ImagesApiResource {
     }
 
     /**
-     * This method is added only for consistency with other URL patterns and for
-     * maintaining consistency of usage of the HTTP "verb" at the client side
+     * This method is added only for consistency with other URL patterns and for maintaining consistency of usage of the
+     * HTTP "verb" at the client side
      */
     @PUT
     @Consumes({ MediaType.MULTIPART_FORM_DATA })
@@ -186,8 +186,8 @@ public class ImagesApiResource {
     }
 
     /**
-     * This method is added only for consistency with other URL patterns and for
-     * maintaining consistency of usage of the HTTP "verb" at the client side
+     * This method is added only for consistency with other URL patterns and for maintaining consistency of usage of the
+     * HTTP "verb" at the client side
      *
      * Upload image as a Data URL (essentially a base64 encoded stream)
      */
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/ContentRepositoryUtils.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/ContentRepositoryUtils.java
index 449438a..62ff738 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/ContentRepositoryUtils.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/ContentRepositoryUtils.java
@@ -150,10 +150,9 @@ public class ContentRepositoryUtils {
 
     public static void validateFileSizeWithinPermissibleRange(final Long fileSize, final String name) {
         /**
-         * Using Content-Length gives me size of the entire request, which is
-         * good enough for now for a fast fail as the length of the rest of the
-         * content i.e name and description while compared to the uploaded file
-         * size is negligible
+         * Using Content-Length gives me size of the entire request, which is good enough for now for a fast fail as the
+         * length of the rest of the content i.e name and description while compared to the uploaded file size is
+         * negligible
          **/
         if (fileSize != null && ((fileSize / (1024 * 1024)) > ContentRepository.MAX_FILE_UPLOAD_SIZE_IN_MB)) {
             throw new ContentManagementException(name, fileSize, ContentRepository.MAX_FILE_UPLOAD_SIZE_IN_MB);
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/exception/InvalidEntityTypeForDocumentManagementException.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/exception/InvalidEntityTypeForDocumentManagementException.java
index ae9b426..655f771 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/exception/InvalidEntityTypeForDocumentManagementException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/exception/InvalidEntityTypeForDocumentManagementException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.infrastructure.documentmanagement.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
 
 /**
- * A {@link RuntimeException} thrown when document management functionality is
- * invoked for invalid Entity Types
+ * A {@link RuntimeException} thrown when document management functionality is invoked for invalid Entity Types
  */
 public class InvalidEntityTypeForDocumentManagementException extends AbstractPlatformResourceNotFoundException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityAccessRepositoryWrapper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityAccessRepositoryWrapper.java
index 540f685..f0010ef 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityAccessRepositoryWrapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityAccessRepositoryWrapper.java
@@ -24,8 +24,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * Wrapper for {@link FineractEntityAccessRepository} that adds NULL checking
- * and Error handling capabilities
+ * Wrapper for {@link FineractEntityAccessRepository} that adds NULL checking and Error handling capabilities
  * </p>
  */
 @Service
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityRelation.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityRelation.java
index faa96d2..2f2d4e4 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityRelation.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityRelation.java
@@ -44,10 +44,8 @@ public class FineractEntityRelation extends AbstractPersistableCustom {
     private String codeName;
 
     /*
-     * private FineractEntityRelation(final String fromEntityType, final String
-     * toEntityType, final String codeName) { this.fromEntityType =
-     * fromEntityType; this.toEntityType = toEntityType; this.codeName =
-     * codeName; }
+     * private FineractEntityRelation(final String fromEntityType, final String toEntityType, final String codeName) {
+     * this.fromEntityType = fromEntityType; this.toEntityType = toEntityType; this.codeName = codeName; }
      */
 
     public FineractEntityRelation() {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityToEntityMapping.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityToEntityMapping.java
index 40f869e..396fbf0 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityToEntityMapping.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityToEntityMapping.java
@@ -125,14 +125,12 @@ public class FineractEntityToEntityMapping extends AbstractPersistableCustom {
     }
 
     /*
-     * public Date getStartDate() { Date startDate = null; if (this.startDate !=
-     * null) { startDate = Date.fromDateFields(this.startDate); } return
-     * startDate; }
+     * public Date getStartDate() { Date startDate = null; if (this.startDate != null) { startDate =
+     * Date.fromDateFields(this.startDate); } return startDate; }
      */
 
     /*
-     * public Date getStartDate() { return (Date) ObjectUtils.defaultIfNull(new
-     * Date(this.startDate), null); }
+     * public Date getStartDate() { return (Date) ObjectUtils.defaultIfNull(new Date(this.startDate), null); }
      */
 
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/exception/NotOfficeSpecificProductException.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/exception/NotOfficeSpecificProductException.java
index d5a636d..164eecf 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/exception/NotOfficeSpecificProductException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/exception/NotOfficeSpecificProductException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.infrastructure.entityaccess.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
- * A {@link RuntimeException} thrown when valid api request end up violating
- * some domain rule.
+ * A {@link RuntimeException} thrown when valid api request end up violating some domain rule.
  */
 public class NotOfficeSpecificProductException extends AbstractPlatformDomainRuleException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessReadServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessReadServiceImpl.java
index 15e6292..72052ac 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessReadServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessReadServiceImpl.java
@@ -59,16 +59,13 @@ public class FineractEntityAccessReadServiceImpl implements FineractEntityAccess
      * (non-Javadoc)
      *
      * @see org.apache.fineract.infrastructure.entityaccess.service.
-     * FineractEntityAccessReadService#getSQLQueryWithListOfIDsForEntityAccess
-     * (Long, org.apache.fineract.infrastructure.entityaccess.domain.
-     * FineractEntityType,
-     * org.apache.fineract.infrastructure.entityaccess.domain.
-     * FineractEntityAccessType,
-     * org.apache.fineract.infrastructure.entityaccess.domain.
-     * FineractEntityType, boolean)
+     * FineractEntityAccessReadService#getSQLQueryWithListOfIDsForEntityAccess (Long,
+     * org.apache.fineract.infrastructure.entityaccess.domain. FineractEntityType,
+     * org.apache.fineract.infrastructure.entityaccess.domain. FineractEntityAccessType,
+     * org.apache.fineract.infrastructure.entityaccess.domain. FineractEntityType, boolean)
      *
-     * This method returns the list of entity IDs as a comma separated list Or
-     * null if there is no entity restrictions or if there
+     * This method returns the list of entity IDs as a comma separated list Or null if there is no entity restrictions
+     * or if there
      */
     @Override
     public String getSQLQueryInClause_WithListOfIDsForEntityAccess(FineractEntityType firstEntityType, final Long relId,
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessWriteService.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessWriteService.java
index 27cd7e5..fbd8f53 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessWriteService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessWriteService.java
@@ -36,11 +36,9 @@ public interface FineractEntityAccessWriteService {
             final Long secondEntityId);
 
     /*
-     * CommandProcessingResult updateEntityAccess ( final Long entityAccessId,
-     * final JsonCommand command);
+     * CommandProcessingResult updateEntityAccess ( final Long entityAccessId, final JsonCommand command);
      *
-     * CommandProcessingResult removeEntityAccess ( final String entityType,
-     * final Long entityId, final Long accessType, final String
-     * secondEntityType, final Long secondEntityId);
+     * CommandProcessingResult removeEntityAccess ( final String entityType, final Long entityId, final Long accessType,
+     * final String secondEntityType, final Long secondEntityId);
      */
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessWriteServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessWriteServiceImpl.java
index 8deabfb..849c4ce 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessWriteServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessWriteServiceImpl.java
@@ -184,13 +184,11 @@ public class FineractEntityAccessWriteServiceImpl implements FineractEntityAcces
     }
 
     /*
-     * @Override public CommandProcessingResult updateEntityAccess(Long
-     * entityAccessId, JsonCommand command) { // TODO Auto-generated method stub
-     * return null; }
+     * @Override public CommandProcessingResult updateEntityAccess(Long entityAccessId, JsonCommand command) { // TODO
+     * Auto-generated method stub return null; }
      *
-     * @Override public CommandProcessingResult removeEntityAccess(String
-     * entityType, Long entityId, Long accessType, String secondEntityType, Long
-     * secondEntityId) { // TODO Auto-generated method stub return null; }
+     * @Override public CommandProcessingResult removeEntityAccess(String entityType, Long entityId, Long accessType,
+     * String secondEntityType, Long secondEntityId) { // TODO Auto-generated method stub return null; }
      */
 
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/GcmConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/GcmConstants.java
index c5c2470..3b37ea6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/GcmConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/GcmConstants.java
@@ -59,15 +59,13 @@ public final class GcmConstants {
     public static final String PARAM_DELAY_WHILE_IDLE = "delay_while_idle";
 
     /**
-     * HTTP parameter for telling gcm to validate the message without actually
-     * sending it.
+     * HTTP parameter for telling gcm to validate the message without actually sending it.
      */
     public static final String PARAM_DRY_RUN = "dry_run";
 
     /**
-     * HTTP parameter for package name that can be used to restrict message
-     * delivery by matching against the package name used to generate the
-     * registration id.
+     * HTTP parameter for package name that can be used to restrict message delivery by matching against the package
+     * name used to generate the registration id.
      */
     public static final String PARAM_RESTRICTED_PACKAGE_NAME = "restricted_package_name";
 
@@ -97,22 +95,19 @@ public final class GcmConstants {
     public static final String MESSAGE_PRIORITY_HIGH = "high";
 
     /**
-     * A particular message could not be sent because the GCM servers were not
-     * available. Used only on JSON requests, as in plain text requests
-     * unavailability is indicated by a 503 response.
+     * A particular message could not be sent because the GCM servers were not available. Used only on JSON requests, as
+     * in plain text requests unavailability is indicated by a 503 response.
      */
     public static final String ERROR_UNAVAILABLE = "Unavailable";
 
     /**
-     * A particular message could not be sent because the GCM servers
-     * encountered an error. Used only on JSON requests, as in plain text
-     * requests internal errors are indicated by a 500 response.
+     * A particular message could not be sent because the GCM servers encountered an error. Used only on JSON requests,
+     * as in plain text requests internal errors are indicated by a 500 response.
      */
     public static final String ERROR_INTERNAL_SERVER_ERROR = "InternalServerError";
 
     /**
-     * Token returned by GCM when the requested registration id has a canonical
-     * value.
+     * Token returned by GCM when the requested registration id has a canonical value.
      */
     public static final String TOKEN_CANONICAL_REG_ID = "registration_id";
 
@@ -207,8 +202,7 @@ public final class GcmConstants {
     public static final String JSON_FAILURE = "failure";
 
     /**
-     * JSON-only field representing the number of messages with a canonical
-     * registration id.
+     * JSON-only field representing the number of messages with a canonical registration id.
      */
     public static final String JSON_CANONICAL_IDS = "canonical_ids";
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/Message.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/Message.java
index 7da0771..fdfd536 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/Message.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/Message.java
@@ -28,8 +28,7 @@ import org.apache.fineract.infrastructure.gcm.GcmConstants;
  * GCM message.
  *
  * <p>
- * Instances of this class are immutable and should be created using a
- * {@link Builder}. Examples:
+ * Instances of this class are immutable and should be created using a {@link Builder}. Examples:
  *
  * <strong>Simplest message:</strong>
  *
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/MulticastResult.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/MulticastResult.java
index 4980bd1..67ee751 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/MulticastResult.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/MulticastResult.java
@@ -112,8 +112,7 @@ public final class MulticastResult implements Serializable {
     }
 
     /**
-     * Gets the number of successful messages that also returned a canonical
-     * registration id.
+     * Gets the number of successful messages that also returned a canonical registration id.
      */
     public int getCanonicalIds() {
         return canonicalIds;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/Notification.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/Notification.java
index 0183b24..cc6213c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/Notification.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/Notification.java
@@ -26,8 +26,7 @@ import java.util.List;
  * GCM message notification part.
  *
  * <p>
- * Instances of this class are immutable and should be created using a
- * {@link Builder}. Examples:
+ * Instances of this class are immutable and should be created using a {@link Builder}. Examples:
  *
  * <strong>Simplest notification:</strong>
  *
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/Result.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/Result.java
index 7825027..54b679c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/Result.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/Result.java
@@ -25,16 +25,14 @@ import java.util.List;
  * Result of a GCM message request that returned HTTP status code 200.
  *
  * <p>
- * If the message is successfully created, the {@link #getMessageId()} returns
- * the message id and {@link #getErrorCodeName()} returns {@literal null};
- * otherwise, {@link #getMessageId()} returns {@literal null} and
+ * If the message is successfully created, the {@link #getMessageId()} returns the message id and
+ * {@link #getErrorCodeName()} returns {@literal null}; otherwise, {@link #getMessageId()} returns {@literal null} and
  * {@link #getErrorCodeName()} returns the code of the error.
  *
  * <p>
- * There are cases when a request is accept and the message successfully
- * created, but GCM has a canonical registration id for that device. In this
- * case, the server should update the registration id to avoid rejected requests
- * in the future.
+ * There are cases when a request is accept and the message successfully created, but GCM has a canonical registration
+ * id for that device. In this case, the server should update the registration id to avoid rejected requests in the
+ * future.
  *
  * <p>
  * In a nutshell, the workflow to handle a result is:
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/Sender.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/Sender.java
index 3beeff1..312a59e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/Sender.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/Sender.java
@@ -116,8 +116,8 @@ public class Sender {
     }
 
     /**
-     * Set the underlying URLConnection's connect timeout (in milliseconds). A
-     * timeout value of 0 specifies an infinite timeout.
+     * Set the underlying URLConnection's connect timeout (in milliseconds). A timeout value of 0 specifies an infinite
+     * timeout.
      * <p>
      * Default is the system's default timeout.
      *
@@ -131,8 +131,8 @@ public class Sender {
     }
 
     /**
-     * Set the underlying URLConnection's read timeout (in milliseconds). A
-     * timeout value of 0 specifies an infinite timeout.
+     * Set the underlying URLConnection's read timeout (in milliseconds). A timeout value of 0 specifies an infinite
+     * timeout.
      * <p>
      * Default is the system's default timeout.
      *
@@ -149,15 +149,13 @@ public class Sender {
      * Sends a message to one device, retrying in case of unavailability.
      *
      * <p>
-     * <strong>Note: </strong> this method uses exponential back-off to retry in
-     * case of service unavailability and hence could block the calling thread
-     * for many seconds.
+     * <strong>Note: </strong> this method uses exponential back-off to retry in case of service unavailability and
+     * hence could block the calling thread for many seconds.
      *
      * @param message
      *            message to be sent, including the device's registration id.
      * @param to
-     *            registration token, notification key, or topic where the
-     *            message will be sent.
+     *            registration token, notification key, or topic where the message will be sent.
      * @param retries
      *            number of retries in case of service unavailability errors.
      *
@@ -197,12 +195,11 @@ public class Sender {
     }
 
     /**
-     * Sends a message without retrying in case of service unavailability. See
-     * {@link #send(Message, String, int)} for more info.
+     * Sends a message without retrying in case of service unavailability. See {@link #send(Message, String, int)} for
+     * more info.
      *
-     * @return result of the post, or {@literal null} if the GCM service was
-     *         unavailable or any network exception caused the request to fail,
-     *         or if the response contains more than one result.
+     * @return result of the post, or {@literal null} if the GCM service was unavailable or any network exception caused
+     *         the request to fail, or if the response contains more than one result.
      *
      * @throws InvalidRequestException
      *             if GCM didn't returned a 200 status.
@@ -300,9 +297,8 @@ public class Sender {
      * Sends a message to many devices, retrying in case of unavailability.
      *
      * <p>
-     * <strong>Note: </strong> this method uses exponential back-off to retry in
-     * case of service unavailability and hence could block the calling thread
-     * for many seconds.
+     * <strong>Note: </strong> this method uses exponential back-off to retry in case of service unavailability and
+     * hence could block the calling thread for many seconds.
      *
      * @param message
      *            message to be sent.
@@ -391,8 +387,7 @@ public class Sender {
     }
 
     /**
-     * Updates the status of the messages sent to devices and the list of
-     * devices that should be retried.
+     * Updates the status of the messages sent to devices and the list of devices that should be retried.
      *
      * @param unsentRegIds
      *            list of devices that are still pending an update.
@@ -424,11 +419,11 @@ public class Sender {
     }
 
     /**
-     * Sends a message without retrying in case of service unavailability. See
-     * {@link #send(Message, List, int)} for more info.
+     * Sends a message without retrying in case of service unavailability. See {@link #send(Message, List, int)} for
+     * more info.
      *
-     * @return multicast results if the message was sent successfully,
-     *         {@literal null} if it failed but could be retried.
+     * @return multicast results if the message was sent successfully, {@literal null} if it failed but could be
+     *         retried.
      *
      * @throws IllegalArgumentException
      *             if registrationIds is {@literal null} or empty.
@@ -623,9 +618,8 @@ public class Sender {
      * Makes an HTTP POST request to a given endpoint.
      *
      * <p>
-     * <strong>Note: </strong> the returned connected should not be
-     * disconnected, otherwise it would kill persistent connections made using
-     * Keep-Alive.
+     * <strong>Note: </strong> the returned connected should not be disconnected, otherwise it would kill persistent
+     * connections made using Keep-Alive.
      *
      * @param url
      *            endpoint to post the request.
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/annotation/CronMethodParser.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/annotation/CronMethodParser.java
index 69e5900..cff50fb 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/annotation/CronMethodParser.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/annotation/CronMethodParser.java
@@ -65,8 +65,7 @@ public class CronMethodParser {
     }
 
     /**
-     * method adds all the method names to map with annotation attribute value
-     * as key
+     * method adds all the method names to map with annotation attribute value as key
      */
     private static void findAnnotationMethods(final Class<? extends Annotation> annotationClass, final String attributeName)
             throws IOException {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/JobRegisterServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/JobRegisterServiceImpl.java
index 169532b..bbbab50 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/JobRegisterServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/JobRegisterServiceImpl.java
@@ -59,9 +59,8 @@ import org.springframework.scheduling.quartz.SchedulerFactoryBean;
 import org.springframework.stereotype.Service;
 
 /**
- * Service class to create and load batch jobs to Scheduler using
- * {@link SchedulerFactoryBean} ,{@link MethodInvokingJobDetailFactoryBean} and
- * {@link CronTriggerFactoryBean}
+ * Service class to create and load batch jobs to Scheduler using {@link SchedulerFactoryBean}
+ * ,{@link MethodInvokingJobDetailFactoryBean} and {@link CronTriggerFactoryBean}
  */
 @Service
 public class JobRegisterServiceImpl implements JobRegisterService, ApplicationListener<ContextClosedEvent> {
@@ -255,10 +254,9 @@ public class JobRegisterServiceImpl implements JobRegisterService, ApplicationLi
     }
 
     /**
-     * Need to use ContextClosedEvent instead of ContextStoppedEvent because in
-     * case Spring Boot fails to start-up (e.g. because Tomcat port is already
-     * in use) then org.springframework.boot.SpringApplication.run(String...)
-     * does a context.close(); and not a context.stop();
+     * Need to use ContextClosedEvent instead of ContextStoppedEvent because in case Spring Boot fails to start-up (e.g.
+     * because Tomcat port is already in use) then org.springframework.boot.SpringApplication.run(String...) does a
+     * context.close(); and not a context.stop();
      */
     @Override
     public void onApplicationEvent(@SuppressWarnings("unused") ContextClosedEvent event) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedulerJobListener.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedulerJobListener.java
index 1ef28df..257cf02 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedulerJobListener.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedulerJobListener.java
@@ -37,9 +37,8 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Component;
 
 /**
- * Global job Listener class to set Tenant details to
- * {@link ThreadLocalContextUtil} for batch Job and stores the batch job status
- * to database after the execution
+ * Global job Listener class to set Tenant details to {@link ThreadLocalContextUtil} for batch Job and stores the batch
+ * job status to database after the execution
  *
  */
 @Component
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedulerStopListener.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedulerStopListener.java
old mode 100755
new mode 100644
index 8103eaf..eb8c961
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedulerStopListener.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedulerStopListener.java
@@ -25,8 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
- * Global job Listener class to Stop the temporary scheduler once job execution
- * completes
+ * Global job Listener class to Stop the temporary scheduler once job execution completes
  */
 @Component
 public class SchedulerStopListener implements JobListener {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/openjpa/OpenJpaDialect.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/openjpa/OpenJpaDialect.java
index db5a432..744b374 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/openjpa/OpenJpaDialect.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/openjpa/OpenJpaDialect.java
@@ -37,8 +37,8 @@ import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionException;
 
 /**
- * {@link org.springframework.orm.jpa.JpaDialect} implementation for Apache
- * OpenJPA. Developed and tested against OpenJPA 2.2.
+ * {@link org.springframework.orm.jpa.JpaDialect} implementation for Apache OpenJPA. Developed and tested against
+ * OpenJPA 2.2.
  *
  * @author Costin Leau
  * @author Juergen Hoeller
@@ -94,8 +94,8 @@ public class OpenJpaDialect extends DefaultJpaDialect {
     }
 
     /**
-     * Transaction data Object exposed from {@code beginTransaction},
-     * implementing the {@link SavepointManager} interface.
+     * Transaction data Object exposed from {@code beginTransaction}, implementing the {@link SavepointManager}
+     * interface.
      */
     private static class OpenJpaTransactionData implements SavepointManager {
 
@@ -131,11 +131,9 @@ public class OpenJpaDialect extends DefaultJpaDialect {
     }
 
     /**
-     * {@link ConnectionHandle} implementation that fetches a new
-     * OpenJPA-provided Connection for every {@code getConnection} call and
-     * closes the Connection on {@code releaseConnection}. This is necessary
-     * because OpenJPA requires the fetched Connection to be closed before
-     * continuing EntityManager work.
+     * {@link ConnectionHandle} implementation that fetches a new OpenJPA-provided Connection for every
+     * {@code getConnection} call and closes the Connection on {@code releaseConnection}. This is necessary because
+     * OpenJPA requires the fetched Connection to be closed before continuing EntityManager work.
      *
      * @see org.apache.openjpa.persistence.OpenJPAEntityManager#getConnection()
      */
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/openjpa/OpenJpaVendorAdapter.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/openjpa/OpenJpaVendorAdapter.java
index 02d4f9b..37b5c29 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/openjpa/OpenJpaVendorAdapter.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/openjpa/OpenJpaVendorAdapter.java
@@ -30,13 +30,12 @@ import org.springframework.orm.jpa.vendor.AbstractJpaVendorAdapter;
 import org.springframework.orm.jpa.vendor.Database;
 
 /**
- * {@link org.springframework.orm.jpa.JpaVendorAdapter} implementation for
- * Apache OpenJPA. Developed and tested against OpenJPA 2.2.
+ * {@link org.springframework.orm.jpa.JpaVendorAdapter} implementation for Apache OpenJPA. Developed and tested against
+ * OpenJPA 2.2.
  *
  * <p>
- * Exposes OpenJPA's persistence provider and EntityManager extension interface,
- * and supports {@link AbstractJpaVendorAdapter}'s common configuration
- * settings.
+ * Exposes OpenJPA's persistence provider and EntityManager extension interface, and supports
+ * {@link AbstractJpaVendorAdapter}'s common configuration settings.
  *
  * @author Costin Leau
  * @author Juergen Hoeller
@@ -90,8 +89,7 @@ public class OpenJpaVendorAdapter extends AbstractJpaVendorAdapter {
      *
      * @param database
      *            the specified database
-     * @return the OpenJPA database dictionary name, or {@code null} if none
-     *         found
+     * @return the OpenJPA database dictionary name, or {@code null} if none found
      */
     protected String determineDatabaseDictionary(Database database) {
         switch (database) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/data/ReportMailingJobEmailAttachmentFileFormat.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/data/ReportMailingJobEmailAttachmentFileFormat.java
index 2360b87..50a27e1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/data/ReportMailingJobEmailAttachmentFileFormat.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/data/ReportMailingJobEmailAttachmentFileFormat.java
@@ -147,8 +147,7 @@ public enum ReportMailingJobEmailAttachmentFileFormat {
     }
 
     /**
-     * get a {@link EnumOptionData} representation of the
-     * {@link ReportMailingJobEmailAttachmentFileFormat} object
+     * get a {@link EnumOptionData} representation of the {@link ReportMailingJobEmailAttachmentFileFormat} object
      *
      * @return {@link EnumOptionData} object
      */
@@ -160,8 +159,8 @@ public enum ReportMailingJobEmailAttachmentFileFormat {
     }
 
     /**
-     * get the {@link EnumOptionData} representation of all valid
-     * {@link ReportMailingJobEmailAttachmentFileFormat} objects
+     * get the {@link EnumOptionData} representation of all valid {@link ReportMailingJobEmailAttachmentFileFormat}
+     * objects
      *
      * @return List of {@link EnumOptionData} objects
      */
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/data/ReportMailingJobStretchyReportParamDateOption.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/data/ReportMailingJobStretchyReportParamDateOption.java
index 6cf84a8..1894e17 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/data/ReportMailingJobStretchyReportParamDateOption.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/data/ReportMailingJobStretchyReportParamDateOption.java
@@ -46,8 +46,7 @@ public enum ReportMailingJobStretchyReportParamDateOption {
     }
 
     /**
-     * Creates a new {@link ReportMailingJobStretchyReportParamDateOption}
-     * object
+     * Creates a new {@link ReportMailingJobStretchyReportParamDateOption} object
      *
      * @param value
      *            value of the enum constant
@@ -68,8 +67,7 @@ public enum ReportMailingJobStretchyReportParamDateOption {
     }
 
     /**
-     * Creates a new {@link ReportMailingJobStretchyReportParamDateOption}
-     * object
+     * Creates a new {@link ReportMailingJobStretchyReportParamDateOption} object
      *
      * @param id
      *            id of the enum constant
@@ -125,8 +123,7 @@ public enum ReportMailingJobStretchyReportParamDateOption {
     }
 
     /**
-     * @return list of valid ReportMailingJobStretchyReportParamDateOption
-     *         values
+     * @return list of valid ReportMailingJobStretchyReportParamDateOption values
      **/
     public static Object[] validValues() {
         List<Object> validValues = new ArrayList<>();
@@ -141,8 +138,7 @@ public enum ReportMailingJobStretchyReportParamDateOption {
     }
 
     /**
-     * get a {@link EnumOptionData} representation of the
-     * {@link ReportMailingJobStretchyReportParamDateOption} object
+     * get a {@link EnumOptionData} representation of the {@link ReportMailingJobStretchyReportParamDateOption} object
      *
      * @return {@link EnumOptionData} object
      */
@@ -154,8 +150,8 @@ public enum ReportMailingJobStretchyReportParamDateOption {
     }
 
     /**
-     * get the {@link EnumOptionData} representation of all valid
-     * {@link ReportMailingJobStretchyReportParamDateOption} objects
+     * get the {@link EnumOptionData} representation of all valid {@link ReportMailingJobStretchyReportParamDateOption}
+     * objects
      *
      * @return List of {@link EnumOptionData} objects
      */
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/data/ReportMailingJobTimelineData.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/data/ReportMailingJobTimelineData.java
index e2ca647..4abc53a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/data/ReportMailingJobTimelineData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/data/ReportMailingJobTimelineData.java
@@ -21,8 +21,7 @@ package org.apache.fineract.infrastructure.reportmailingjob.data;
 import org.joda.time.LocalDate;
 
 /**
- * Immutable data object represent the timeline events of a report mailing job
- * (creation)
+ * Immutable data object represent the timeline events of a report mailing job (creation)
  **/
 @SuppressWarnings("unused")
 public class ReportMailingJobTimelineData {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/domain/ReportMailingJob.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/domain/ReportMailingJob.java
index 70f535d..ad5501c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/domain/ReportMailingJob.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/domain/ReportMailingJob.java
@@ -345,8 +345,7 @@ public class ReportMailingJob extends AbstractAuditableCustom {
     }
 
     /**
-     * delete the report mailing job, set the isDeleted property to 1 and alter
-     * the name
+     * delete the report mailing job, set the isDeleted property to 1 and alter the name
      *
      *
      **/
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/domain/ReportMailingJobRepository.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/domain/ReportMailingJobRepository.java
index 39f1de8..42aabb8 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/domain/ReportMailingJobRepository.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/domain/ReportMailingJobRepository.java
@@ -25,8 +25,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 public interface ReportMailingJobRepository extends JpaRepository<ReportMailingJob, Long>, JpaSpecificationExecutor<ReportMailingJob> {
 
     /**
-     * Returns all instances of {@link ReportMailingJob} where isActive is true
-     * and isDeleted is false
+     * Returns all instances of {@link ReportMailingJob} where isActive is true and isDeleted is false
      *
      * @return instances of {@link ReportMailingJob}
      */
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/domain/ReportMailingJobRepositoryWrapper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/domain/ReportMailingJobRepositoryWrapper.java
index 068223f..2a4077a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/domain/ReportMailingJobRepositoryWrapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/domain/ReportMailingJobRepositoryWrapper.java
@@ -33,8 +33,7 @@ public class ReportMailingJobRepositoryWrapper {
     }
 
     /**
-     * find report mailing job by ID, throw a "entity not found" exception if
-     * the job does not exist
+     * find report mailing job by ID, throw a "entity not found" exception if the job does not exist
      *
      * @param id
      *            -- the identifier of the report mailing job to be found
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/exception/ReportMailingJobConfigurationNotFoundException.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/exception/ReportMailingJobConfigurationNotFoundException.java
index a0588f0..a1e27e1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/exception/ReportMailingJobConfigurationNotFoundException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/exception/ReportMailingJobConfigurationNotFoundException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.infrastructure.reportmailingjob.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
 
 /**
- * A {@link RuntimeException} thrown when report mailing job configuration
- * resources are not found.
+ * A {@link RuntimeException} thrown when report mailing job configuration resources are not found.
  **/
 @SuppressWarnings("serial")
 public class ReportMailingJobConfigurationNotFoundException extends AbstractPlatformResourceNotFoundException {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/exception/ReportMailingJobNotFoundException.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/exception/ReportMailingJobNotFoundException.java
index 0fe74dd..bdd86bc 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/exception/ReportMailingJobNotFoundException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/exception/ReportMailingJobNotFoundException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.infrastructure.reportmailingjob.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
 
 /**
- * A {@link RuntimeException} thrown when report mailing job resources are not
- * found.
+ * A {@link RuntimeException} thrown when report mailing job resources are not found.
  **/
 @SuppressWarnings("serial")
 public class ReportMailingJobNotFoundException extends AbstractPlatformResourceNotFoundException {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/exception/ReportMailingJobRunHistoryNotFoundException.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/exception/ReportMailingJobRunHistoryNotFoundException.java
index 9f7d575..b413e10 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/exception/ReportMailingJobRunHistoryNotFoundException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/exception/ReportMailingJobRunHistoryNotFoundException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.infrastructure.reportmailingjob.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
 
 /**
- * A {@link RuntimeException} thrown when report mailing job run history
- * resources are not found.
+ * A {@link RuntimeException} thrown when report mailing job run history resources are not found.
  **/
 @SuppressWarnings("serial")
 public class ReportMailingJobRunHistoryNotFoundException extends AbstractPlatformResourceNotFoundException {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/helper/IPv4Helper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/helper/IPv4Helper.java
index 65f5543..89ee6b8 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/helper/IPv4Helper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/helper/IPv4Helper.java
@@ -26,8 +26,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * This utility provides methods to either convert an IPv4 address to its long
- * format or a 32bit dotted format.
+ * This utility provides methods to either convert an IPv4 address to its long format or a 32bit dotted format.
  *
  * @see http://hawkee.com/snippet/9731/
  */
@@ -151,8 +150,7 @@ public class IPv4Helper {
     /**
      * check if the java application is not running on a local machine
      *
-     * @return true if the application is not running on a local machine else
-     *         false
+     * @return true if the application is not running on a local machine else false
      **/
     public static boolean applicationIsNotRunningOnLocalMachine() {
         return !applicationIsRunningOnLocalMachine();
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobEmailServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobEmailServiceImpl.java
index 0c976db..97c3b86 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobEmailServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobEmailServiceImpl.java
@@ -101,8 +101,7 @@ public class ReportMailingJobEmailServiceImpl implements ReportMailingJobEmailSe
     }
 
     /**
-     * get a report mailing job configuration object by name from collection of
-     * objects
+     * get a report mailing job configuration object by name from collection of objects
      *
      * @param name
      *            -- the value of the name property
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobReadPlatformService.java
index 1553fa5..3285ece 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobReadPlatformService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobReadPlatformService.java
@@ -26,8 +26,7 @@ import org.apache.fineract.infrastructure.reportmailingjob.data.ReportMailingJob
 public interface ReportMailingJobReadPlatformService {
 
     /**
-     * Retrieve all report mailing jobs that have the isDeleted property set to
-     * 0
+     * Retrieve all report mailing jobs that have the isDeleted property set to 0
      **/
     Page<ReportMailingJobData> retrieveAllReportMailingJobs(SearchParameters searchParameters);
 
@@ -42,8 +41,7 @@ public interface ReportMailingJobReadPlatformService {
     ReportMailingJobData retrieveReportMailingJobEnumOptions();
 
     /**
-     * Retrieve all active report mailing jobs that have their isDeleted
-     * property set to 0
+     * Retrieve all active report mailing jobs that have their isDeleted property set to 0
      **/
     Collection<ReportMailingJobData> retrieveAllActiveReportMailingJobs();
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobRunHistoryReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobRunHistoryReadPlatformService.java
index d4bcd83..081da78 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobRunHistoryReadPlatformService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobRunHistoryReadPlatformService.java
@@ -25,8 +25,7 @@ import org.apache.fineract.infrastructure.reportmailingjob.data.ReportMailingJob
 public interface ReportMailingJobRunHistoryReadPlatformService {
 
     /**
-     * Retrieve all report mailing run history with similar job id to the one
-     * passed
+     * Retrieve all report mailing run history with similar job id to the one passed
      *
      * @param reportMailingJobId
      *            ReportMailingJob identifier
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobWritePlatformServiceImpl.java
index 415b8d2..7a343ed 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobWritePlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobWritePlatformServiceImpl.java
@@ -351,8 +351,7 @@ public class ReportMailingJobWritePlatformServiceImpl implements ReportMailingJo
     }
 
     /**
-     * create the next recurring DateTime from recurrence pattern, start
-     * DateTime and current DateTime
+     * create the next recurring DateTime from recurrence pattern, start DateTime and current DateTime
      *
      * @param recurrencePattern
      * @param startDateTime
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/util/ReportMailingJobDateUtil.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/util/ReportMailingJobDateUtil.java
index 18e6c53..7357234 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/util/ReportMailingJobDateUtil.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/util/ReportMailingJobDateUtil.java
@@ -88,8 +88,7 @@ public class ReportMailingJobDateUtil {
     }
 
     /**
-     * get date as string based on the value of the
-     * {@link ReportMailingJobStretchyReportParamDateOption} object
+     * get date as string based on the value of the {@link ReportMailingJobStretchyReportParamDateOption} object
      *
      * @param reportMailingJobStretchyReportParamDateOption
      *            {@link ReportMailingJobStretchyReportParamDateOption} Enum
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/validation/ReportMailingJobValidator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/validation/ReportMailingJobValidator.java
index 9a7900a..c65be89 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/validation/ReportMailingJobValidator.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/validation/ReportMailingJobValidator.java
@@ -318,8 +318,7 @@ public class ReportMailingJobValidator {
     }
 
     /**
-     * throw a PlatformApiDataValidationException exception if there are
-     * validation errors
+     * throw a PlatformApiDataValidationException exception if there are validation errors
      *
      * @param dataValidationErrors
      *            -- list of ApiParameterError objects
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/data/PlatformRequestLog.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/data/PlatformRequestLog.java
index 923f034..1ea7506 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/data/PlatformRequestLog.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/data/PlatformRequestLog.java
@@ -25,8 +25,7 @@ import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.time.StopWatch;
 
 /**
- * Immutable data object representing platform API request used for
- * logging/debugging.
+ * Immutable data object representing platform API request used for logging/debugging.
  */
 public final class PlatformRequestLog {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/exception/InvalidTenantIdentiferException.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/exception/InvalidTenantIdentiferException.java
index c5fbcba..5cc1901 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/exception/InvalidTenantIdentiferException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/exception/InvalidTenantIdentiferException.java
@@ -19,8 +19,7 @@
 package org.apache.fineract.infrastructure.security.exception;
 
 /**
- * {@link RuntimeException} thrown when an invalid tenant identifier is used in
- * request to platform.
+ * {@link RuntimeException} thrown when an invalid tenant identifier is used in request to platform.
  *
  *
  */
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/exception/NoAuthorizationException.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/exception/NoAuthorizationException.java
index 29b759c..53b3d21 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/exception/NoAuthorizationException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/exception/NoAuthorizationException.java
@@ -19,8 +19,8 @@
 package org.apache.fineract.infrastructure.security.exception;
 
 /**
- * A {@link RuntimeException} that is thrown in the case where a user does not
- * have sufficient authorization to execute operation on platform.
+ * A {@link RuntimeException} that is thrown in the case where a user does not have sufficient authorization to execute
+ * operation on platform.
  */
 public class NoAuthorizationException extends RuntimeException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/exception/ResetPasswordException.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/exception/ResetPasswordException.java
index db2a26a..ae95341 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/exception/ResetPasswordException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/exception/ResetPasswordException.java
@@ -24,8 +24,8 @@ import org.apache.fineract.infrastructure.core.data.ApiParameterError;
 import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException;
 
 /**
- * A {@link RuntimeException} that is thrown in the case where a user does not
- * have sufficient authorization to execute operation on platform.
+ * A {@link RuntimeException} that is thrown in the case where a user does not have sufficient authorization to execute
+ * operation on platform.
  */
 public class ResetPasswordException extends PlatformApiDataValidationException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/InsecureTwoFactorAuthenticationFilter.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/InsecureTwoFactorAuthenticationFilter.java
index d54927d..8ca7154 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/InsecureTwoFactorAuthenticationFilter.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/InsecureTwoFactorAuthenticationFilter.java
@@ -36,11 +36,9 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 
 /**
- * A dummy {@link TwoFactorAuthenticationFilter} filter used when 'twofactor'
- * environment profile is not active.
+ * A dummy {@link TwoFactorAuthenticationFilter} filter used when 'twofactor' environment profile is not active.
  *
- * This filter adds 'TWOFACTOR_AUTHENTICATED' authority to every authenticated
- * platform user.
+ * This filter adds 'TWOFACTOR_AUTHENTICATED' authority to every authenticated platform user.
  */
 @Service(value = "twoFactorAuthFilter")
 @Profile("!twofactor")
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareBasicAuthenticationFilter.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareBasicAuthenticationFilter.java
index 83f55a9..d7b2c33 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareBasicAuthenticationFilter.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareBasicAuthenticationFilter.java
@@ -50,17 +50,14 @@ import org.springframework.stereotype.Service;
 /**
  * A customised version of spring security's {@link BasicAuthenticationFilter}.
  *
- * This filter is responsible for extracting multi-tenant and basic auth
- * credentials from the request and checking that the details provided are
- * valid.
+ * This filter is responsible for extracting multi-tenant and basic auth credentials from the request and checking that
+ * the details provided are valid.
  *
- * If multi-tenant and basic auth credentials are valid, the details of the
- * tenant are stored in {@link FineractPlatformTenant} and stored in a
- * {@link ThreadLocal} variable for this request using
+ * If multi-tenant and basic auth credentials are valid, the details of the tenant are stored in
+ * {@link FineractPlatformTenant} and stored in a {@link ThreadLocal} variable for this request using
  * {@link ThreadLocalContextUtil}.
  *
- * If multi-tenant and basic auth credentials are invalid, a http error response
- * is returned.
+ * If multi-tenant and basic auth credentials are invalid, a http error response is returned.
  */
 @Service(value = "basicAuthenticationProcessingFilter")
 @Profile("basicauth")
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareTenantIdentifierFilter.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareTenantIdentifierFilter.java
index 4680b65..42a26fc 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareTenantIdentifierFilter.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareTenantIdentifierFilter.java
@@ -45,17 +45,14 @@ import org.springframework.web.filter.GenericFilterBean;
 
 /**
  *
- * This filter is responsible for extracting multi-tenant from the request and
- * setting Cross-Origin details to response.
+ * This filter is responsible for extracting multi-tenant from the request and setting Cross-Origin details to response.
  *
- * If multi-tenant are valid, the details of the tenant are stored in
- * {@link FineractPlatformTenant} and stored in a {@link ThreadLocal} variable
- * for this request using {@link ThreadLocalContextUtil}.
+ * If multi-tenant are valid, the details of the tenant are stored in {@link FineractPlatformTenant} and stored in a
+ * {@link ThreadLocal} variable for this request using {@link ThreadLocalContextUtil}.
  *
  * If multi-tenant are invalid, a http error response is returned.
  *
- * Used to support Oauth2 authentication and the service is loaded only when
- * "oauth" profile is active.
+ * Used to support Oauth2 authentication and the service is loaded only when "oauth" profile is active.
  */
 @Service(value = "tenantIdentifierProcessingFilter")
 @Profile("oauth")
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TwoFactorAuthenticationFilter.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TwoFactorAuthenticationFilter.java
index bedf163..6758c55 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TwoFactorAuthenticationFilter.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TwoFactorAuthenticationFilter.java
@@ -44,19 +44,15 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.filter.GenericFilterBean;
 
 /**
- * This filter is responsible for handling two-factor authentication. The filter
- * is enabled when 'twofactor' environment profile is active, otherwise
- * {@link InsecureTwoFactorAuthenticationFilter} is used.
+ * This filter is responsible for handling two-factor authentication. The filter is enabled when 'twofactor' environment
+ * profile is active, otherwise {@link InsecureTwoFactorAuthenticationFilter} is used.
  *
- * This filter validates an access-token provided as a header
- * 'Fineract-Platform-TFA-Token'. If a valid token is provided, a
- * 'TWOFACTOR_AUTHENTICATED' authority is added to the current authentication.
- * If an invalid(non-existent or invalid) token is provided, 403 response is
- * returned.
+ * This filter validates an access-token provided as a header 'Fineract-Platform-TFA-Token'. If a valid token is
+ * provided, a 'TWOFACTOR_AUTHENTICATED' authority is added to the current authentication. If an invalid(non-existent or
+ * invalid) token is provided, 403 response is returned.
  *
- * An authenticated platform user with permission 'BYPASS_TWOFACTOR' will always
- * be granted 'TWOFACTOR_AUTHENTICATED' authority regardless of the value of the
- * 'Fineract-Platform-TFA-Token' header.
+ * An authenticated platform user with permission 'BYPASS_TWOFACTOR' will always be granted 'TWOFACTOR_AUTHENTICATED'
+ * authority regardless of the value of the 'Fineract-Platform-TFA-Token' header.
  */
 @Service(value = "twoFactorAuthFilter")
 @Profile("twofactor")
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/BasicAuthTenantDetailsServiceJdbc.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/BasicAuthTenantDetailsServiceJdbc.java
index 0baa318..2269c5b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/BasicAuthTenantDetailsServiceJdbc.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/BasicAuthTenantDetailsServiceJdbc.java
@@ -33,8 +33,8 @@ import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 
 /**
- * A JDBC implementation of {@link BasicAuthTenantDetailsService} for loading a
- * tenants details by a <code>tenantIdentifier</code>.
+ * A JDBC implementation of {@link BasicAuthTenantDetailsService} for loading a tenants details by a
+ * <code>tenantIdentifier</code>.
  */
 @Service
 public class BasicAuthTenantDetailsServiceJdbc implements BasicAuthTenantDetailsService {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/CustomAuthenticationFailureHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/CustomAuthenticationFailureHandler.java
index 0edc6bd..2dda645 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/CustomAuthenticationFailureHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/CustomAuthenticationFailureHandler.java
@@ -45,11 +45,10 @@ public class CustomAuthenticationFailureHandler implements AuthenticationFailure
     public CustomAuthenticationFailureHandler() {}
 
     /**
-     * Performs the redirect or forward to the {@code defaultFailureUrl} if set,
-     * otherwise returns a 401 error code.
+     * Performs the redirect or forward to the {@code defaultFailureUrl} if set, otherwise returns a 401 error code.
      * <p>
-     * If redirecting or forwarding, {@code saveException} will be called to
-     * cache the exception for use in the target view.
+     * If redirecting or forwarding, {@code saveException} will be called to cache the exception for use in the target
+     * view.
      */
     @Override
     public void onAuthenticationFailure(final HttpServletRequest request, final HttpServletResponse response,
@@ -80,10 +79,9 @@ public class CustomAuthenticationFailureHandler implements AuthenticationFailure
     /**
      * Caches the {@code AuthenticationException} for use in view rendering.
      * <p>
-     * If {@code forwardToDestination} is set to true, request scope will be
-     * used, otherwise it will attempt to store the exception in the session. If
-     * there is no session and {@code allowSessionCreation} is {@code true} a
-     * session will be created. Otherwise the exception will not be stored.
+     * If {@code forwardToDestination} is set to true, request scope will be used, otherwise it will attempt to store
+     * the exception in the session. If there is no session and {@code allowSessionCreation} is {@code true} a session
+     * will be created. Otherwise the exception will not be stored.
      */
     protected final void saveException(final HttpServletRequest request, final AuthenticationException exception) {
         if (this.forwardToDestination) {
@@ -113,8 +111,8 @@ public class CustomAuthenticationFailureHandler implements AuthenticationFailure
     }
 
     /**
-     * If set to <tt>true</tt>, performs a forward to the failure destination
-     * URL instead of a redirect. Defaults to <tt>false</tt>.
+     * If set to <tt>true</tt>, performs a forward to the failure destination URL instead of a redirect. Defaults to
+     * <tt>false</tt>.
      */
     public void setUseForward(final boolean forwardToDestination) {
         this.forwardToDestination = forwardToDestination;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/JdbcTenantDetailsService.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/JdbcTenantDetailsService.java
index 81c0a02..701abdc 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/JdbcTenantDetailsService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/JdbcTenantDetailsService.java
@@ -34,8 +34,8 @@ import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 
 /**
- * A JDBC implementation of {@link TenantDetailsService} for loading a tenants
- * details by a <code>tenantIdentifier</code>.
+ * A JDBC implementation of {@link TenantDetailsService} for loading a tenants details by a
+ * <code>tenantIdentifier</code>.
  */
 @Service
 public class JdbcTenantDetailsService implements TenantDetailsService {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/PlatformSecurityContext.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/PlatformSecurityContext.java
index 33f64b0..55831ce 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/PlatformSecurityContext.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/PlatformSecurityContext.java
@@ -26,11 +26,10 @@ public interface PlatformSecurityContext {
     AppUser authenticatedUser();
 
     /**
-     * Convenience method returns null (does not throw an exception) if an
-     * authenticated user is not present
+     * Convenience method returns null (does not throw an exception) if an authenticated user is not present
      *
-     * To be used only in service layer methods that can be triggered via both
-     * the API and batch Jobs (which do not have an authenticated user)
+     * To be used only in service layer methods that can be triggered via both the API and batch Jobs (which do not have
+     * an authenticated user)
      *
      * @return
      */
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/SpringSecurityPlatformSecurityContext.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/SpringSecurityPlatformSecurityContext.java
index 7bf411a..c48490f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/SpringSecurityPlatformSecurityContext.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/SpringSecurityPlatformSecurityContext.java
@@ -37,8 +37,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 
 /**
- * Wrapper around spring security's {@link SecurityContext} for extracted the
- * current authenticated {@link AppUser}.
+ * Wrapper around spring security's {@link SecurityContext} for extracted the current authenticated {@link AppUser}.
  */
 
 @Service
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/TenantAwareJpaPlatformUserDetailsService.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/TenantAwareJpaPlatformUserDetailsService.java
index 7bdeac9..07bf8fd 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/TenantAwareJpaPlatformUserDetailsService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/TenantAwareJpaPlatformUserDetailsService.java
@@ -29,8 +29,7 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 
 /**
- * Used in securityContext.xml as implementation of spring security's
- * {@link UserDetailsService}.
+ * Used in securityContext.xml as implementation of spring security's {@link UserDetailsService}.
  */
 @Service(value = "userDetailsService")
 public class TenantAwareJpaPlatformUserDetailsService implements PlatformUserDetailsService {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/SQLBuilder.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/SQLBuilder.java
index 9bdf08d..bc4a138 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/SQLBuilder.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/SQLBuilder.java
@@ -25,13 +25,11 @@ import java.util.Locale;
 import java.util.regex.Pattern;
 
 /**
- * Utility to assemble the WHERE clause of an SQL query without the risk of SQL
- * injection.
+ * Utility to assemble the WHERE clause of an SQL query without the risk of SQL injection.
  *
  * <p>
- * When using this utility instead of manually assembling SQL queries, then
- * {@link SQLInjectionValidator} should not be required anymore. (Correctly
- * using this means only ever passing completely fixed String literals to .)
+ * When using this utility instead of manually assembling SQL queries, then {@link SQLInjectionValidator} should not be
+ * required anymore. (Correctly using this means only ever passing completely fixed String literals to .)
  *
  * @author Michael Vorburger <mi...@vorburger.ch>
  */
@@ -51,15 +49,14 @@ public class SQLBuilder {
     private final ArrayList<String> crts = new ArrayList<String>();
 
     /**
-     * Adds a criteria for a SQL WHERE clause. All criteria are appended by AND
-     * (support for OR, or nesting, can be added when needed).
+     * Adds a criteria for a SQL WHERE clause. All criteria are appended by AND (support for OR, or nesting, can be
+     * added when needed).
      *
      * @param criteria
-     *            The name of the column to be filtered, and an operator; e.g.
-     *            "name =" or "age >" (but without '?' placeholder)
+     *            The name of the column to be filtered, and an operator; e.g. "name =" or "age >" (but without '?'
+     *            placeholder)
      * @param argument
-     *            The argument to be filtered on (e.g. "Michael" or 123). The
-     *            null value is explicitly permitted.
+     *            The argument to be filtered on (e.g. "Michael" or 123). The null value is explicitly permitted.
      */
     public void addCriteria(String criteria, Object argument) {
         if (criteria == null || criteria.trim().isEmpty()) {
@@ -104,8 +101,7 @@ public class SQLBuilder {
     }
 
     /**
-     * Delegates to {@link #addCriteria(String, Object)} if argument is not
-     * null, otherwise does nothing.
+     * Delegates to {@link #addCriteria(String, Object)} if argument is not null, otherwise does nothing.
      */
     public void addNonNullCriteria(String criteria, Object argument) {
         if (argument != null) {
@@ -114,11 +110,9 @@ public class SQLBuilder {
     }
 
     /**
-     * Returns a SQL WHERE clause, created from the
-     * {@link #addCriteria(String, Object)}, with '?' placeholders.
+     * Returns a SQL WHERE clause, created from the {@link #addCriteria(String, Object)}, with '?' placeholders.
      *
-     * @return SQL WHERE clause, almost always starting with " WHERE ..."
-     *         (unless no criteria, then empty)
+     * @return SQL WHERE clause, almost always starting with " WHERE ..." (unless no criteria, then empty)
      */
     public String getSQLTemplate() {
         if (sb.length() > 0) {
@@ -130,17 +124,16 @@ public class SQLBuilder {
     /**
      * Returns the arguments for the WHERE clause.
      *
-     * @return Object array suitable for use with Spring Framework JdbcTemplate
-     *         (or plain JDBC {@link PreparedStatement})
+     * @return Object array suitable for use with Spring Framework JdbcTemplate (or plain JDBC
+     *         {@link PreparedStatement})
      */
     public Object[] getArguments() {
         return args.toArray();
     }
 
     /*
-     * Returns a String representation suitable for debugging and log output.
-     * This is ONLY intended for debugging in logs, and NEVER for passing to a
-     * JDBC database.
+     * Returns a String representation suitable for debugging and log output. This is ONLY intended for debugging in
+     * logs, and NEVER for passing to a JDBC database.
      */
     @Override
     public String toString() {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/data/SmsMessageApiQueueResourceData.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/data/SmsMessageApiQueueResourceData.java
index 36ff198..0ed957b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/data/SmsMessageApiQueueResourceData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/data/SmsMessageApiQueueResourceData.java
@@ -22,8 +22,7 @@ import com.google.gson.Gson;
 import java.util.Collection;
 
 /**
- * Immutable data object representing the API request body sent in the POST
- * request to the "/queue" resource
+ * Immutable data object representing the API request body sent in the POST request to the "/queue" resource
  **/
 public class SmsMessageApiQueueResourceData {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/data/SmsMessageApiReportResourceData.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/data/SmsMessageApiReportResourceData.java
index 9f1fd32..f2b24f6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/data/SmsMessageApiReportResourceData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/data/SmsMessageApiReportResourceData.java
@@ -22,8 +22,7 @@ import com.google.gson.Gson;
 import java.util.List;
 
 /**
- * Immutable data object representing the API request body sent in the POST
- * request to the "/report" resource
+ * Immutable data object representing the API request body sent in the POST request to the "/report" resource
  **/
 public class SmsMessageApiReportResourceData {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/data/SmsMessageDeliveryReportData.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/data/SmsMessageDeliveryReportData.java
index 3e0f51b..d593202 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/data/SmsMessageDeliveryReportData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/data/SmsMessageDeliveryReportData.java
@@ -19,8 +19,7 @@
 package org.apache.fineract.infrastructure.sms.data;
 
 /**
- * Immutable data object representing an outbound SMS message delivery report
- * data
+ * Immutable data object representing an outbound SMS message delivery report data
  **/
 public class SmsMessageDeliveryReportData {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/scheduler/SmsMessageScheduledJobService.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/scheduler/SmsMessageScheduledJobService.java
index e12ca82..fb35649 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/scheduler/SmsMessageScheduledJobService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/scheduler/SmsMessageScheduledJobService.java
@@ -41,8 +41,7 @@ public interface SmsMessageScheduledJobService {
     public void sendTriggeredMessages(Map<SmsCampaign, Collection<SmsMessage>> smsDataMap);
 
     /**
-     * Sends a triggered batch of SMS messages to SMS gateway using specified
-     * provider.
+     * Sends a triggered batch of SMS messages to SMS gateway using specified provider.
      *
      * @param smsMessage
      *            the SMS messages to queue for sending.
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/scheduler/SmsMessageScheduledJobServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/scheduler/SmsMessageScheduledJobServiceImpl.java
index 42d6e43..b15f3f0 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/scheduler/SmsMessageScheduledJobServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/scheduler/SmsMessageScheduledJobServiceImpl.java
@@ -60,8 +60,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
 
 /**
- * Scheduled job services that send SMS messages and get delivery reports for
- * the sent SMS messages
+ * Scheduled job services that send SMS messages and get delivery reports for the sent SMS messages
  **/
 @Service
 public class SmsMessageScheduledJobServiceImpl implements SmsMessageScheduledJobService {
@@ -248,8 +247,7 @@ public class SmsMessageScheduledJobServiceImpl implements SmsMessageScheduledJob
     }
 
     /**
-     * get SMS message delivery reports from the SMS gateway (or intermediate
-     * gateway)
+     * get SMS message delivery reports from the SMS gateway (or intermediate gateway)
      **/
     @Override
     @Transactional
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/service/SmsWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/service/SmsWritePlatformServiceJpaRepositoryImpl.java
index e3c2734..28feed3 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/service/SmsWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/service/SmsWritePlatformServiceJpaRepositoryImpl.java
@@ -117,8 +117,7 @@ public class SmsWritePlatformServiceJpaRepositoryImpl implements SmsWritePlatfor
     }
 
     /*
-     * Guaranteed to throw an exception no matter what the data integrity issue
-     * is.
+     * Guaranteed to throw an exception no matter what the data integrity issue is.
      */
     private void handleDataIntegrityIssues(@SuppressWarnings("unused") final JsonCommand command,
             final DataIntegrityViolationException dve) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/WriteLikelihoodServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/WriteLikelihoodServiceImpl.java
index 1b21573..92bf879 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/WriteLikelihoodServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/WriteLikelihoodServiceImpl.java
@@ -89,8 +89,7 @@ public class WriteLikelihoodServiceImpl implements WriteLikelihoodService {
     }
 
     /*
-     * Guaranteed to throw an exception no matter what the data integrity issue
-     * is.
+     * Guaranteed to throw an exception no matter what the data integrity issue is.
      */
     private void handleDataIntegrityIssues(final DataIntegrityViolationException dve) {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/interoperation/util/MathUtil.java b/fineract-provider/src/main/java/org/apache/fineract/interoperation/util/MathUtil.java
index 2f9dac8..5cf94b6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/interoperation/util/MathUtil.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/interoperation/util/MathUtil.java
@@ -308,8 +308,7 @@ public class MathUtil {
     }
 
     /**
-     * @return BigDecimal with scale set to the 'digitsAfterDecimal' of the
-     *         parameter currency
+     * @return BigDecimal with scale set to the 'digitsAfterDecimal' of the parameter currency
      */
     public static BigDecimal normalizeAmount(BigDecimal amount, @NotNull MonetaryCurrency currency) {
         return amount == null ? null : amount.setScale(currency.getDigitsAfterDecimal(), MoneyHelper.getRoundingMode());
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/domain/HolidayRepositoryWrapper.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/domain/HolidayRepositoryWrapper.java
index 479336c..47fe79b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/domain/HolidayRepositoryWrapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/domain/HolidayRepositoryWrapper.java
@@ -28,8 +28,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * Wrapper for {@link HolidayRepository} that adds NULL checking and Error
- * handling capabilities
+ * Wrapper for {@link HolidayRepository} that adds NULL checking and Error handling capabilities
  * </p>
  */
 @Service
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/domain/ApplicationCurrencyRepositoryWrapper.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/domain/ApplicationCurrencyRepositoryWrapper.java
index c355a03..43c4a27 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/domain/ApplicationCurrencyRepositoryWrapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/domain/ApplicationCurrencyRepositoryWrapper.java
@@ -24,15 +24,13 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * Wrapper for {@link ApplicationCurrencyRepository} that is responsible for
- * checking if {@link ApplicationCurrency} is returned when using
- * <code>findOne</code> repository method and throwing an appropriate not found
- * exception.
+ * Wrapper for {@link ApplicationCurrencyRepository} that is responsible for checking if {@link ApplicationCurrency} is
+ * returned when using <code>findOne</code> repository method and throwing an appropriate not found exception.
  * </p>
  *
  * <p>
- * This is to avoid need for checking and throwing in multiple areas of code
- * base where {@link ApplicationCurrencyRepository} is required.
+ * This is to avoid need for checking and throwing in multiple areas of code base where
+ * {@link ApplicationCurrencyRepository} is required.
  * </p>
  */
 @Service
@@ -59,8 +57,7 @@ public class ApplicationCurrencyRepositoryWrapper {
     }
 
     /**
-     * Used when its not needed for {@link ApplicationCurrency} to inherit
-     * decimal place settings of existing currency.
+     * Used when its not needed for {@link ApplicationCurrency} to inherit decimal place settings of existing currency.
      */
     public ApplicationCurrency findOneWithNotFoundDetection(final String currencyCode) {
         final ApplicationCurrency applicationCurrency = this.repository.findOneByCode(currencyCode);
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/exception/CurrencyInUseException.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/exception/CurrencyInUseException.java
index 30ac3ca..580fdc2 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/exception/CurrencyInUseException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/exception/CurrencyInUseException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.organisation.monetary.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
- * A {@link RuntimeException} thrown when trying to delete a currency that is
- * still in use.
+ * A {@link RuntimeException} thrown when trying to delete a currency that is still in use.
  */
 public class CurrencyInUseException extends AbstractPlatformDomainRuleException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/exception/OrganizationalCurrencyNotFoundException.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/exception/OrganizationalCurrencyNotFoundException.java
index dfaf2b8..923fe39 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/exception/OrganizationalCurrencyNotFoundException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/exception/OrganizationalCurrencyNotFoundException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.organisation.monetary.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
 
 /**
- * A {@link RuntimeException} thrown when urrency is not supported by an
- * Organization.
+ * A {@link RuntimeException} thrown when urrency is not supported by an Organization.
  */
 public class OrganizationalCurrencyNotFoundException extends AbstractPlatformResourceNotFoundException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/api/OfficesApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/api/OfficesApiResource.java
index d3a8f9b..12c412f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/api/OfficesApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/api/OfficesApiResource.java
@@ -74,8 +74,7 @@ import org.springframework.stereotype.Component;
 public class OfficesApiResource {
 
     /**
-     * The set of parameters that are supported in response for
-     * {@link OfficeData}.
+     * The set of parameters that are supported in response for {@link OfficeData}.
      */
     private final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList("id", "name", "nameDecorated", "externalId",
             "openingDate", "hierarchy", "parentId", "parentName", "allowedParents"));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/domain/OfficeRepositoryWrapper.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/domain/OfficeRepositoryWrapper.java
index 376cdf6..325cc5c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/domain/OfficeRepositoryWrapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/domain/OfficeRepositoryWrapper.java
@@ -25,8 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 /**
  * <p>
- * Wrapper for {@link OfficeRepository} that adds NULL checking and Error
- * handling capabilities
+ * Wrapper for {@link OfficeRepository} that adds NULL checking and Error handling capabilities
  * </p>
  */
 @Service
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/domain/OrganisationCurrencyRepositoryWrapper.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/domain/OrganisationCurrencyRepositoryWrapper.java
index 10c1f0f..5e964fc 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/domain/OrganisationCurrencyRepositoryWrapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/domain/OrganisationCurrencyRepositoryWrapper.java
@@ -24,14 +24,13 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * Wrapper for {@link OrganisationCurrency} that is responsible for checking if
- * {@link OrganisationCurrency} is returned when using <code>findOne</code>
- * repository method and throwing an appropriate not found exception.
+ * Wrapper for {@link OrganisationCurrency} that is responsible for checking if {@link OrganisationCurrency} is returned
+ * when using <code>findOne</code> repository method and throwing an appropriate not found exception.
  * </p>
  *
  * <p>
- * This is to avoid need for checking and throwing in multiple areas of code
- * base where {@link OrganisationCurrency} is required.
+ * This is to avoid need for checking and throwing in multiple areas of code base where {@link OrganisationCurrency} is
+ * required.
  * </p>
  */
 @Service
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/exception/InvalidOfficeException.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/exception/InvalidOfficeException.java
index 21298bd..4a4c989 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/exception/InvalidOfficeException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/exception/InvalidOfficeException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.organisation.office.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
- * {@link AbstractPlatformDomainRuleException} thrown when office mismatch
- * occurs
+ * {@link AbstractPlatformDomainRuleException} thrown when office mismatch occurs
  */
 public class InvalidOfficeException extends AbstractPlatformDomainRuleException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/exception/OfficeTransactionNotFoundException.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/exception/OfficeTransactionNotFoundException.java
index ad6cdd2..85d4941 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/exception/OfficeTransactionNotFoundException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/exception/OfficeTransactionNotFoundException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.organisation.office.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
 
 /**
- * A {@link RuntimeException} thrown when office transaction resources are not
- * found.
+ * A {@link RuntimeException} thrown when office transaction resources are not found.
  */
 public class OfficeTransactionNotFoundException extends AbstractPlatformResourceNotFoundException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/service/OfficeWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/service/OfficeWritePlatformServiceJpaRepositoryImpl.java
index b2663b6..c0642a6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/service/OfficeWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/service/OfficeWritePlatformServiceJpaRepositoryImpl.java
@@ -224,8 +224,7 @@ public class OfficeWritePlatformServiceJpaRepositoryImpl implements OfficeWriteP
     }
 
     /*
-     * Guaranteed to throw an exception no matter what the data integrity issue
-     * is.
+     * Guaranteed to throw an exception no matter what the data integrity issue is.
      */
     private void handleOfficeDataIntegrityIssues(final JsonCommand command, final Throwable realCause, final Exception dve) {
 
@@ -245,8 +244,8 @@ public class OfficeWritePlatformServiceJpaRepositoryImpl implements OfficeWriteP
     }
 
     /*
-     * used to restrict modifying operations to office that are either the users
-     * office or lower (child) in the office hierarchy
+     * used to restrict modifying operations to office that are either the users office or lower (child) in the office
+     * hierarchy
      */
     private Office validateUserPriviledgeOnOfficeAndRetrieve(final AppUser currentUser, final Long officeId) {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCategoryWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCategoryWritePlatformServiceJpaRepositoryImpl.java
index f4ecdd4..3f5b791 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCategoryWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCategoryWritePlatformServiceJpaRepositoryImpl.java
@@ -116,8 +116,7 @@ public class ProvisioningCategoryWritePlatformServiceJpaRepositoryImpl implement
     }
 
     /*
-     * Guaranteed to throw an exception no matter what the data integrity issue
-     * is.
+     * Guaranteed to throw an exception no matter what the data integrity issue is.
      */
     private void handleDataIntegrityIssues(final JsonCommand command, final Throwable realCause, final Exception dve) {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCriteriaWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCriteriaWritePlatformServiceJpaRepositoryImpl.java
index c91ace1..64e7db1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCriteriaWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCriteriaWritePlatformServiceJpaRepositoryImpl.java
@@ -160,8 +160,7 @@ public class ProvisioningCriteriaWritePlatformServiceJpaRepositoryImpl implement
     }
 
     /*
-     * Guaranteed to throw an exception no matter what the data integrity issue
-     * is.
+     * Guaranteed to throw an exception no matter what the data integrity issue is.
      */
     private void handleDataIntegrityIssues(final JsonCommand command, final Throwable realCause, final Exception dve) {
         if (realCause.getMessage().contains("criteria_name")) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/api/StaffApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/api/StaffApiResource.java
index c0390f5..59e19cd 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/api/StaffApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/api/StaffApiResource.java
@@ -75,8 +75,7 @@ import org.springframework.stereotype.Component;
 public class StaffApiResource {
 
     /**
-     * The set of parameters that are supported in response for
-     * {@link StaffData}.
+     * The set of parameters that are supported in response for {@link StaffData}.
      */
     private final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList("id", "firstname", "lastname", "displayName",
             "officeId", "officeName", "isLoanOfficer", "externalId", "mobileNo", "allowedOffices", "isActive", "joiningDate"));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/domain/StaffRepositoryWrapper.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/domain/StaffRepositoryWrapper.java
index ae4a659..6eee59a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/domain/StaffRepositoryWrapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/domain/StaffRepositoryWrapper.java
@@ -24,8 +24,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * Wrapper for {@link StaffRepository} that adds NULL checking and Error
- * handling capabilities
+ * Wrapper for {@link StaffRepository} that adds NULL checking and Error handling capabilities
  * </p>
  */
 @Service
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffReadPlatformService.java
index 2900840..d6af2bf 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffReadPlatformService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffReadPlatformService.java
@@ -30,8 +30,7 @@ public interface StaffReadPlatformService {
     Collection<StaffData> retrieveAllLoanOfficersInOfficeById(final Long officeId);
 
     /**
-     * returns all staff in offices that are above the provided
-     * <code>officeId</code>.
+     * returns all staff in offices that are above the provided <code>officeId</code>.
      */
     Collection<StaffData> retrieveAllStaffInOfficeAndItsParentOfficeHierarchy(Long officeId, boolean loanOfficersOnly);
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffWritePlatformServiceJpaRepositoryImpl.java
index 97c7f3e..9c973b9 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffWritePlatformServiceJpaRepositoryImpl.java
@@ -117,8 +117,7 @@ public class StaffWritePlatformServiceJpaRepositoryImpl implements StaffWritePla
     }
 
     /*
-     * Guaranteed to throw an exception no matter what the data integrity issue
-     * is.
+     * Guaranteed to throw an exception no matter what the data integrity issue is.
      */
     private void handleStaffDataIntegrityIssues(final JsonCommand command, final Throwable realCause, final Exception dve) {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/data/CashierData.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/data/CashierData.java
index 7bd815c..c9913d4 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/data/CashierData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/data/CashierData.java
@@ -24,8 +24,7 @@ import java.util.Date;
 import org.apache.fineract.organisation.staff.data.StaffData;
 
 /**
- * Represents a cashier, providing access to the cashier's office, staff
- * information, teller, and more.
+ * Represents a cashier, providing access to the cashier's office, staff information, teller, and more.
  *
  * @author Markus Geiss
  *
@@ -80,13 +79,11 @@ public final class CashierData implements Serializable {
      * Creates a new cashier.
      *
      * <p>
-     * The valid from/to dates may be used to define a time period in which the
-     * cashier is assignable to a teller.
+     * The valid from/to dates may be used to define a time period in which the cashier is assignable to a teller.
      * </p>
      *
      * <p>
-     * The start/end times may be used to define a time period in which the
-     * cashier works part time.
+     * The start/end times may be used to define a time period in which the cashier works part time.
      * </p>
      *
      * @param id
@@ -180,8 +177,7 @@ public final class CashierData implements Serializable {
      * Returns the valid from date of this cashier.
      *
      * <p>
-     * The valid from/to dates may be used to define a time period in which the
-     * cashier is assignable to a teller.
+     * The valid from/to dates may be used to define a time period in which the cashier is assignable to a teller.
      * </p>
      *
      * @return the valid from date of this cashier
@@ -194,8 +190,7 @@ public final class CashierData implements Serializable {
      * Returns the valid to date of this cashier.
      *
      * <p>
-     * The valid from/to dates may be used to define a time period in which the
-     * cashier is assignable to a teller.
+     * The valid from/to dates may be used to define a time period in which the cashier is assignable to a teller.
      * </p>
      *
      * @return the valid to date of this cashier
@@ -207,8 +202,7 @@ public final class CashierData implements Serializable {
     /**
      * Returns whether this cashier works part time or not.
      *
-     * @return {@code true} if this cashier works part time; {@code false}
-     *         otherwise
+     * @return {@code true} if this cashier works part time; {@code false} otherwise
      */
     public Boolean isFullDay() {
         return isFullDay;
@@ -218,8 +212,7 @@ public final class CashierData implements Serializable {
      * Returns the start time of this cashier.
      *
      * <p>
-     * The start/end times may be used to define a time period in which the
-     * cashier works part time.
+     * The start/end times may be used to define a time period in which the cashier works part time.
      * </p>
      *
      * @return the start time of this cashier
@@ -232,8 +225,7 @@ public final class CashierData implements Serializable {
      * Returns the end time of this cashier.
      *
      * <p>
-     * The start/end times may be used to define a time period in which the
-     * cashier works part time.
+     * The start/end times may be used to define a time period in which the cashier works part time.
      * </p>
      *
      * @return the start time of this cashier
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/data/TellerData.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/data/TellerData.java
index 414bb53..15c3b92 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/data/TellerData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/data/TellerData.java
@@ -98,11 +98,9 @@ public final class TellerData implements Serializable {
      * @param status
      *            - current state of the teller, eg. active, inactive, pending
      * @param hasTransactions
-     *            - indicates that this teller already is used to perform
-     *            postings
+     *            - indicates that this teller already is used to perform postings
      * @param hasMappedCashiers
-     *            - indicates that the teller already has @code Cashier}s
-     *            assigned to it
+     *            - indicates that the teller already has @code Cashier}s assigned to it
      * @return the new created {@code TellerData}
      */
     public static TellerData instance(final Long id, final Long officeId, final Long debitAccountId, final Long creditAccountId,
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/data/TellerTransactionData.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/data/TellerTransactionData.java
index 201cf70..834b288 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/data/TellerTransactionData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/data/TellerTransactionData.java
@@ -23,8 +23,7 @@ import java.util.Date;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 
 /**
- * {@code TellerTransactionData} represents an immutable data object for a
- * transction.
+ * {@code TellerTransactionData} represents an immutable data object for a transction.
  *
  * @version 1.0.0
  *
@@ -72,8 +71,7 @@ public final class TellerTransactionData implements Serializable {
      * @param clientId
      *            - id of the client
      * @param type
-     *            - type of transaction (eg receipt, payment, open, close,
-     *            settle)
+     *            - type of transaction (eg receipt, payment, open, close, settle)
      * @param amount
      *            - amount of the transaction
      * @param postingDate
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/domain/Cashier.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/domain/Cashier.java
index 44636cb..a78acc5 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/domain/Cashier.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/domain/Cashier.java
@@ -40,9 +40,8 @@ import org.apache.fineract.organisation.staff.domain.Staff;
 import org.joda.time.LocalDate;
 
 /**
- * Provides the base model for a cashier. Represents a row in the
- * &quot;m_cashiers&quot; database table, with each column mapped to a property
- * of this class.
+ * Provides the base model for a cashier. Represents a row in the &quot;m_cashiers&quot; database table, with each
+ * column mapped to a property of this class.
  *
  * @author Markus Geiss
  * @since 2.0.0
@@ -101,9 +100,8 @@ public class Cashier extends AbstractPersistableCustom {
         final LocalDate endDate = command.localDateValueOfParameterNamed("endDate");
         final Boolean isFullDay = command.booleanObjectValueOfParameterNamed("isFullDay");
         /*
-         * final String startTime =
-         * command.stringValueOfParameterNamed("startTime"); final String
-         * endTime = command.stringValueOfParameterNamed("endTime");
+         * final String startTime = command.stringValueOfParameterNamed("startTime"); final String endTime =
+         * command.stringValueOfParameterNamed("endTime");
          */
 
         return new Cashier(cashierOffice, teller, staff, description, startDate, endDate, isFullDay, startTime, endTime);
@@ -336,8 +334,7 @@ public class Cashier extends AbstractPersistableCustom {
      * Returns the valid from date of this cashier.
      *
      * <p>
-     * The valid from/to dates may be used to define a time period in which the
-     * cashier is assignable to a teller.
+     * The valid from/to dates may be used to define a time period in which the cashier is assignable to a teller.
      * </p>
      *
      * @return the valid from date of this cashier
@@ -358,8 +355,7 @@ public class Cashier extends AbstractPersistableCustom {
      * Sets the valid from date of this cashier.
      *
      * <p>
-     * The valid from/to dates may be used to define a time period in which the
-     * cashier is assignable to a teller.
+     * The valid from/to dates may be used to define a time period in which the cashier is assignable to a teller.
      * </p>
      *
      * @param startDate
@@ -373,8 +369,7 @@ public class Cashier extends AbstractPersistableCustom {
      * Returns the valid to date of this cashier.
      *
      * <p>
-     * The valid from/to dates may be used to define a time period in which the
-     * cashier is assignable to a teller.
+     * The valid from/to dates may be used to define a time period in which the cashier is assignable to a teller.
      * </p>
      *
      * @return the valid to date of this cashier
@@ -395,8 +390,7 @@ public class Cashier extends AbstractPersistableCustom {
      * Sets the valid to date of this cashier.
      *
      * <p>
-     * The valid from/to dates may be used to define a time period in which the
-     * cashier is assignable to a teller.
+     * The valid from/to dates may be used to define a time period in which the cashier is assignable to a teller.
      * </p>
      *
      * @param endDate
@@ -409,8 +403,7 @@ public class Cashier extends AbstractPersistableCustom {
     /**
      * Returns whether this cashier works part time or not.
      *
-     * @return {@code true} if this cashier works part time; {@code false}
-     *         otherwise
+     * @return {@code true} if this cashier works part time; {@code false} otherwise
      */
     public Boolean isFullDay() {
         return isFullDay;
@@ -430,8 +423,7 @@ public class Cashier extends AbstractPersistableCustom {
      * Returns the start time of this cashier.
      *
      * <p>
-     * The start/end times may be used to define a time period in which the
-     * cashier works part time.
+     * The start/end times may be used to define a time period in which the cashier works part time.
      * </p>
      *
      * @return the start time of this cashier
@@ -444,8 +436,7 @@ public class Cashier extends AbstractPersistableCustom {
      * Set the start time of this cashier.
      *
      * <p>
-     * The start/end times may be used to define a time period in which the
-     * cashier works part time.
+     * The start/end times may be used to define a time period in which the cashier works part time.
      * </p>
      *
      * @param startTime
@@ -459,8 +450,7 @@ public class Cashier extends AbstractPersistableCustom {
      * Returns the end time of this cashier.
      *
      * <p>
-     * The start/end times may be used to define a time period in which the
-     * cashier works part time.
+     * The start/end times may be used to define a time period in which the cashier works part time.
      * </p>
      *
      * @return the end time of this cashier
@@ -473,8 +463,7 @@ public class Cashier extends AbstractPersistableCustom {
      * Sets the end time of this cashier.
      *
      * <p>
-     * The start/end times may be used to define a time period in which the
-     * cashier works part time.
+     * The start/end times may be used to define a time period in which the cashier works part time.
      * </p>
      *
      * @param endTime
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/domain/CashierRepository.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/domain/CashierRepository.java
index 1cd2fd3..dce7f1f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/domain/CashierRepository.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/domain/CashierRepository.java
@@ -22,8 +22,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 /**
- * Provides the domain repository for accessing, adding, modifying or deleting
- * cashiers.
+ * Provides the domain repository for accessing, adding, modifying or deleting cashiers.
  *
  * @author Markus Geiss
  * @see org.apache.fineract.organisation.teller.domain.Cashier
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/domain/CashierTransaction.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/domain/CashierTransaction.java
index 43b56bb..56defe3 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/domain/CashierTransaction.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/domain/CashierTransaction.java
@@ -206,8 +206,7 @@ public class CashierTransaction extends AbstractPersistableCustom {
     /**
      * Returns the transaction type of this cashier transaction. .
      *
-     * @return the transaction type of this cashier transaction or {@code null}
-     *         if not present.
+     * @return the transaction type of this cashier transaction or {@code null} if not present.
      */
     public Integer getTxnType() {
         return txnType;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/domain/Teller.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/domain/Teller.java
index 137ea9b..c5f48a2 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/domain/Teller.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/domain/Teller.java
@@ -96,11 +96,10 @@ public class Teller extends AbstractPersistableCustom {
         this.office = staffOffice;
 
         /*
-         * if (StringUtils.isNotBlank(name)) { this.name = name.trim(); } else {
-         * this.name = null; }
+         * if (StringUtils.isNotBlank(name)) { this.name = name.trim(); } else { this.name = null; }
          *
-         * if (StringUtils.isNotBlank(description)) { this.description =
-         * description.trim(); } else { this.description = null; }
+         * if (StringUtils.isNotBlank(description)) { this.description = description.trim(); } else { this.description =
+         * null; }
          */
 
     }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/domain/TellerRepository.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/domain/TellerRepository.java
index 9dd7caa..2fdea2a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/domain/TellerRepository.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/domain/TellerRepository.java
@@ -23,8 +23,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 /**
- * Provides the domain repository for accessing, adding, modifying or deleting
- * tellers.
+ * Provides the domain repository for accessing, adding, modifying or deleting tellers.
  *
  * @see org.apache.fineract.organisation.teller.domain.Teller
  * @since 2.0.0
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/domain/TellerTransactionRepository.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/domain/TellerTransactionRepository.java
index ca95fad..1fa4e91 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/domain/TellerTransactionRepository.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/domain/TellerTransactionRepository.java
@@ -22,8 +22,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 /**
- * Provides the domain repository for accessing, adding, modifying or deleting
- * teller transactions.
+ * Provides the domain repository for accessing, adding, modifying or deleting teller transactions.
  *
  * @see org.apache.fineract.organisation.teller.domain.TellerTransaction
  * @since 2.0.0
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/AllocateCashToCashierCommandHandler.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/AllocateCashToCashierCommandHandler.java
index 865da7b..6a36ebd 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/AllocateCashToCashierCommandHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/AllocateCashToCashierCommandHandler.java
@@ -36,8 +36,7 @@ public class AllocateCashToCashierCommandHandler implements NewCommandSourceHand
      * Creates a new instance.
      *
      * @param writePlatformService
-     *            the {@code CashierWritePlatformService} used to access the
-     *            backend
+     *            the {@code CashierWritePlatformService} used to access the backend
      */
     @Autowired
     public AllocateCashToCashierCommandHandler(final TellerWritePlatformService writePlatformService) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/AllocateCashierToTellerCommandHandler.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/AllocateCashierToTellerCommandHandler.java
index 77f2515..1386731 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/AllocateCashierToTellerCommandHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/AllocateCashierToTellerCommandHandler.java
@@ -36,8 +36,7 @@ public class AllocateCashierToTellerCommandHandler implements NewCommandSourceHa
      * Creates a new instance.
      *
      * @param writePlatformService
-     *            the {@code CashierWritePlatformService} used to access the
-     *            backend
+     *            the {@code CashierWritePlatformService} used to access the backend
      */
     @Autowired
     public AllocateCashierToTellerCommandHandler(final TellerWritePlatformService writePlatformService) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/CreateTellerCommandHandler.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/CreateTellerCommandHandler.java
index 4731ace..40dfb63 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/CreateTellerCommandHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/CreateTellerCommandHandler.java
@@ -43,8 +43,7 @@ public class CreateTellerCommandHandler implements NewCommandSourceHandler {
      * Creates a new instance
      *
      * @param writePlatformService
-     *            the {@code TellerWritePlatformService} used to access the
-     *            backend
+     *            the {@code TellerWritePlatformService} used to access the backend
      */
     @Autowired
     public CreateTellerCommandHandler(final TellerWritePlatformService writePlatformService) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/DeleteCashierAllocationCommandHandler.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/DeleteCashierAllocationCommandHandler.java
index 4772cab..b77bc0a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/DeleteCashierAllocationCommandHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/DeleteCashierAllocationCommandHandler.java
@@ -43,8 +43,7 @@ public class DeleteCashierAllocationCommandHandler implements NewCommandSourceHa
      * Creates a new instance.
      *
      * @param writePlatformService
-     *            the {@code CashierWritePlatformService} used to access the
-     *            backend
+     *            the {@code CashierWritePlatformService} used to access the backend
      */
     @Autowired
     public DeleteCashierAllocationCommandHandler(final TellerWritePlatformService writePlatformService) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/DeleteTellerCommandHandler.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/DeleteTellerCommandHandler.java
index eb03283..5aae7bc 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/DeleteTellerCommandHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/DeleteTellerCommandHandler.java
@@ -43,8 +43,7 @@ public class DeleteTellerCommandHandler implements NewCommandSourceHandler {
      * Creates a new instance
      *
      * @param writePlatformService
-     *            the {@code TellerWritePlatformService} used to access the
-     *            backend
+     *            the {@code TellerWritePlatformService} used to access the backend
      */
     @Autowired
     public DeleteTellerCommandHandler(final TellerWritePlatformService writePlatformService) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/ModifyCashierCommandHandler.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/ModifyCashierCommandHandler.java
index 9029184..c4c9eaf 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/ModifyCashierCommandHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/ModifyCashierCommandHandler.java
@@ -39,8 +39,7 @@ public class ModifyCashierCommandHandler implements NewCommandSourceHandler {
      * Creates a new instance.
      *
      * @param writePlatformService
-     *            the {@code CashierWritePlatformService} used to access the
-     *            backend
+     *            the {@code CashierWritePlatformService} used to access the backend
      */
     @Autowired
     public ModifyCashierCommandHandler(final CashierWritePlatformService writePlatformService) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/SettleCashFromCashierCommandHandler.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/SettleCashFromCashierCommandHandler.java
index d721bc2..04ac7fb 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/SettleCashFromCashierCommandHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/SettleCashFromCashierCommandHandler.java
@@ -36,8 +36,7 @@ public class SettleCashFromCashierCommandHandler implements NewCommandSourceHand
      * Creates a new instance.
      *
      * @param writePlatformService
-     *            the {@code CashierWritePlatformService} used to access the
-     *            backend
+     *            the {@code CashierWritePlatformService} used to access the backend
      */
     @Autowired
     public SettleCashFromCashierCommandHandler(final TellerWritePlatformService writePlatformService) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/UpdateCashierAllocationCommandHandler.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/UpdateCashierAllocationCommandHandler.java
index b92fefa..bc8c778 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/UpdateCashierAllocationCommandHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/UpdateCashierAllocationCommandHandler.java
@@ -43,8 +43,7 @@ public class UpdateCashierAllocationCommandHandler implements NewCommandSourceHa
      * Creates a new instance
      *
      * @param writePlatformService
-     *            the {@code TellerWritePlatformService} used to access the
-     *            backend
+     *            the {@code TellerWritePlatformService} used to access the backend
      */
     @Autowired
     public UpdateCashierAllocationCommandHandler(final TellerWritePlatformService writePlatformService) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/UpdateTellerCommandHandler.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/UpdateTellerCommandHandler.java
index fbf8e6b..ce91f5d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/UpdateTellerCommandHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/handler/UpdateTellerCommandHandler.java
@@ -43,8 +43,7 @@ public class UpdateTellerCommandHandler implements NewCommandSourceHandler {
      * Creates a new instance
      *
      * @param writePlatformService
-     *            the {@code TellerWritePlatformService} used to access the
-     *            backend
+     *            the {@code TellerWritePlatformService} used to access the backend
      */
     @Autowired
     public UpdateTellerCommandHandler(final TellerWritePlatformService writePlatformService) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerWritePlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerWritePlatformService.java
index 2bf52cf..943b4c5 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerWritePlatformService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerWritePlatformService.java
@@ -67,8 +67,8 @@ public interface TellerWritePlatformService {
     public CommandProcessingResult deleteTeller(Long tellerId);
 
     /**
-     * Allocates a cashier to an existing teller. The allocation can be for a
-     * duration from a date to a date from a certain start time to an end time.
+     * Allocates a cashier to an existing teller. The allocation can be for a duration from a date to a date from a
+     * certain start time to an end time.
      *
      * @param command
      *            the command to allocate a cashier for a specific teller
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerWritePlatformServiceJpaImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerWritePlatformServiceJpaImpl.java
index 59a44d0..2f0a082 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerWritePlatformServiceJpaImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerWritePlatformServiceJpaImpl.java
@@ -165,8 +165,8 @@ public class TellerWritePlatformServiceJpaImpl implements TellerWritePlatformSer
     }
 
     /*
-     * used to restrict modifying operations to office that are either the users
-     * office or lower (child) in the office hierarchy
+     * used to restrict modifying operations to office that are either the users office or lower (child) in the office
+     * hierarchy
      */
     private Teller validateUserPriviledgeOnTellerAndRetrieve(final AppUser currentUser, final Long tellerId) {
 
@@ -202,8 +202,7 @@ public class TellerWritePlatformServiceJpaImpl implements TellerWritePlatformSer
     }
 
     /*
-     * Guaranteed to throw an exception no matter what the data integrity issue
-     * is.
+     * Guaranteed to throw an exception no matter what the data integrity issue is.
      */
     private void handleTellerDataIntegrityIssues(final JsonCommand command, final Throwable realCause, final Exception dve) {
 
@@ -345,9 +344,8 @@ public class TellerWritePlatformServiceJpaImpl implements TellerWritePlatformSer
     }
 
     /*
-     * @Override public CommandProcessingResult inwardCashToCashier (final Long
-     * cashierId, final CashierTransaction cashierTxn) { CashierTxnType txnType
-     * = CashierTxnType.INWARD_CASH_TXN; // pre save to generate id for use in
+     * @Override public CommandProcessingResult inwardCashToCashier (final Long cashierId, final CashierTransaction
+     * cashierTxn) { CashierTxnType txnType = CashierTxnType.INWARD_CASH_TXN; // pre save to generate id for use in
      * office hierarchy this.cashierTxnRepository.save(cashierTxn); }
      */
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/data/AdjustedDateDetailsDTO.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/data/AdjustedDateDetailsDTO.java
index 19ce000..f1230fd 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/data/AdjustedDateDetailsDTO.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/data/AdjustedDateDetailsDTO.java
@@ -27,8 +27,8 @@ public class AdjustedDateDetailsDTO {
      */
     LocalDate changedScheduleDate;
     /**
-     * Variable tracks If the meeting has been changed , i.e future schedule
-     * also changes along with the current repayments date.
+     * Variable tracks If the meeting has been changed , i.e future schedule also changes along with the current
+     * repayments date.
      */
     LocalDate changedActualRepaymentDate;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/domain/WorkingDaysRepositoryWrapper.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/domain/WorkingDaysRepositoryWrapper.java
index bf32f9d..b9af97f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/domain/WorkingDaysRepositoryWrapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/domain/WorkingDaysRepositoryWrapper.java
@@ -27,8 +27,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * Wrapper for {@link WorkingDaysRepository} that adds NULL checking and Error
- * handling capabilities
+ * Wrapper for {@link WorkingDaysRepository} that adds NULL checking and Error handling capabilities
  * </p>
  */
 @Service
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/AccountTransfersApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/AccountTransfersApiConstants.java
index e3134c8..0a874b1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/AccountTransfersApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/AccountTransfersApiConstants.java
@@ -35,9 +35,8 @@ public class AccountTransfersApiConstants {
     public static final String currencyParamName = "currency";
 
     /**
-     * These parameters will match the class level parameters of
-     * {@link AccountTransferData}. Where possible, we try to get response
-     * parameters to match those of request parameters.
+     * These parameters will match the class level parameters of {@link AccountTransferData}. Where possible, we try to
+     * get response parameters to match those of request parameters.
      */
     protected static final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(
             Arrays.asList(AccountDetailConstants.idParamName, transferDescriptionParamName, currencyParamName));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/domain/AccountTransferStandingInstruction.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/domain/AccountTransferStandingInstruction.java
index fe40ab2..66d4b07 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/domain/AccountTransferStandingInstruction.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/domain/AccountTransferStandingInstruction.java
@@ -296,8 +296,7 @@ public class AccountTransferStandingInstruction extends AbstractPersistableCusto
     }
 
     /**
-     * delete the standing instruction by setting the status to 3 and appending
-     * "_deleted_" and the id to the name
+     * delete the standing instruction by setting the status to 3 and appending "_deleted_" and the id to the name
      **/
     public void delete() {
         this.status = StandingInstructionStatus.DELETED.getValue();
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountAssociationsReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountAssociationsReadPlatformServiceImpl.java
index ab9306d..69ff14b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountAssociationsReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountAssociationsReadPlatformServiceImpl.java
@@ -171,9 +171,8 @@ public class AccountAssociationsReadPlatformServiceImpl implements AccountAssoci
             final String loanAccountNo = rs.getString("loanAccountNo");
             final PortfolioAccountData account = PortfolioAccountData.lookup(loanAccountId, loanAccountNo);
             /*
-             * if (savingsAccountId != null) { account =
-             * PortfolioAccountData.lookup(savingsAccountId, savingsAccountNo);
-             * } else if (loanAccountId != null) { account =
+             * if (savingsAccountId != null) { account = PortfolioAccountData.lookup(savingsAccountId,
+             * savingsAccountNo); } else if (loanAccountId != null) { account =
              * PortfolioAccountData.lookup(loanAccountId, loanAccountNo); }
              */
             final Long linkSavingsAccountId = JdbcSupport.getLong(rs, "linkSavingsAccountId");
@@ -184,11 +183,9 @@ public class AccountAssociationsReadPlatformServiceImpl implements AccountAssoci
             // rs.getString("linkLoanAccountNo");
             final PortfolioAccountData linkedAccount = PortfolioAccountData.lookup(linkSavingsAccountId, linkSavingsAccountNo);
             /*
-             * if (linkSavingsAccountId != null) { linkedAccount =
-             * PortfolioAccountData.lookup(linkSavingsAccountId,
-             * linkSavingsAccountNo); } else if (linkLoanAccountId != null) {
-             * linkedAccount = PortfolioAccountData.lookup(linkLoanAccountId,
-             * linkLoanAccountNo); }
+             * if (linkSavingsAccountId != null) { linkedAccount = PortfolioAccountData.lookup(linkSavingsAccountId,
+             * linkSavingsAccountNo); } else if (linkLoanAccountId != null) { linkedAccount =
+             * PortfolioAccountData.lookup(linkLoanAccountId, linkLoanAccountNo); }
              */
 
             return new AccountAssociationsData(id, account, linkedAccount);
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/PortfolioAccountReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/PortfolioAccountReadPlatformServiceImpl.java
index 2d1cfb3..5e41306 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/PortfolioAccountReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/PortfolioAccountReadPlatformServiceImpl.java
@@ -382,8 +382,8 @@ public class PortfolioAccountReadPlatformServiceImpl implements PortfolioAccount
 
             sql = "select " + this.accountRefundByTransferMapper.schema() + " where la.id = ?";
             /*
-             * if (currencyCode != null) { sql += " and la.currency_code = ?";
-             * sqlParams = new Object[] {accountId , accountId,currencyCode }; }
+             * if (currencyCode != null) { sql += " and la.currency_code = ?"; sqlParams = new Object[] {accountId ,
+             * accountId,currencyCode }; }
              */
 
             accountData = this.jdbcTemplate.queryForObject(sql, this.accountRefundByTransferMapper, sqlParams);
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/StandingInstructionReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/StandingInstructionReadPlatformServiceImpl.java
index 4211032..1fec51f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/StandingInstructionReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/StandingInstructionReadPlatformServiceImpl.java
@@ -216,9 +216,7 @@ public class StandingInstructionReadPlatformServiceImpl implements StandingInstr
         final Collection<EnumOptionData> transferTypeOptions = Arrays.asList(transferType(AccountTransferType.ACCOUNT_TRANSFER),
                 transferType(
                         AccountTransferType.LOAN_REPAYMENT)/*
-                                                            * , transferType(
-                                                            * AccountTransferType
-                                                            * . CHARGE_PAYMENT )
+                                                            * , transferType( AccountTransferType . CHARGE_PAYMENT )
                                                             */);
         final Collection<EnumOptionData> statusOptions = Arrays.asList(standingInstructionStatus(StandingInstructionStatus.ACTIVE),
                 standingInstructionStatus(StandingInstructionStatus.DISABLED));
@@ -445,16 +443,12 @@ public class StandingInstructionReadPlatformServiceImpl implements StandingInstr
             EnumOptionData transferTypeEnum = AccountTransferEnumerations.transferType(transferType);
 
             /*
-             * final String currencyCode = rs.getString("currencyCode"); final
-             * String currencyName = rs.getString("currencyName"); final String
-             * currencyNameCode = rs.getString("currencyNameCode"); final String
-             * currencyDisplaySymbol = rs.getString("currencyDisplaySymbol");
-             * final Integer currencyDigits = JdbcSupport.getInteger(rs,
-             * "currencyDigits"); final Integer inMultiplesOf =
-             * JdbcSupport.getInteger(rs, "inMultiplesOf"); final CurrencyData
-             * currency = new CurrencyData(currencyCode, currencyName,
-             * currencyDigits, inMultiplesOf, currencyDisplaySymbol,
-             * currencyNameCode);
+             * final String currencyCode = rs.getString("currencyCode"); final String currencyName =
+             * rs.getString("currencyName"); final String currencyNameCode = rs.getString("currencyNameCode"); final
+             * String currencyDisplaySymbol = rs.getString("currencyDisplaySymbol"); final Integer currencyDigits =
+             * JdbcSupport.getInteger(rs, "currencyDigits"); final Integer inMultiplesOf = JdbcSupport.getInteger(rs,
+             * "inMultiplesOf"); final CurrencyData currency = new CurrencyData(currencyCode, currencyName,
+             * currencyDigits, inMultiplesOf, currencyDisplaySymbol, currencyNameCode);
              */
             final Long fromOfficeId = JdbcSupport.getLong(rs, "fromOfficeId");
             final String fromOfficeName = rs.getString("fromOfficeName");
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/data/AccountSummaryCollectionData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/data/AccountSummaryCollectionData.java
index f7fd9f8..430de30 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/data/AccountSummaryCollectionData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/data/AccountSummaryCollectionData.java
@@ -37,8 +37,7 @@ public class AccountSummaryCollectionData {
     private final Collection<GuarantorAccountSummaryData> memberGuarantorAccounts;
 
     /*
-     * METHOD SIGNATURE CHANGE NOTICE: Method's signature was changed for GLIM &
-     * GSIM implementation
+     * METHOD SIGNATURE CHANGE NOTICE: Method's signature was changed for GLIM & GSIM implementation
      */
     public AccountSummaryCollectionData(final Collection<LoanAccountSummaryData> loanAccounts,
             final Collection<LoanAccountSummaryData> groupLoanIndividualMonitoringAccounts,
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/domain/Address.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/domain/Address.java
index 651da01..e2e27ae 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/domain/Address.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/domain/Address.java
@@ -43,8 +43,8 @@ import org.joda.time.format.DateTimeFormatter;
 public class Address extends AbstractPersistableCustom {
 
     /*
-     * @OneToMany(mappedBy = "address", cascade = CascadeType.ALL) private
-     * List<ClientAddress> clientaddress = new ArrayList<>();
+     * @OneToMany(mappedBy = "address", cascade = CascadeType.ALL) private List<ClientAddress> clientaddress = new
+     * ArrayList<>();
      */
 
     @OneToMany(mappedBy = "address", cascade = CascadeType.ALL)
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/Calendar.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/Calendar.java
index c372105..55be219 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/Calendar.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/Calendar.java
@@ -218,10 +218,9 @@ public class Calendar extends AbstractAuditableCustom {
             this.startDate = newMeetingStartDate.toDate();
 
             /*
-             * If meeting start date is changed then there is possibilities of
-             * recurring day may change, so derive the recurring day and update
-             * it if it is changed. For weekly type is weekday and for monthly
-             * type it is day of the month
+             * If meeting start date is changed then there is possibilities of recurring day may change, so derive the
+             * recurring day and update it if it is changed. For weekly type is weekday and for monthly type it is day
+             * of the month
              */
 
             CalendarFrequencyType calendarFrequencyType = CalendarUtils.getFrequency(this.recurrence);
@@ -326,10 +325,8 @@ public class Calendar extends AbstractAuditableCustom {
 
             throw new CalendarParameterUpdateNotSupportedException("meeting.type", defaultUserMessage, newMeetingType, oldMeeingType);
             /*
-             * final Integer newValue =
-             * command.integerValueSansLocaleOfParameterNamed(typeParamName);
-             * actualChanges.put(typeParamName, newValue); this.typeId =
-             * newValue;
+             * final Integer newValue = command.integerValueSansLocaleOfParameterNamed(typeParamName);
+             * actualChanges.put(typeParamName, newValue); this.typeId = newValue;
              */
         }
 
@@ -360,8 +357,8 @@ public class Calendar extends AbstractAuditableCustom {
         final String newRecurrence = Calendar.constructRecurrence(command, this);
         if (!StringUtils.isBlank(this.recurrence) && !newRecurrence.equalsIgnoreCase(this.recurrence)) {
             /*
-             * If active entities like JLG loan or RD accounts are synced to the
-             * calendar then do not allow to change meeting frequency
+             * If active entities like JLG loan or RD accounts are synced to the calendar then do not allow to change
+             * meeting frequency
              */
 
             if (areActiveEntitiesSynced && !CalendarUtils.isFrequencySame(this.recurrence, newRecurrence)) {
@@ -370,8 +367,8 @@ public class Calendar extends AbstractAuditableCustom {
             }
 
             /*
-             * If active entities like JLG loan or RD accounts are synced to the
-             * calendar then do not allow to change meeting interval
+             * If active entities like JLG loan or RD accounts are synced to the calendar then do not allow to change
+             * meeting interval
              */
 
             if (areActiveEntitiesSynced && !CalendarUtils.isIntervalSame(this.recurrence, newRecurrence)) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarFrequencyType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarFrequencyType.java
index 10b7f91..05e3eed 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarFrequencyType.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarFrequencyType.java
@@ -105,8 +105,7 @@ public enum CalendarFrequencyType {
     }
 
     /**
-     * To convert from period frequency type tp calendar frequency type. This
-     * method requires code refactoring.
+     * To convert from period frequency type tp calendar frequency type. This method requires code refactoring.
      *
      * @param periodFrequencyType
      *            periodFrequencyType
@@ -128,8 +127,7 @@ public enum CalendarFrequencyType {
     }
 
     /**
-     * To convert from period frequency type tp calendar frequency type. This
-     * method requires code refactoring.
+     * To convert from period frequency type tp calendar frequency type. This method requires code refactoring.
      *
      * @param frequencyType
      * @return
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarInstanceRepository.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarInstanceRepository.java
index 4ecb09b..037b702 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarInstanceRepository.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarInstanceRepository.java
@@ -37,8 +37,7 @@ public interface CalendarInstanceRepository extends JpaRepository<CalendarInstan
 
     /**
      * @param entityId
-     *            : Id of {@link Client}, {@link Group}, {@link Loan} or
-     *            {@link SavingsAccount}.
+     *            : Id of {@link Client}, {@link Group}, {@link Loan} or {@link SavingsAccount}.
      * @param entityTypeId:
      *            {@link CalendarEntityType}
      * @param calendarTypeId:
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarInstanceRepositoryWrapper.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarInstanceRepositoryWrapper.java
index 0952f75..23c9d56 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarInstanceRepositoryWrapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarInstanceRepositoryWrapper.java
@@ -24,15 +24,13 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * Wrapper for {@link CalendarInstanceRepository} that is responsible for
- * checking if {@link CalendarInstance} is returned when using
- * <code>findOne</code> repository method and throwing an appropriate not found
- * exception.
+ * Wrapper for {@link CalendarInstanceRepository} that is responsible for checking if {@link CalendarInstance} is
+ * returned when using <code>findOne</code> repository method and throwing an appropriate not found exception.
  * </p>
  *
  * <p>
- * This is to avoid need for checking and throwing in multiple areas of code
- * base where {@link CalendarInstanceRepository} is required.
+ * This is to avoid need for checking and throwing in multiple areas of code base where
+ * {@link CalendarInstanceRepository} is required.
  * </p>
  */
 @Service
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarRepositoryWrapper.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarRepositoryWrapper.java
index f86e4bc..d49d8dd 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarRepositoryWrapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarRepositoryWrapper.java
@@ -24,14 +24,13 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * Wrapper for {@link CalendarRepository} that is responsible for checking if
- * {@link Calendar} is returned when using <code>findOne</code> repository
- * method and throwing an appropriate not found exception.
+ * Wrapper for {@link CalendarRepository} that is responsible for checking if {@link Calendar} is returned when using
+ * <code>findOne</code> repository method and throwing an appropriate not found exception.
  * </p>
  *
  * <p>
- * This is to avoid need for checking and throwing in multiple areas of code
- * base where {@link CalendarRepository} is required.
+ * This is to avoid need for checking and throwing in multiple areas of code base where {@link CalendarRepository} is
+ * required.
  * </p>
  */
 @Service
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/exception/CalendarInstanceNotFoundException.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/exception/CalendarInstanceNotFoundException.java
index 072e99b..dc380d9 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/exception/CalendarInstanceNotFoundException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/exception/CalendarInstanceNotFoundException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.portfolio.calendar.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
 
 /**
- * A {@link RuntimeException} thrown when CalendarInstance resources are not
- * found.
+ * A {@link RuntimeException} thrown when CalendarInstance resources are not found.
  */
 public class CalendarInstanceNotFoundException extends AbstractPlatformResourceNotFoundException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarReadPlatformServiceImpl.java
index 5b43571..0048964 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarReadPlatformServiceImpl.java
@@ -324,16 +324,13 @@ public class CalendarReadPlatformServiceImpl implements CalendarReadPlatformServ
         CalendarData applicableCalendarData = calendarData;
         LocalDate nextEligibleMeetingDate = null;
         /**
-         * The next available meeting date for collection should be taken from
-         * application calendar for that time period. e.g. If the previous
-         * calendar details has weekly meeting starting from 1st of Oct 2013 on
-         * every Tuesday, then meeting dates for collection are 1,8,15,22,29..
+         * The next available meeting date for collection should be taken from application calendar for that time
+         * period. e.g. If the previous calendar details has weekly meeting starting from 1st of Oct 2013 on every
+         * Tuesday, then meeting dates for collection are 1,8,15,22,29..
          *
-         * If meeting schedule has changed from Tuesday to Friday with effective
-         * from 15th of Oct (calendar update has made on 2nd of Oct) , then
-         * application should allow to generate collection sheet on 8th of Oct
-         * which is still on Tuesday and next collection sheet date should be on
-         * 18th of Oct as per current calendar
+         * If meeting schedule has changed from Tuesday to Friday with effective from 15th of Oct (calendar update has
+         * made on 2nd of Oct) , then application should allow to generate collection sheet on 8th of Oct which is still
+         * on Tuesday and next collection sheet date should be on 18th of Oct as per current calendar
          */
 
         Integer numberOfDays = 0;
@@ -350,8 +347,8 @@ public class CalendarReadPlatformServiceImpl implements CalendarReadPlatformServ
         }
 
         /**
-         * If nextEligibleMeetingDate is on or after current calendar startdate
-         * then regenerate the nextEligible meeting date based on
+         * If nextEligibleMeetingDate is on or after current calendar startdate then regenerate the nextEligible meeting
+         * date based on
          */
         if (nextEligibleMeetingDate == null) {
             final LocalDate seedDate = (lastMeetingDate != null) ? lastMeetingDate : calendarData.getStartDate();
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarUtils.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarUtils.java
index 94fb7e0..98df422 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarUtils.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarUtils.java
@@ -588,9 +588,8 @@ public class CalendarUtils {
         /*
          * Recurring dates should follow loanRepaymentInterval.
          *
-         * e.g. The weekly meeting will have interval of 1, if the loan product
-         * with fortnightly frequency will have interval of 2, to generate right
-         * set of meeting dates reset interval same as loan repayment interval.
+         * e.g. The weekly meeting will have interval of 1, if the loan product with fortnightly frequency will have
+         * interval of 2, to generate right set of meeting dates reset interval same as loan repayment interval.
          */
 
         Recur.Builder recurBuilder = getRecurBuilder(recur);
@@ -598,10 +597,9 @@ public class CalendarUtils {
         recurBuilder = recurBuilder.interval(loanRepaymentInterval);
 
         /*
-         * Recurring dates should follow loanRepayment frequency. //e.g. daily
-         * meeting frequency should support all loan products with any type of
-         * frequency. to generate right set of meeting dates reset frequency
-         * same as loan repayment frequency.
+         * Recurring dates should follow loanRepayment frequency. //e.g. daily meeting frequency should support all loan
+         * products with any type of frequency. to generate right set of meeting dates reset frequency same as loan
+         * repayment frequency.
          */
 
         if (recur.getFrequency().equals(Recur.Frequency.DAILY)) {
@@ -676,8 +674,7 @@ public class CalendarUtils {
     }
 
     /**
-     * function returns a comma separated list of calendar_type_enum values ex.
-     * 1,2,3,4
+     * function returns a comma separated list of calendar_type_enum values ex. 1,2,3,4
      *
      * @param calendarTypeOptions
      * @return
@@ -725,8 +722,7 @@ public class CalendarUtils {
         LocalDate date = startDate;
         final LocalDate seedDate = calendar.getStartDateLocalDate();
         /**
-         * if (isValidRedurringDate(calendar.getRecurrence(), seedDate, date)) {
-         * date = date.plusDays(1); }
+         * if (isValidRedurringDate(calendar.getRecurrence(), seedDate, date)) { date = date.plusDays(1); }
          **/
 
         final LocalDate scheduleDate = getNextRecurringDate(recur, seedDate, date);
@@ -801,9 +797,8 @@ public class CalendarUtils {
         /*
          * Recurring dates should follow loanRepaymentInterval.
          *
-         * e.g. The weekly meeting will have interval of 1, if the loan product
-         * with fortnightly frequency will have interval of 2, to generate right
-         * set of meeting dates reset interval same as loan repayment interval.
+         * e.g. The weekly meeting will have interval of 1, if the loan product with fortnightly frequency will have
+         * interval of 2, to generate right set of meeting dates reset interval same as loan repayment interval.
          */
         int meetingInterval = recur.getInterval();
         if (meetingInterval < 1) {
@@ -812,10 +807,9 @@ public class CalendarUtils {
         int rep = repaymentInterval < meetingInterval ? 1 : repaymentInterval / meetingInterval;
 
         /*
-         * Recurring dates should follow loanRepayment frequency. //e.g. daily
-         * meeting frequency should support all loan products with any type of
-         * frequency. to generate right set of meeting dates reset frequency
-         * same as loan repayment frequency.
+         * Recurring dates should follow loanRepayment frequency. //e.g. daily meeting frequency should support all loan
+         * products with any type of frequency. to generate right set of meeting dates reset frequency same as loan
+         * repayment frequency.
          */
 
         Recur.Builder recurBuilder = getRecurBuilder(recur);
@@ -873,9 +867,8 @@ public class CalendarUtils {
         final Integer interval = 4;
         Integer repaymentInterval = loanRepaymentInterval;
         /*
-         * check loanRepaymentInterval equal to 1, if repayments frequency is
-         * monthly and meeting frequency is weekly, then generate repayments
-         * schedule as every 4 weeks
+         * check loanRepaymentInterval equal to 1, if repayments frequency is monthly and meeting frequency is weekly,
+         * then generate repayments schedule as every 4 weeks
          */
         if (frequency.equals(Recur.Frequency.MONTHLY.name()) && recur.getFrequency().equals(Recur.Frequency.WEEKLY)) {
             repaymentInterval = loanRepaymentInterval * interval;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarWritePlatformServiceJpaRepositoryImpl.java
index d806e5a..072d965 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarWritePlatformServiceJpaRepositoryImpl.java
@@ -186,8 +186,7 @@ public class CalendarWritePlatformServiceJpaRepositoryImpl implements CalendarWr
                         .findByEntityIdAndEntityTypeIdAndCalendarTypeId(parent.getId(), centerEntityTypeId,
                                 CalendarType.COLLECTION.getValue());
                 /*
-                 * If calendar is created by parent group, then it cannot be
-                 * edited by the child group
+                 * If calendar is created by parent group, then it cannot be edited by the child group
                  */
                 if (collectionCalendarInstance != null) {
                     final String errorMessage = "meeting.created.at.center.cannot.be.edited.at.group.level";
@@ -223,8 +222,7 @@ public class CalendarWritePlatformServiceJpaRepositoryImpl implements CalendarWr
                 loanStatuses);
 
         /*
-         * areActiveEntitiesSynced is set to true, if there are any active loans
-         * synced to this calendar.
+         * areActiveEntitiesSynced is set to true, if there are any active loans synced to this calendar.
          */
 
         if (numberOfActiveLoansSyncedWithThisCalendar > 0) {
@@ -246,19 +244,15 @@ public class CalendarWritePlatformServiceJpaRepositoryImpl implements CalendarWr
         /*
          * System allows to change the meeting date by two means,
          *
-         * Option 1: reschedulebasedOnMeetingDates = false or
-         * reschedulebasedOnMeetingDates is not passed By directly editing the
-         * recurring day with effective from date and system decides the next
-         * meeting date based on some sensible logic (i.e., number of minimum
-         * days between two repayments)
+         * Option 1: reschedulebasedOnMeetingDates = false or reschedulebasedOnMeetingDates is not passed By directly
+         * editing the recurring day with effective from date and system decides the next meeting date based on some
+         * sensible logic (i.e., number of minimum days between two repayments)
          *
          *
-         * Option 2: reschedulebasedOnMeetingDates = true By providing
-         * alternative meeting date for one of future meeting date and derive
-         * the day of recurrence from the new meeting date. Ex: User proposes
-         * new meeting date say "14/Nov/2014" for present meeting date
-         * "12/Nov/2014", based on this input other values re derived and loans
-         * are rescheduled
+         * Option 2: reschedulebasedOnMeetingDates = true By providing alternative meeting date for one of future
+         * meeting date and derive the day of recurrence from the new meeting date. Ex: User proposes new meeting date
+         * say "14/Nov/2014" for present meeting date "12/Nov/2014", based on this input other values re derived and
+         * loans are rescheduled
          *
          */
 
@@ -271,8 +265,7 @@ public class CalendarWritePlatformServiceJpaRepositoryImpl implements CalendarWr
             presentMeetingDate = command.localDateValueOfParameterNamed(CalendarSupportedParameters.PRESENT_MEETING_DATE.getValue());
 
             /*
-             * New meeting date proposed will become the new start date for the
-             * updated calendar
+             * New meeting date proposed will become the new start date for the updated calendar
              */
 
             changes = calendarForUpdate.updateStartDateAndDerivedFeilds(newMeetingDate);
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/domain/Charge.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/domain/Charge.java
index 0045ce4..1dea54d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/domain/Charge.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/domain/Charge.java
@@ -357,11 +357,9 @@ public class Charge extends AbstractPersistableCustom {
         final String chargeAppliesToParamName = "chargeAppliesTo";
         if (command.isChangeInIntegerParameterNamed(chargeAppliesToParamName, this.chargeAppliesTo)) {
             /*
-             * final Integer newValue =
-             * command.integerValueOfParameterNamed(chargeAppliesToParamName);
-             * actualChanges.put(chargeAppliesToParamName, newValue);
-             * actualChanges.put("locale", localeAsInput); this.chargeAppliesTo
-             * = ChargeAppliesTo.fromInt(newValue).getValue();
+             * final Integer newValue = command.integerValueOfParameterNamed(chargeAppliesToParamName);
+             * actualChanges.put(chargeAppliesToParamName, newValue); actualChanges.put("locale", localeAsInput);
+             * this.chargeAppliesTo = ChargeAppliesTo.fromInt(newValue).getValue();
              */
 
             // AA: Do not allow to change chargeAppliesTo.
@@ -506,8 +504,7 @@ public class Charge extends AbstractPersistableCustom {
     }
 
     /**
-     * Delete is a <i>soft delete</i>. Updates flag on charge so it wont appear
-     * in query/report results.
+     * Delete is a <i>soft delete</i>. Updates flag on charge so it wont appear in query/report results.
      *
      * Any fields with unique constraints and prepended with id of record.
      */
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/domain/ChargeRepositoryWrapper.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/domain/ChargeRepositoryWrapper.java
index 0fa68dd..68cb44c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/domain/ChargeRepositoryWrapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/domain/ChargeRepositoryWrapper.java
@@ -25,14 +25,13 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * Wrapper for {@link ChargeRepository} that is responsible for checking if
- * {@link Charge} is returned when using <code>findOne</code> repository method
- * and throwing an appropriate not found exception.
+ * Wrapper for {@link ChargeRepository} that is responsible for checking if {@link Charge} is returned when using
+ * <code>findOne</code> repository method and throwing an appropriate not found exception.
  * </p>
  *
  * <p>
- * This is to avoid need for checking and throwing in multiple areas of code
- * base where {@link ChargeRepository} is required.
+ * This is to avoid need for checking and throwing in multiple areas of code base where {@link ChargeRepository} is
+ * required.
  * </p>
  */
 @Service
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/ChargeDueAtDisbursementCannotBePenaltyException.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/ChargeDueAtDisbursementCannotBePenaltyException.java
index eeeb196..2a66f31 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/ChargeDueAtDisbursementCannotBePenaltyException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/ChargeDueAtDisbursementCannotBePenaltyException.java
@@ -21,8 +21,8 @@ package org.apache.fineract.portfolio.charge.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
- * {@link AbstractPlatformDomainRuleException} thrown when attempting to crate
- * charge of type penalty due at disbursement .
+ * {@link AbstractPlatformDomainRuleException} thrown when attempting to crate charge of type penalty due at
+ * disbursement .
  */
 public class ChargeDueAtDisbursementCannotBePenaltyException extends AbstractPlatformDomainRuleException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/ChargeMustBePenaltyException.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/ChargeMustBePenaltyException.java
index efaebd5..972093d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/ChargeMustBePenaltyException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/ChargeMustBePenaltyException.java
@@ -21,8 +21,8 @@ package org.apache.fineract.portfolio.charge.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
- * {@link AbstractPlatformDomainRuleException} thrown when attempting to crate
- * charge of type penalty due at disbursement .
+ * {@link AbstractPlatformDomainRuleException} thrown when attempting to crate charge of type penalty due at
+ * disbursement .
  */
 public class ChargeMustBePenaltyException extends AbstractPlatformDomainRuleException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeCannotBeAddedException.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeCannotBeAddedException.java
index 842dfd5..4bbcce8 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeCannotBeAddedException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeCannotBeAddedException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.portfolio.charge.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
- * {@link AbstractPlatformDomainRuleException} thrown when loan charge is not
- * allowed to be added to the loan.
+ * {@link AbstractPlatformDomainRuleException} thrown when loan charge is not allowed to be added to the loan.
  */
 public class LoanChargeCannotBeAddedException extends AbstractPlatformDomainRuleException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeNotFoundException.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeNotFoundException.java
index 9971d87..2db9345 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeNotFoundException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeNotFoundException.java
@@ -22,8 +22,7 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainR
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
 
 /**
- * {@link AbstractPlatformDomainRuleException} thrown when loan charge does not
- * exist.
+ * {@link AbstractPlatformDomainRuleException} thrown when loan charge does not exist.
  */
 public class LoanChargeNotFoundException extends AbstractPlatformResourceNotFoundException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeWithoutMandatoryFieldException.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeWithoutMandatoryFieldException.java
index 6833b2b..02ea394 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeWithoutMandatoryFieldException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/LoanChargeWithoutMandatoryFieldException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.portfolio.charge.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
- * {@link AbstractPlatformDomainRuleException} thrown when currency mismatch
- * occurs
+ * {@link AbstractPlatformDomainRuleException} thrown when currency mismatch occurs
  */
 public class LoanChargeWithoutMandatoryFieldException extends AbstractPlatformDomainRuleException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/SavingsAccountChargeNotFoundException.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/SavingsAccountChargeNotFoundException.java
index 4484bd5..4f28d7c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/SavingsAccountChargeNotFoundException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/SavingsAccountChargeNotFoundException.java
@@ -22,8 +22,7 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainR
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
 
 /**
- * {@link AbstractPlatformDomainRuleException} thrown when savings account
- * charge does not exist.
+ * {@link AbstractPlatformDomainRuleException} thrown when savings account charge does not exist.
  */
 public class SavingsAccountChargeNotFoundException extends AbstractPlatformResourceNotFoundException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/SavingsAccountChargeWithoutMandatoryFieldException.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/SavingsAccountChargeWithoutMandatoryFieldException.java
index 1fdd395..38dbeb7 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/SavingsAccountChargeWithoutMandatoryFieldException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/SavingsAccountChargeWithoutMandatoryFieldException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.portfolio.charge.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
- * {@link AbstractPlatformDomainRuleException} thrown when currency mismatch
- * occurs
+ * {@link AbstractPlatformDomainRuleException} thrown when currency mismatch occurs
  */
 public class SavingsAccountChargeWithoutMandatoryFieldException extends AbstractPlatformDomainRuleException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/ShareAccountChargeWithoutMandatoryFieldException.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/ShareAccountChargeWithoutMandatoryFieldException.java
index 1c08ae6..adf56eb 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/ShareAccountChargeWithoutMandatoryFieldException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/exception/ShareAccountChargeWithoutMandatoryFieldException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.portfolio.charge.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
- * {@link AbstractPlatformDomainRuleException} thrown when currency mismatch
- * occurs
+ * {@link AbstractPlatformDomainRuleException} thrown when currency mismatch occurs
  */
 public class ShareAccountChargeWithoutMandatoryFieldException extends AbstractPlatformDomainRuleException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/service/ChargeReadPlatformService.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/service/ChargeReadPlatformService.java
index 0e81878..0f8818c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/service/ChargeReadPlatformService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/service/ChargeReadPlatformService.java
@@ -56,8 +56,7 @@ public interface ChargeReadPlatformService {
     Collection<ChargeData> retrieveLoanAccountApplicableCharges(final Long loanId, ChargeTimeType[] excludeChargeTimes);
 
     /**
-     * Returns all charges applicable for a given loan product (filter based on
-     * Currency of Selected Loan Product)
+     * Returns all charges applicable for a given loan product (filter based on Currency of Selected Loan Product)
      *
      * @param excludeChargeTimes
      *            Excludes Given List of Charge Types from the response
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/service/ChargeWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/service/ChargeWritePlatformServiceJpaRepositoryImpl.java
index 17bb9d8..1f950c5 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/service/ChargeWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/service/ChargeWritePlatformServiceJpaRepositoryImpl.java
@@ -227,8 +227,7 @@ public class ChargeWritePlatformServiceJpaRepositoryImpl implements ChargeWriteP
     }
 
     /*
-     * Guaranteed to throw an exception no matter what the data integrity issue
-     * is.
+     * Guaranteed to throw an exception no matter what the data integrity issue is.
      */
     private void handleDataIntegrityIssues(final JsonCommand command, final Throwable realCause, final Exception dve) {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientApiConstants.java
index 5e03175..bbafa49 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientApiConstants.java
@@ -185,9 +185,8 @@ public class ClientApiConstants {
     public static final String clientEntityName = "clients";
 
     /**
-     * These parameters will match the class level parameters of
-     * {@link ClientData}. Where possible, we try to get response parameters to
-     * match those of request parameters.
+     * These parameters will match the class level parameters of {@link ClientData}. Where possible, we try to get
+     * response parameters to match those of request parameters.
      */
     protected static final Set<String> CLIENT_RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList(idParamName, accountNoParamName,
             externalIdParamName, statusParamName, activeParamName, activationDateParamName, firstnameParamName, middlenameParamName,
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/data/ClientApiCollectionConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/data/ClientApiCollectionConstants.java
index d66f97d..2c76381 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/data/ClientApiCollectionConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/data/ClientApiCollectionConstants.java
@@ -49,9 +49,8 @@ public class ClientApiCollectionConstants extends ClientApiConstants {
                     constitutionIdParamName, mainBusinessLineIdParamName));
 
     /**
-     * These parameters will match the class level parameters of
-     * {@link ClientData}. Where possible, we try to get response parameters to
-     * match those of request parameters.
+     * These parameters will match the class level parameters of {@link ClientData}. Where possible, we try to get
+     * response parameters to match those of request parameters.
      */
 
     protected static final Set<String> ACTIVATION_REQUEST_DATA_PARAMETERS = new HashSet<>(
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/data/ClientDataValidator.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/data/ClientDataValidator.java
index 870d9a7..63c581c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/data/ClientDataValidator.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/data/ClientDataValidator.java
@@ -104,14 +104,11 @@ public final class ClientDataValidator {
             baseDataValidator.reset().parameter(ClientApiConstants.savingsProductIdParamName).value(savingsProductId).ignoreIfNull()
                     .longGreaterThanZero();
             /*
-             * if (savingsProductId != null &&
-             * this.fromApiJsonHelper.parameterExists(ClientApiConstants.
-             * datatables, element)) { final JsonArray datatables =
-             * this.fromApiJsonHelper.extractJsonArrayNamed(ClientApiConstants.
+             * if (savingsProductId != null && this.fromApiJsonHelper.parameterExists(ClientApiConstants. datatables,
+             * element)) { final JsonArray datatables = this.fromApiJsonHelper.extractJsonArrayNamed(ClientApiConstants.
              * datatables, element); if (datatables.size() > 0) {
              * baseDataValidator.reset().parameter(ClientApiConstants.
-             * savingsProductIdParamName).value(savingsProductId)
-             * .failWithCodeNoParameterAddedToErrorCode(
+             * savingsProductIdParamName).value(savingsProductId) .failWithCodeNoParameterAddedToErrorCode(
              * "should.not.be.used.with.datatables.parameter"); } }
              */
         }
@@ -175,12 +172,9 @@ public final class ClientDataValidator {
                         element);
                 baseDataValidator.reset().parameter(ClientApiConstants.activationDateParamName).value(joinedDate).notNull();
                 /*
-                 * if(this.fromApiJsonHelper.parameterExists(ClientApiConstants.
-                 * datatables,element)){
-                 * baseDataValidator.reset().parameter(ClientApiConstants.
-                 * activeParamName).value(active)
-                 * .failWithCodeNoParameterAddedToErrorCode(
-                 * "should.not.be.used.with.datatables.parameter"); }
+                 * if(this.fromApiJsonHelper.parameterExists(ClientApiConstants. datatables,element)){
+                 * baseDataValidator.reset().parameter(ClientApiConstants. activeParamName).value(active)
+                 * .failWithCodeNoParameterAddedToErrorCode( "should.not.be.used.with.datatables.parameter"); }
                  */
             }
         } else {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/data/ClientTimelineData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/data/ClientTimelineData.java
index 6851885..52f6f98 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/data/ClientTimelineData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/data/ClientTimelineData.java
@@ -22,8 +22,7 @@ import java.io.Serializable;
 import org.joda.time.LocalDate;
 
 /**
- * Immutable data object represent the important time-line events of a loan
- * application and loan.
+ * Immutable data object represent the important time-line events of a loan application and loan.
  */
 @SuppressWarnings("unused")
 public class ClientTimelineData implements Serializable {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/AccountNumberGenerator.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/AccountNumberGenerator.java
index 1c4dec6..0372bcd 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/AccountNumberGenerator.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/AccountNumberGenerator.java
@@ -31,9 +31,8 @@ import org.apache.fineract.portfolio.shareaccounts.domain.ShareAccount;
 import org.springframework.stereotype.Component;
 
 /**
- * Example {@link AccountNumberGenerator} for clients that takes an entities
- * auto generated database id and zero fills it ensuring the identifier is
- * always of a given <code>maxLength</code>.
+ * Example {@link AccountNumberGenerator} for clients that takes an entities auto generated database id and zero fills
+ * it ensuring the identifier is always of a given <code>maxLength</code>.
  */
 @Component
 public class AccountNumberGenerator {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientNonPersonRepositoryWrapper.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientNonPersonRepositoryWrapper.java
index e2dd277..ec360de 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientNonPersonRepositoryWrapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientNonPersonRepositoryWrapper.java
@@ -26,8 +26,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * Wrapper for {@link ClientNonPersonRepository} that adds NULL checking and
- * Error handling capabilities
+ * Wrapper for {@link ClientNonPersonRepository} that adds NULL checking and Error handling capabilities
  * </p>
  */
 @Service
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientRepositoryWrapper.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientRepositoryWrapper.java
index 8a8fe91..92e0b54 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientRepositoryWrapper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientRepositoryWrapper.java
@@ -29,8 +29,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 /**
  * <p>
- * Wrapper for {@link ClientRepository} that adds NULL checking and Error
- * handling capabilities
+ * Wrapper for {@link ClientRepository} that adds NULL checking and Error handling capabilities
  * </p>
  */
 @Service
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientTransaction.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientTransaction.java
index e052ba7..6268df7 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientTransaction.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientTransaction.java
@@ -139,8 +139,7 @@ public class ClientTransaction extends AbstractPersistableCustom {
     }
 
     /**
-     * Converts the content of this Client Transaction to a map which can be
-     * passed to the accounting module
+     * Converts the content of this Client Transaction to a map which can be passed to the accounting module
      *
      *
      *
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/exception/ClientIdentifierNotFoundException.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/exception/ClientIdentifierNotFoundException.java
index ddc64f1..061fdbe 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/exception/ClientIdentifierNotFoundException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/exception/ClientIdentifierNotFoundException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.portfolio.client.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
 
 /**
- * A {@link RuntimeException} thrown when client Identifier resources are not
- * found.
+ * A {@link RuntimeException} thrown when client Identifier resources are not found.
  */
 public class ClientIdentifierNotFoundException extends AbstractPlatformResourceNotFoundException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/exception/ClientNonPersonNotFoundByClientIdException.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/exception/ClientNonPersonNotFoundByClientIdException.java
index cf2be24..8729894 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/exception/ClientNonPersonNotFoundByClientIdException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/exception/ClientNonPersonNotFoundByClientIdException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.portfolio.client.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
 
 /**
- * A {@link RuntimeException} thrown when clientNonPerson resources are not
- * found.
+ * A {@link RuntimeException} thrown when clientNonPerson resources are not found.
  */
 public class ClientNonPersonNotFoundByClientIdException extends AbstractPlatformResourceNotFoundException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/exception/ClientNonPersonNotFoundException.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/exception/ClientNonPersonNotFoundException.java
index 9ae84d7..99320ad 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/exception/ClientNonPersonNotFoundException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/exception/ClientNonPersonNotFoundException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.portfolio.client.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
 
 /**
- * A {@link RuntimeException} thrown when clientNonPerson resources are not
- * found.
+ * A {@link RuntimeException} thrown when clientNonPerson resources are not found.
  */
 public class ClientNonPersonNotFoundException extends AbstractPlatformResourceNotFoundException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/exception/DuplicateClientIdentifierException.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/exception/DuplicateClientIdentifierException.java
index 69999e1..41f3ba3 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/exception/DuplicateClientIdentifierException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/exception/DuplicateClientIdentifierException.java
@@ -21,8 +21,7 @@ package org.apache.fineract.portfolio.client.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
- * A {@link RuntimeException} thrown when a client identifier of the particular
- * type is already present
+ * A {@link RuntimeException} thrown when a client identifier of the particular type is already present
  */
 public class DuplicateClientIdentifierException extends AbstractPlatformDomainRuleException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/exception/InvalidClientSavingProductException.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/exception/InvalidClientSavingProductException.java
old mode 100755
new mode 100644
index e1d468d..d092116
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/exception/InvalidClientSavingProductException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/exception/InvalidClientSavingProductException.java
@@ -21,8 +21,8 @@ package org.apache.fineract.portfolio.client.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
- * {@link AbstractPlatformDomainRuleException} thrown an action to transition a
- * loan from one state to another violates a domain rule.
+ * {@link AbstractPlatformDomainRuleException} thrown an action to transition a loan from one state to another violates
+ * a domain rule.
  */
 public class InvalidClientSavingProductException extends AbstractPlatformDomainRuleException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/exception/InvalidClientStateTransitionException.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/exception/InvalidClientStateTransitionException.java
index 1a1df93..bfbe461 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/exception/InvalidClientStateTransitionException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/exception/InvalidClientStateTransitionException.java
@@ -21,8 +21,8 @@ package org.apache.fineract.portfolio.client.exception;
 import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainRuleException;
 
 /**
- * {@link AbstractPlatformDomainRuleException} thrown an action to transition a
- * loan from one state to another violates a domain rule.
+ * {@link AbstractPlatformDomainRuleException} thrown an action to transition a loan from one state to another violates
+ * a domain rule.
  */
 public class InvalidClientStateTransitionException extends AbstractPlatformDomainRuleException {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/handler/UpdateClientAddressCommandHandler.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/handler/UpdateClientAddressCommandHandler.java
index 8bc7005..3523bfe 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/handler/UpdateClientAddressCommandHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/handler/UpdateClientAddressCommandHandler.java
@@ -40,9 +40,8 @@ public class UpdateClientAddressCommandHandler implements NewCommandSourceHandle
     @Override
     public CommandProcessingResult processCommand(final JsonCommand command) {
         /*
-         * return
-         * this.writePlatformService.updateClientAddress(command.getClientId(),
-         * command.entityId(), command.getStatus(), command);
+         * return this.writePlatformService.updateClientAddress(command.getClientId(), command.entityId(),
+         * command.getStatus(), command);
          */
         return this.writePlatformService.updateClientAddress(command.getClientId(), command);
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/serialization/ClientIdentifierCommandFromApiJsonDeserializer.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/serialization/ClientIdentifierCommandFromApiJsonDeserializer.java
index 3b7f28f..13956af 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/serialization/ClientIdentifierCommandFromApiJsonDeserializer.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/serialization/ClientIdentifierCommandFromApiJsonDeserializer.java
@@ -35,8 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
- * Implementation of {@link FromApiJsonDeserializer} for
- * {@link ClientIdentifierCommandFromApiJsonDeserializer} 's.
+ * Implementation of {@link FromApiJsonDeserializer} for {@link ClientIdentifierCommandFromApiJsonDeserializer} 's.
  */
 @Component
 public final class ClientIdentifierCommandFromApiJsonDeserializer extends AbstractFromApiJsonDeserializer<ClientIdentifierCommand> {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientChargeWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientChargeWritePlatformServiceJpaRepositoryImpl.java
index fc3de26..065d688 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientChargeWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientChargeWritePlatformServiceJpaRepositoryImpl.java
@@ -258,8 +258,7 @@ public class ClientChargeWritePlatformServiceJpaRepositoryImpl implements Client
     /**
      * Validates transaction to ensure that <br>
      * charge is active <br>
-     * transaction date is valid (between client activation and todays date)
-     * <br>
+     * transaction date is valid (between client activation and todays date) <br>
      * charge is not already paid or waived <br>
      * amount is not more than total due
      *
@@ -269,8 +268,7 @@ public class ClientChargeWritePlatformServiceJpaRepositoryImpl implements Client
      * @param transactionDate
      * @param amountPaid
      * @param requiresTransactionDateValidation
-     *            if set to false, transaction date specific validation is
-     *            skipped
+     *            if set to false, transaction date specific validation is skipped
      * @param requiresTransactionAmountValidation
      *            if set to false transaction amount validation is skipped
      * @return
@@ -387,8 +385,7 @@ public class ClientChargeWritePlatformServiceJpaRepositoryImpl implements Client
     }
 
     /**
-     * Ensures that the charge transaction date (for payments) is not on a
-     * holiday or a non working day
+     * Ensures that the charge transaction date (for payments) is not on a holiday or a non working day
      *
      * @param savingsAccountCharge
      * @param fmt
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientFamilyMembersWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientFamilyMembersWritePlatformServiceImpl.java
index 1b8ec03..760cef1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientFamilyMembersWritePlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientFamilyMembersWritePlatformServiceImpl.java
@@ -249,8 +249,7 @@ public class ClientFamilyMembersWritePlatformServiceImpl implements ClientFamily
                 }
 
                 /*
-                 * this.fromApiJsonHelper.extractDateFormatParameter(member.get(
-                 * "dateOfBirth").getAsJsonObject());
+                 * this.fromApiJsonHelper.extractDateFormatParameter(member.get( "dateOfBirth").getAsJsonObject());
                  */
 
             }
@@ -292,8 +291,7 @@ public class ClientFamilyMembersWritePlatformServiceImpl implements ClientFamily
         apiJsonDeserializer.validateForUpdate(familyMemberId, command.json());
 
         /*
-         * if (command.stringValueOfParameterNamed("clientFamilyMemberId") !=
-         * null) { clientFamilyMemberId =
+         * if (command.stringValueOfParameterNamed("clientFamilyMemberId") != null) { clientFamilyMemberId =
          * command.longValueOfParameterNamed("clientFamilyMemberId"); }
          */
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java
index e7f552e..603d67d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java
@@ -196,8 +196,7 @@ public class ClientWritePlatformServiceJpaRepositoryImpl implements ClientWriteP
     }
 
     /*
-     * Guaranteed to throw an exception no matter what the data integrity issue
-     * is.
+     * Guaranteed to throw an exception no matter what the data integrity issue is.
      */
     private void handleDataIntegrityIssues(final JsonCommand command, final Throwable realCause, final Exception dve) {
 
@@ -365,8 +364,7 @@ public class ClientWritePlatformServiceJpaRepositoryImpl implements ClientWriteP
     }
 
     /**
-     * This method extracts ClientNonPerson details from Client command and
-     * creates a new ClientNonPerson record
+     * This method extracts ClientNonPerson details from Client command and creates a new ClientNonPerson record
      *
      * @param client
      * @param command
@@ -680,9 +678,8 @@ public class ClientWritePlatformServiceJpaRepositoryImpl implements ClientWriteP
         if (staffId != null) {
             staff = this.staffRepository.findByOfficeHierarchyWithNotFoundDetection(staffId, clientForUpdate.getOffice().getHierarchy());
             /**
-             * TODO Vishwas: We maintain history of chage of loan officer w.r.t
-             * loan in a history table, should we do the same for a client?
-             * Especially useful when the change happens due to a transfer etc
+             * TODO Vishwas: We maintain history of chage of loan officer w.r.t loan in a history table, should we do
+             * the same for a client? Especially useful when the change happens due to a transfer etc
              **/
             clientForUpdate.assignStaff(staff);
         }
@@ -804,8 +801,7 @@ public class ClientWritePlatformServiceJpaRepositoryImpl implements ClientWriteP
     }
 
     /*
-     * To become a part of a group, group may have set of criteria to be m et
-     * before client can become member of it.
+     * To become a part of a group, group may have set of criteria to be m et before client can become member of it.
      */
     private void validateParentGroupRulesBeforeClientActivation(Client client) {
         Integer minNumberOfClients = configurationDomainService.retrieveMinAllowedClientsInGroup();
@@ -813,8 +809,7 @@ public class ClientWritePlatformServiceJpaRepositoryImpl implements ClientWriteP
         if (client.getGroups() != null && maxNumberOfClients != null) {
             for (Group group : client.getGroups()) {
                 /**
-                 * Since this Client has not yet been associated with the group,
-                 * reduce maxNumberOfClients by 1
+                 * Since this Client has not yet been associated with the group, reduce maxNumberOfClients by 1
                  **/
                 final boolean validationsuccess = group.isGroupsClientCountWithinMaxRange(maxNumberOfClients - 1);
                 if (!validationsuccess) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/domain/LoanCollateral.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/domain/LoanCollateral.java
index 3fed35c..a2498e7 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/domain/LoanCollateral.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/domain/LoanCollateral.java
@@ -121,16 +121,13 @@ public class LoanCollateral extends AbstractPersistableCustom {
     }
 
     /*
-     * @Override public boolean equals(final Object obj) { if (obj == null) {
-     * return false; } if (obj == this) { return true; } if (obj.getClass() !=
-     * getClass()) { return false; } final LoanCollateral rhs = (LoanCollateral)
-     * obj; return new EqualsBuilder().appendSuper(super.equals(obj)) //
-     * .append(getId(), rhs.getId()) // .append(this.type.getId(),
-     * rhs.type.getId()) // .append(this.description, rhs.description) //
-     * .append(this.value, this.value)// .isEquals(); }
+     * @Override public boolean equals(final Object obj) { if (obj == null) { return false; } if (obj == this) { return
+     * true; } if (obj.getClass() != getClass()) { return false; } final LoanCollateral rhs = (LoanCollateral) obj;
+     * return new EqualsBuilder().appendSuper(super.equals(obj)) // .append(getId(), rhs.getId()) //
+     * .append(this.type.getId(), rhs.type.getId()) // .append(this.description, rhs.description) // .append(this.value,
+     * this.value)// .isEquals(); }
      *
-     * @Override public int hashCode() { return new HashCodeBuilder(3, 5) //
-     * .append(getId()) // .append(this.type.getId()) //
-     * .append(this.description) // .append(this.value)// .toHashCode(); }
+     * @Override public int hashCode() { return new HashCodeBuilder(3, 5) // .append(getId()) //
+     * .append(this.type.getId()) // .append(this.description) // .append(this.value)// .toHashCode(); }
      */
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/serialization/CollateralCommandFromApiJsonDeserializer.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/serialization/CollateralCommandFromApiJsonDeserializer.java
index b76f4da..160a9aa 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/serialization/CollateralCommandFromApiJsonDeserializer.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/serialization/CollateralCommandFromApiJsonDeserializer.java
@@ -37,8 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
- * Implementation of {@link FromApiJsonDeserializer} for
- * {@link CollateralCommand}'s.
+ * Implementation of {@link FromApiJsonDeserializer} for {@link CollateralCommand}'s.
  */
 @Component
 public final class CollateralCommandFromApiJsonDeserializer extends AbstractFromApiJsonDeserializer<CollateralCommand> {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/service/CollateralWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/service/CollateralWritePlatformServiceJpaRepositoryImpl.java
index 477f3a5..6db49c3 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/service/CollateralWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/service/CollateralWritePlatformServiceJpaRepositoryImpl.java
@@ -86,8 +86,7 @@ public class CollateralWritePlatformServiceJpaRepositoryImpl implements Collater
             final LoanCollateral collateral = LoanCollateral.fromJson(loan, collateralType, command);
 
             /**
-             * Collaterals may be added only when the loan associated with them
-             * are yet to be approved
+             * Collaterals may be added only when the loan associated with them are yet to be approved
              **/
             if (!loan.status().isSubmittedAndPendingApproval()) {
                 throw new CollateralCannotBeCreatedException(
@@ -133,8 +132,7 @@ public class CollateralWritePlatformServiceJpaRepositoryImpl implements Collater
             }
 
             /**
-             * Collaterals may be updated only when the loan associated with
-             * them are yet to be approved
+             * Collaterals may be updated only when the loan associated with them are yet to be approved
              **/
             if (!loan.status().isSubmittedAndPendingApproval()) {
                 throw new CollateralCannotBeUpdatedException(
@@ -167,8 +165,7 @@ public class CollateralWritePlatformServiceJpaRepositoryImpl implements Collater
         }
 
         /**
-         * Collaterals may be deleted only when the loan associated with them
-         * are yet to be approved
+         * Collaterals may be deleted only when the loan associated with them are yet to be approved
          **/
         if (!loan.status().isSubmittedAndPendingApproval()) {
             throw new CollateralCannotBeDeletedException(
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/data/IndividualClientData.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/data/IndividualClientData.java
index 59803c8..1585d84 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/data/IndividualClientData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/data/IndividualClientData.java
@@ -21,8 +21,7 @@ package org.apache.fineract.portfolio.collectionsheet.data;
 import java.util.Collection;
 
 /**
- * Immutable data object for clients with loans due for disbursement or
- * collection.
+ * Immutable data object for clients with loans due for disbursement or collection.
  */
 public final class IndividualClientData {
 
... 5180 lines suppressed ...