From a20d586c840b502e86a3d661a8c4c793c834c8fb Mon Sep 17 00:00:00 2001 From: Aleksandar Vidakovic Date: Sat, 26 Mar 2022 06:55:14 +0100 Subject: [PATCH] FINERACT-1550: Fix repetitive JdbcTemplate/RoutingDataSource injection --- .../GLClosureReadPlatformServiceImpl.java | 5 +-- ...ctivityAccountReadPlatformServiceImpl.java | 5 +-- .../GLAccountReadPlatformServiceImpl.java | 5 +-- ...WritePlatformServiceJpaRepositoryImpl.java | 5 +-- .../service/AccountingProcessorHelper.java | 8 +--- .../JournalEntryReadPlatformServiceImpl.java | 5 +-- ...lEntryRunningBalanceUpdateServiceImpl.java | 5 +-- ...AccountMappingReadPlatformServiceImpl.java | 5 +-- ...sioningEntriesReadPlatformServiceImpl.java | 5 +-- ...AccountingRuleReadPlatformServiceImpl.java | 5 +-- .../service/AdHocReadPlatformServiceImpl.java | 5 +-- .../AdHocScheduledJobRunnerServiceImpl.java | 5 +-- .../service/AuditReadPlatformServiceImpl.java | 5 +-- ...ntNumberFormatReadPlatformServiceImpl.java | 5 +-- .../BulkImportWorkbookServiceImpl.java | 5 +-- .../EmailCampaignReadPlatformServiceImpl.java | 5 +-- ...lConfigurationReadPlatformServiceImpl.java | 5 +-- .../service/EmailReadPlatformServiceImpl.java | 5 +-- .../SmsCampaignReadPlatformServiceImpl.java | 5 +-- .../service/CodeReadPlatformServiceImpl.java | 5 +-- .../CodeValueReadPlatformServiceImpl.java | 5 +-- .../ConfigurationReadPlatformServiceImpl.java | 5 +-- ...icesPropertiesReadPlatformServiceImpl.java | 5 +-- ...ternalServicesReadPlatformServiceImpl.java | 5 +-- .../core/config/JdbcConfig.java | 39 +++++++++++++++++++ .../CreditReportReadPlatformServiceImpl.java | 5 +-- ...ProductMappingReadPlatformServiceImpl.java | 6 +-- ...ditBureauReadConfigurationServiceImpl.java | 5 +-- .../CreditBureauReadPlatformServiceImpl.java | 5 +-- .../CreditReportWritePlatformServiceImpl.java | 6 +-- ...onCreditBureauReadPlatformServiceImpl.java | 5 +-- ...atatableChecksReadPlatformServiceImpl.java | 5 +-- .../service/GenericDataServiceImpl.java | 5 ++- .../service/ReadReportingServiceImpl.java | 8 +--- .../ReadWriteNonCoreDataServiceImpl.java | 12 ++---- .../DocumentReadPlatformServiceImpl.java | 5 +-- .../service/ImageReadPlatformServiceImpl.java | 5 +-- .../FineractEntityAccessReadServiceImpl.java | 5 +-- ...ceRegistrationReadPlatformServiceImpl.java | 5 +-- .../service/HookReadPlatformServiceImpl.java | 5 +-- .../SchedulerJobRunnerReadServiceImpl.java | 5 +-- ...bConfigurationReadPlatformServiceImpl.java | 5 +-- ...portMailingJobReadPlatformServiceImpl.java | 5 +-- ...gJobRunHistoryReadPlatformServiceImpl.java | 5 +-- .../security/utils/ColumnValidator.java | 5 +-- .../service/SmsReadPlatformServiceImpl.java | 5 +-- .../service/PovertyLineServiceImpl.java | 9 +---- .../service/ReadLikelihoodServiceImpl.java | 9 +---- .../survey/service/ReadSurveyServiceImpl.java | 8 +--- .../service/InteropServiceImpl.java | 5 +-- ...axonomyMappingReadPlatformServiceImpl.java | 5 +-- .../MixTaxonomyReadPlatformServiceImpl.java | 5 +-- .../NamespaceReadPlatformServiceImpl.java | 5 +-- .../mix/service/XBRLResultServiceImpl.java | 5 +-- .../NotificationReadPlatformServiceImpl.java | 5 +-- .../service/TopicReadPlatformServiceImpl.java | 5 +-- ...opicSubscriberReadPlatformServiceImpl.java | 5 +-- .../HolidayReadPlatformServiceImpl.java | 5 +-- .../CurrencyReadPlatformServiceImpl.java | 5 +-- .../OfficeReadPlatformServiceImpl.java | 5 +-- ...ioningCategoryReadPlatformServiceImpl.java | 5 +-- ...WritePlatformServiceJpaRepositoryImpl.java | 5 +-- ...ioningCriteriaReadPlatformServiceImpl.java | 5 +-- .../service/StaffReadPlatformServiceImpl.java | 5 +-- .../data/CashierTransactionDataValidator.java | 5 +-- ...llerManagementReadPlatformServiceImpl.java | 5 +-- .../WorkingDaysReadPlatformServiceImpl.java | 5 +-- ...ntAssociationsReadPlatformServiceImpl.java | 5 +-- ...countTransfersReadPlatformServiceImpl.java | 5 +-- ...rtfolioAccountReadPlatformServiceImpl.java | 5 +-- ...ructionHistoryReadPlatformServiceImpl.java | 5 +-- ...ingInstructionReadPlatformServiceImpl.java | 5 +-- ...ngInstructionWritePlatformServiceImpl.java | 5 +-- ...sReadPlatformServiceJpaRepositoryImpl.java | 5 +-- .../AddressReadPlatformServiceImpl.java | 5 +-- ...dConfigurationReadPlatformServiceImpl.java | 5 +-- .../CalendarReadPlatformServiceImpl.java | 6 +-- .../ChargeReadPlatformServiceImpl.java | 10 ++--- ...WritePlatformServiceJpaRepositoryImpl.java | 8 +--- .../ClientAddressReadPlatformServiceImpl.java | 5 +-- .../ClientChargeReadPlatformServiceImpl.java | 5 +-- ...tFamilyMembersReadPlatformServiceImpl.java | 5 +-- ...ientIdentifierReadPlatformServiceImpl.java | 5 +-- .../ClientReadPlatformServiceImpl.java | 5 +-- ...entTransactionReadPlatformServiceImpl.java | 5 +-- .../CollateralReadPlatformServiceImpl.java | 5 +-- ...ollectionSheetReadPlatformServiceImpl.java | 22 +++++------ .../FloatingRatesReadPlatformServiceImpl.java | 5 +-- .../service/FundReadPlatformServiceImpl.java | 5 +-- .../CenterReadPlatformServiceImpl.java | 5 +-- .../GroupLevelReadPlatformServiceImpl.java | 5 +-- .../service/GroupReadPlatformServiceImpl.java | 5 +-- .../GroupRolesReadPlatformServiceImpl.java | 5 +-- ...erestRateChartReadPlatformServiceImpl.java | 5 +-- ...tRateChartSlabReadPlatformServiceImpl.java | 5 +-- .../GuarantorReadPlatformServiceImpl.java | 5 +-- ...cheduleHistoryReadPlatformServiceImpl.java | 5 +-- ...cheduleRequestReadPlatformServiceImpl.java | 5 +-- .../BulkLoansReadPlatformServiceImpl.java | 5 +-- ...LIMAccountInfoReadPlatformServiceImpl.java | 5 +-- .../LoanAccrualWritePlatformServiceImpl.java | 8 +--- .../service/LoanArrearsAgingServiceImpl.java | 5 +-- ...anChargePaidByReadPlatformServiceImpl.java | 5 +-- .../LoanChargeReadPlatformServiceImpl.java | 5 +-- .../service/LoanReadPlatformServiceImpl.java | 11 +++--- .../ProductMixReadPlatformServiceImpl.java | 5 +-- .../LoanProductReadPlatformServiceImpl.java | 5 +-- ...ientAttendanceReadPlatformServiceImpl.java | 5 +-- .../MeetingReadPlatformServiceImpl.java | 5 +-- .../service/NoteReadPlatformServiceImpl.java | 5 +-- .../note/starter/NoteAutoConfiguration.java | 6 +-- .../PaymentTypeReadPlatformServiceImpl.java | 5 +-- .../rate/service/RateReadServiceImpl.java | 5 +-- .../domain/SavingsAccountAssembler.java | 5 +-- .../SavingsAccountRepositoryWrapper.java | 5 +-- ...erestRateChartReadPlatformServiceImpl.java | 5 +-- ...oldTransactionReadPlatformServiceImpl.java | 5 +-- ...DepositAccountReadPlatformServiceImpl.java | 5 +-- ...DepositProductReadPlatformServiceImpl.java | 5 +-- .../service/GSIMReadPlatformServiceImpl.java | 5 +-- ...sAccountChargeReadPlatformServiceImpl.java | 5 +-- ...SavingsAccountReadPlatformServiceImpl.java | 5 +-- ...WritePlatformServiceJpaRepositoryImpl.java | 5 +-- ...SavingsProductReadPlatformServiceImpl.java | 5 +-- .../service/SavingsSchedularServiceImpl.java | 5 +-- .../SearchReadPlatformServiceImpl.java | 11 +++--- .../SelfAccountTransferReadServiceImpl.java | 5 +-- ...neficiariesTPTReadPlatformServiceImpl.java | 5 +-- .../AppuserClientMapperReadServiceImpl.java | 5 +-- .../AppuserLoansMapperReadServiceImpl.java | 5 +-- ...AccountMappingReadPlatformServiceImpl.java | 5 +-- ...ceRegistrationReadPlatformServiceImpl.java | 5 +-- .../AppuserSavingsMapperReadServiceImpl.java | 5 +-- ...AccountsMapperReadPlatformServiceImpl.java | 5 +-- ...urchasedSharesReadPlatformServiceImpl.java | 5 +-- ...eAccountChargeReadPlatformServiceImpl.java | 5 +-- ...ccountDividendReadPlatformServiceImpl.java | 5 +-- .../ShareAccountReadPlatformServiceImpl.java | 5 +-- ...roductDividendReadPlatformServiceImpl.java | 5 +-- .../ShareProductReadPlatformServiceImpl.java | 5 +-- .../service/TaxReadPlatformServiceImpl.java | 5 +-- .../ScorecardReadPlatformServiceImpl.java | 5 +-- .../AppUserReadPlatformServiceImpl.java | 5 +-- ...lidationPolicyReadPlatformServiceImpl.java | 5 +-- .../PermissionReadPlatformServiceImpl.java | 5 +-- .../service/RoleReadPlatformServiceImpl.java | 5 +-- .../apache/fineract/TestConfiguration.java | 6 +++ .../MixXbrlTaxonomyStepDefinitions.java | 4 +- .../service/TestDefaultConfiguration.java | 6 +++ .../service/TestOverrideConfiguration.java | 6 +++ 150 files changed, 371 insertions(+), 483 deletions(-) create mode 100644 fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/config/JdbcConfig.java diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/service/GLClosureReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/service/GLClosureReadPlatformServiceImpl.java index 05a39b8b9..2853c51b9 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/service/GLClosureReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/service/GLClosureReadPlatformServiceImpl.java @@ -26,7 +26,6 @@ import java.util.List; import org.apache.fineract.accounting.closure.data.GLClosureData; import org.apache.fineract.accounting.closure.exception.GLClosureNotFoundException; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; @@ -39,8 +38,8 @@ public class GLClosureReadPlatformServiceImpl implements GLClosureReadPlatformSe private final JdbcTemplate jdbcTemplate; @Autowired - public GLClosureReadPlatformServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public GLClosureReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; } private static final class GLClosureMapper implements RowMapper { diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/service/FinancialActivityAccountReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/service/FinancialActivityAccountReadPlatformServiceImpl.java index 8d27d7022..e8893f795 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/service/FinancialActivityAccountReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/service/FinancialActivityAccountReadPlatformServiceImpl.java @@ -29,7 +29,6 @@ import org.apache.fineract.accounting.financialactivityaccount.data.FinancialAct import org.apache.fineract.accounting.financialactivityaccount.exception.FinancialActivityAccountNotFoundException; import org.apache.fineract.accounting.glaccount.data.GLAccountData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; @@ -44,10 +43,10 @@ public class FinancialActivityAccountReadPlatformServiceImpl implements Financia private final AccountingDropdownReadPlatformService accountingDropdownReadPlatformService; @Autowired - public FinancialActivityAccountReadPlatformServiceImpl(final RoutingDataSource dataSource, + public FinancialActivityAccountReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, final AccountingDropdownReadPlatformService accountingDropdownReadPlatformService) { financialActivityAccountMapper = new FinancialActivityAccountMapper(); - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.accountingDropdownReadPlatformService = accountingDropdownReadPlatformService; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/service/GLAccountReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/service/GLAccountReadPlatformServiceImpl.java index 53b3c8a5b..5966455ed 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/service/GLAccountReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/service/GLAccountReadPlatformServiceImpl.java @@ -34,7 +34,6 @@ import org.apache.fineract.accounting.journalentry.data.JournalEntryAssociationP import org.apache.fineract.infrastructure.codes.data.CodeValueData; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; @@ -48,8 +47,8 @@ public class GLAccountReadPlatformServiceImpl implements GLAccountReadPlatformSe private static final String nameDecoratedBaseOnHierarchy = "concat(substring('........................................', 1, ((LENGTH(hierarchy) - LENGTH(REPLACE(hierarchy, '.', '')) - 1) * 4)), name)"; @Autowired - public GLAccountReadPlatformServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public GLAccountReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; } private static final class GLAccountMapper implements RowMapper { 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 a593ea3ef..423914935 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 @@ -44,7 +44,6 @@ import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder; import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -70,12 +69,12 @@ public class GLAccountWritePlatformServiceJpaRepositoryImpl implements GLAccount @Autowired public GLAccountWritePlatformServiceJpaRepositoryImpl(final GLAccountRepository glAccountRepository, final JournalEntryRepository glJournalEntryRepository, final GLAccountCommandFromApiJsonDeserializer fromApiJsonDeserializer, - final CodeValueRepositoryWrapper codeValueRepositoryWrapper, final RoutingDataSource dataSource) { + final CodeValueRepositoryWrapper codeValueRepositoryWrapper, final JdbcTemplate jdbcTemplate) { this.glAccountRepository = glAccountRepository; this.glJournalEntryRepository = glJournalEntryRepository; this.fromApiJsonDeserializer = fromApiJsonDeserializer; this.codeValueRepositoryWrapper = codeValueRepositoryWrapper; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; } @Transactional 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 0c1ce6762..2e59977d5 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 @@ -26,7 +26,6 @@ import java.util.Date; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.sql.DataSource; import org.apache.commons.lang3.StringUtils; import org.apache.fineract.accounting.closure.domain.GLClosure; import org.apache.fineract.accounting.closure.domain.GLClosureRepository; @@ -60,7 +59,6 @@ import org.apache.fineract.accounting.producttoaccountmapping.domain.ProductToGL import org.apache.fineract.accounting.producttoaccountmapping.exception.ProductToGLAccountMappingNotFoundException; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.organisation.monetary.data.CurrencyData; import org.apache.fineract.organisation.office.domain.Office; import org.apache.fineract.organisation.office.domain.OfficeRepositoryWrapper; @@ -104,7 +102,6 @@ public class AccountingProcessorHelper { private final AccountTransfersReadPlatformService accountTransfersReadPlatformService; private final ChargeRepositoryWrapper chargeRepositoryWrapper; private final JdbcTemplate jdbcTemplate; - private final DataSource dataSource; private static final Logger LOG = LoggerFactory.getLogger(AccountingProcessorHelper.class); @Autowired @@ -116,9 +113,8 @@ public class AccountingProcessorHelper { final AccountTransfersReadPlatformService accountTransfersReadPlatformService, final GLAccountRepositoryWrapper accountRepositoryWrapper, final ClientTransactionRepositoryWrapper clientTransactionRepositoryWrapper, - final ChargeRepositoryWrapper chargeRepositoryWrapper, final RoutingDataSource dataSource) { + final ChargeRepositoryWrapper chargeRepositoryWrapper, final JdbcTemplate jdbcTemplate) { this.glJournalEntryRepository = glJournalEntryRepository; - this.dataSource = dataSource; this.accountMappingRepository = accountMappingRepository; this.closureRepository = closureRepository; this.officeRepositoryWrapper = officeRepositoryWrapper; @@ -129,7 +125,7 @@ public class AccountingProcessorHelper { this.accountRepositoryWrapper = accountRepositoryWrapper; this.clientTransactionRepository = clientTransactionRepositoryWrapper; this.chargeRepositoryWrapper = chargeRepositoryWrapper; - this.jdbcTemplate = new JdbcTemplate(this.dataSource); + this.jdbcTemplate = jdbcTemplate; } public LoanDTO populateLoanDtoFromMap(final Map accountingBridgeData, final boolean cashBasedAccountingEnabled, diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryReadPlatformServiceImpl.java index a72e74c8d..2850ed9e1 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryReadPlatformServiceImpl.java @@ -47,7 +47,6 @@ import org.apache.fineract.infrastructure.core.exception.GeneralPlatformDomainRu import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.PaginationHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.SearchParameters; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.security.utils.ColumnValidator; @@ -82,12 +81,12 @@ public class JournalEntryReadPlatformServiceImpl implements JournalEntryReadPlat private final DatabaseSpecificSQLGenerator sqlGenerator; @Autowired - public JournalEntryReadPlatformServiceImpl(final RoutingDataSource dataSource, + public JournalEntryReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, final GLAccountReadPlatformService glAccountReadPlatformService, final ColumnValidator columnValidator, final OfficeReadPlatformService officeReadPlatformService, final FinancialActivityAccountRepositoryWrapper financialActivityAccountRepositoryWrapper, DatabaseSpecificSQLGenerator sqlGenerator, PaginationHelper paginationHelper) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.glAccountReadPlatformService = glAccountReadPlatformService; this.officeReadPlatformService = officeReadPlatformService; this.financialActivityAccountRepositoryWrapper = financialActivityAccountRepositoryWrapper; diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryRunningBalanceUpdateServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryRunningBalanceUpdateServiceImpl.java index 99904ffc7..63a606a4e 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryRunningBalanceUpdateServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryRunningBalanceUpdateServiceImpl.java @@ -38,7 +38,6 @@ import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuild import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.jobs.annotation.CronTarget; import org.apache.fineract.infrastructure.jobs.service.JobName; @@ -68,10 +67,10 @@ public class JournalEntryRunningBalanceUpdateServiceImpl implements JournalEntry private final GLJournalEntryMapper entryMapper = new GLJournalEntryMapper(); @Autowired - public JournalEntryRunningBalanceUpdateServiceImpl(final RoutingDataSource dataSource, + public JournalEntryRunningBalanceUpdateServiceImpl(final JdbcTemplate jdbcTemplate, final OfficeRepositoryWrapper officeRepositoryWrapper, final JournalEntryDataValidator dataValidator, final FromJsonHelper fromApiJsonHelper, DatabaseSpecificSQLGenerator sqlGenerator) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.officeRepositoryWrapper = officeRepositoryWrapper; this.dataValidator = dataValidator; this.fromApiJsonHelper = fromApiJsonHelper; diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingReadPlatformServiceImpl.java index 525701e8e..990ef4d9a 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/producttoaccountmapping/service/ProductToGLAccountMappingReadPlatformServiceImpl.java @@ -37,7 +37,6 @@ import org.apache.fineract.accounting.producttoaccountmapping.data.ChargeToGLAcc import org.apache.fineract.accounting.producttoaccountmapping.data.PaymentTypeToGLAccountMapper; import org.apache.fineract.accounting.producttoaccountmapping.domain.PortfolioProductType; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.portfolio.charge.data.ChargeData; import org.apache.fineract.portfolio.paymenttype.data.PaymentTypeData; import org.springframework.beans.factory.annotation.Autowired; @@ -51,8 +50,8 @@ public class ProductToGLAccountMappingReadPlatformServiceImpl implements Product private final JdbcTemplate jdbcTemplate; @Autowired - public ProductToGLAccountMappingReadPlatformServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public ProductToGLAccountMappingReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; } private static final class ProductToGLAccountMappingMapper implements RowMapper> { diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesReadPlatformServiceImpl.java index 8705fd55f..1b145f21c 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesReadPlatformServiceImpl.java @@ -30,7 +30,6 @@ import org.apache.fineract.accounting.provisioning.data.LoanProductProvisioningE import org.apache.fineract.accounting.provisioning.data.ProvisioningEntryData; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.PaginationHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.SearchParameters; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.slf4j.Logger; @@ -52,9 +51,9 @@ public class ProvisioningEntriesReadPlatformServiceImpl implements ProvisioningE private final DatabaseSpecificSQLGenerator sqlGenerator; @Autowired - public ProvisioningEntriesReadPlatformServiceImpl(final RoutingDataSource dataSource, DatabaseSpecificSQLGenerator sqlGenerator, + public ProvisioningEntriesReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, DatabaseSpecificSQLGenerator sqlGenerator, PaginationHelper paginationHelper) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.loanProductProvisioningEntryDataPaginationHelper = paginationHelper; this.provisioningEntryDataPaginationHelper = paginationHelper; this.sqlGenerator = sqlGenerator; diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/service/AccountingRuleReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/service/AccountingRuleReadPlatformServiceImpl.java index 2d3cd72c9..2a3d66039 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/service/AccountingRuleReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/service/AccountingRuleReadPlatformServiceImpl.java @@ -35,7 +35,6 @@ import org.apache.fineract.accounting.rule.exception.AccountingRuleNotFoundExcep import org.apache.fineract.infrastructure.codes.data.CodeValueData; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataAccessException; import org.springframework.dao.EmptyResultDataAccessException; @@ -51,9 +50,9 @@ public class AccountingRuleReadPlatformServiceImpl implements AccountingRuleRead private final GLAccountReadPlatformService glAccountReadPlatformService; @Autowired - public AccountingRuleReadPlatformServiceImpl(final RoutingDataSource dataSource, + public AccountingRuleReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, final GLAccountReadPlatformService glAccountReadPlatformService) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.glAccountReadPlatformService = glAccountReadPlatformService; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocReadPlatformServiceImpl.java index 99bc58c75..f4f175d98 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocReadPlatformServiceImpl.java @@ -25,7 +25,6 @@ import java.util.Collection; import org.apache.fineract.adhocquery.data.AdHocData; import org.apache.fineract.adhocquery.exception.AdHocNotFoundException; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.EmptyResultDataAccessException; @@ -41,8 +40,8 @@ public class AdHocReadPlatformServiceImpl implements AdHocReadPlatformService { private final AdHocMapper adHocRowMapper; @Autowired - public AdHocReadPlatformServiceImpl(final RoutingDataSource dataSource, DatabaseSpecificSQLGenerator sqlGenerator) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public AdHocReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, DatabaseSpecificSQLGenerator sqlGenerator) { + this.jdbcTemplate = jdbcTemplate; this.sqlGenerator = sqlGenerator; this.adHocRowMapper = new AdHocMapper(sqlGenerator); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocScheduledJobRunnerServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocScheduledJobRunnerServiceImpl.java index 92ec9f71b..e5f62bcc3 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocScheduledJobRunnerServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocScheduledJobRunnerServiceImpl.java @@ -26,7 +26,6 @@ import java.util.Date; import org.apache.fineract.adhocquery.data.AdHocData; import org.apache.fineract.adhocquery.domain.ReportRunFrequency; import org.apache.fineract.infrastructure.core.service.DateUtils; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil; import org.apache.fineract.infrastructure.jobs.annotation.CronTarget; import org.apache.fineract.infrastructure.jobs.service.JobName; @@ -45,8 +44,8 @@ public class AdHocScheduledJobRunnerServiceImpl implements AdHocScheduledJobRunn private final JdbcTemplate jdbcTemplate; @Autowired - public AdHocScheduledJobRunnerServiceImpl(final RoutingDataSource dataSource, final AdHocReadPlatformService adHocReadPlatformService) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public AdHocScheduledJobRunnerServiceImpl(final JdbcTemplate jdbcTemplate, final AdHocReadPlatformService adHocReadPlatformService) { + this.jdbcTemplate = jdbcTemplate; this.adHocReadPlatformService = adHocReadPlatformService; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/commands/service/AuditReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/commands/service/AuditReadPlatformServiceImpl.java index a0b83652c..1d738cd96 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/commands/service/AuditReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/commands/service/AuditReadPlatformServiceImpl.java @@ -42,7 +42,6 @@ import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityEx import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.PaginationHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.infrastructure.security.utils.ColumnValidator; @@ -96,7 +95,7 @@ public class AuditReadPlatformServiceImpl implements AuditReadPlatformService { private final ColumnValidator columnValidator; @Autowired - public AuditReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, + public AuditReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate, final FromJsonHelper fromApiJsonHelper, final AppUserReadPlatformService appUserReadPlatformService, final OfficeReadPlatformService officeReadPlatformService, final ClientReadPlatformService clientReadPlatformService, final LoanProductReadPlatformService loanProductReadPlatformService, final StaffReadPlatformService staffReadPlatformService, @@ -105,7 +104,7 @@ public class AuditReadPlatformServiceImpl implements AuditReadPlatformService { final DepositProductReadPlatformService depositProductReadPlatformService, final ColumnValidator columnValidator, DatabaseSpecificSQLGenerator sqlGenerator, PaginationHelper paginationHelper) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.fromApiJsonHelper = fromApiJsonHelper; this.appUserReadPlatformService = appUserReadPlatformService; this.officeReadPlatformService = officeReadPlatformService; 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 22a887808..6747ff676 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 @@ -33,7 +33,6 @@ import org.apache.fineract.infrastructure.accountnumberformat.domain.EntityAccou import org.apache.fineract.infrastructure.accountnumberformat.exception.AccountNumberFormatNotFoundException; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -53,8 +52,8 @@ public class AccountNumberFormatReadPlatformServiceImpl implements AccountNumber private final AccountNumberFormatMapper accountNumberFormatMapper = new AccountNumberFormatMapper(); @Autowired - public AccountNumberFormatReadPlatformServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public AccountNumberFormatReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; } private static final class AccountNumberFormatMapper implements RowMapper { diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportWorkbookServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportWorkbookServiceImpl.java index 0b8385280..34f41166d 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportWorkbookServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportWorkbookServiceImpl.java @@ -39,7 +39,6 @@ import org.apache.fineract.infrastructure.bulkimport.importhandler.ImportHandler import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.exception.GeneralPlatformDomainRuleException; import org.apache.fineract.infrastructure.core.service.DateUtils; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil; import org.apache.fineract.infrastructure.documentmanagement.data.DocumentData; import org.apache.fineract.infrastructure.documentmanagement.domain.Document; @@ -74,13 +73,13 @@ public class BulkImportWorkbookServiceImpl implements BulkImportWorkbookService @Autowired public BulkImportWorkbookServiceImpl(final ApplicationContext applicationContext, final PlatformSecurityContext securityContext, final DocumentWritePlatformService documentWritePlatformService, final DocumentRepository documentRepository, - final ImportDocumentRepository importDocumentRepository, final RoutingDataSource dataSource) { + final ImportDocumentRepository importDocumentRepository, final JdbcTemplate jdbcTemplate) { this.applicationContext = applicationContext; this.securityContext = securityContext; this.documentWritePlatformService = documentWritePlatformService; this.documentRepository = documentRepository; this.importDocumentRepository = importDocumentRepository; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; } @Override 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 c7ca45de2..984eb3fd4 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 @@ -38,7 +38,6 @@ import org.apache.fineract.infrastructure.campaigns.email.exception.EmailBusines import org.apache.fineract.infrastructure.campaigns.email.exception.EmailCampaignNotFound; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataAccessException; import org.springframework.dao.EmptyResultDataAccessException; @@ -57,8 +56,8 @@ public class EmailCampaignReadPlatformServiceImpl implements EmailCampaignReadPl private final EmailCampaignMapper emailCampaignMapper; @Autowired - public EmailCampaignReadPlatformServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public EmailCampaignReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; this.businessRuleMapper = new BusinessRuleMapper(); this.emailCampaignMapper = new EmailCampaignMapper(); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailConfigurationReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailConfigurationReadPlatformServiceImpl.java index 472f4f3b4..aa45c9b05 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailConfigurationReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailConfigurationReadPlatformServiceImpl.java @@ -24,7 +24,6 @@ import java.util.Collection; import org.apache.fineract.infrastructure.campaigns.email.data.EmailConfigurationData; import org.apache.fineract.infrastructure.campaigns.email.exception.EmailConfigurationNotFoundException; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; @@ -38,8 +37,8 @@ public class EmailConfigurationReadPlatformServiceImpl implements EmailConfigura private final EmailConfigurationRowMapper emailConfigurationRowMapper; @Autowired - public EmailConfigurationReadPlatformServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public EmailConfigurationReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; this.emailConfigurationRowMapper = new EmailConfigurationRowMapper(); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailReadPlatformServiceImpl.java index f16cff55f..cb75555b4 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailReadPlatformServiceImpl.java @@ -34,7 +34,6 @@ import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.PaginationHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.SearchParameters; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.springframework.beans.factory.annotation.Autowired; @@ -52,9 +51,9 @@ public class EmailReadPlatformServiceImpl implements EmailReadPlatformService { private final PaginationHelper paginationHelper; @Autowired - public EmailReadPlatformServiceImpl(final RoutingDataSource dataSource, DatabaseSpecificSQLGenerator sqlGenerator, + public EmailReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, DatabaseSpecificSQLGenerator sqlGenerator, PaginationHelper paginationHelper) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.sqlGenerator = sqlGenerator; this.paginationHelper = paginationHelper; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignReadPlatformServiceImpl.java index 36824faac..5d27b4149 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignReadPlatformServiceImpl.java @@ -40,7 +40,6 @@ import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.PaginationHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.SearchParameters; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.portfolio.calendar.service.CalendarDropdownReadPlatformService; @@ -64,11 +63,11 @@ public class SmsCampaignReadPlatformServiceImpl implements SmsCampaignReadPlatfo private final PaginationHelper paginationHelper; @Autowired - public SmsCampaignReadPlatformServiceImpl(final RoutingDataSource dataSource, + public SmsCampaignReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, SmsCampaignDropdownReadPlatformService smsCampaignDropdownReadPlatformService, final CalendarDropdownReadPlatformService calendarDropdownReadPlatformService, DatabaseSpecificSQLGenerator sqlGenerator, PaginationHelper paginationHelper) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.sqlGenerator = sqlGenerator; this.businessRuleMapper = new BusinessRuleMapper(sqlGenerator); this.smsCampaignDropdownReadPlatformService = smsCampaignDropdownReadPlatformService; diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeReadPlatformServiceImpl.java index dbcd89c5f..02cb26895 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeReadPlatformServiceImpl.java @@ -23,7 +23,6 @@ import java.sql.SQLException; import java.util.Collection; import org.apache.fineract.infrastructure.codes.data.CodeData; import org.apache.fineract.infrastructure.codes.exception.CodeNotFoundException; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; @@ -39,9 +38,9 @@ public class CodeReadPlatformServiceImpl implements CodeReadPlatformService { private final PlatformSecurityContext context; @Autowired - public CodeReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource) { + public CodeReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; } private static final class CodeMapper implements RowMapper { diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeValueReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeValueReadPlatformServiceImpl.java index 9f923d33a..fb7862eff 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeValueReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeValueReadPlatformServiceImpl.java @@ -23,7 +23,6 @@ import java.sql.SQLException; import java.util.Collection; import org.apache.fineract.infrastructure.codes.data.CodeValueData; import org.apache.fineract.infrastructure.codes.exception.CodeValueNotFoundException; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; @@ -39,9 +38,9 @@ public class CodeValueReadPlatformServiceImpl implements CodeValueReadPlatformSe private final PlatformSecurityContext context; @Autowired - public CodeValueReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource) { + public CodeValueReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; } private static final class CodeValueDataMapper implements RowMapper { diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/ConfigurationReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/ConfigurationReadPlatformServiceImpl.java index dd7326ad5..29d933769 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/ConfigurationReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/ConfigurationReadPlatformServiceImpl.java @@ -24,7 +24,6 @@ import java.util.Date; import java.util.List; import org.apache.fineract.infrastructure.configuration.data.GlobalConfigurationData; import org.apache.fineract.infrastructure.configuration.data.GlobalConfigurationPropertyData; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.dataqueries.api.DataTableApiConstant; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.springframework.beans.factory.annotation.Autowired; @@ -40,9 +39,9 @@ public class ConfigurationReadPlatformServiceImpl implements ConfigurationReadPl private final RowMapper rm; @Autowired - public ConfigurationReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource) { + public ConfigurationReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.rm = new GlobalConfigurationRowMapper(); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/ExternalServicesPropertiesReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/ExternalServicesPropertiesReadPlatformServiceImpl.java index c66cda977..77b774dbd 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/ExternalServicesPropertiesReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/ExternalServicesPropertiesReadPlatformServiceImpl.java @@ -26,7 +26,6 @@ import org.apache.fineract.infrastructure.configuration.data.ExternalServicesPro import org.apache.fineract.infrastructure.configuration.data.S3CredentialsData; import org.apache.fineract.infrastructure.configuration.data.SMTPCredentialsData; import org.apache.fineract.infrastructure.configuration.exception.ExternalServiceConfigurationNotFoundException; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.gcm.domain.NotificationConfigurationData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataAccessException; @@ -41,8 +40,8 @@ public class ExternalServicesPropertiesReadPlatformServiceImpl implements Extern private final JdbcTemplate jdbcTemplate; @Autowired - public ExternalServicesPropertiesReadPlatformServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public ExternalServicesPropertiesReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; } private static final class S3CredentialsDataExtractor implements ResultSetExtractor { diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/ExternalServicesReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/ExternalServicesReadPlatformServiceImpl.java index 955ef2a90..aa87d7ce9 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/ExternalServicesReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/ExternalServicesReadPlatformServiceImpl.java @@ -22,7 +22,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import org.apache.fineract.infrastructure.configuration.data.ExternalServicesData; import org.apache.fineract.infrastructure.configuration.exception.ExternalServiceConfigurationNotFoundException; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataAccessException; import org.springframework.jdbc.core.JdbcTemplate; @@ -35,8 +34,8 @@ public class ExternalServicesReadPlatformServiceImpl implements ExternalServices private final JdbcTemplate jdbcTemplate; @Autowired - public ExternalServicesReadPlatformServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public ExternalServicesReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; } @Override diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/config/JdbcConfig.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/config/JdbcConfig.java new file mode 100644 index 000000000..87936e636 --- /dev/null +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/config/JdbcConfig.java @@ -0,0 +1,39 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.fineract.infrastructure.core.config; + +import org.apache.fineract.infrastructure.core.service.RoutingDataSource; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; + +@Configuration +public class JdbcConfig { + + @Bean + public JdbcTemplate jdbcTemplate(RoutingDataSource dataSource) { + return new JdbcTemplate(dataSource); + } + + @Bean + public NamedParameterJdbcTemplate namedParameterJdbcTemplate(RoutingDataSource dataSource) { + return new NamedParameterJdbcTemplate(dataSource); + } +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/data/CreditReportReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/data/CreditReportReadPlatformServiceImpl.java index 7e52c03e3..dfeb20103 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/data/CreditReportReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/data/CreditReportReadPlatformServiceImpl.java @@ -21,7 +21,6 @@ package org.apache.fineract.infrastructure.creditbureau.data; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.creditbureau.service.CreditReportReadPlatformService; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.springframework.beans.factory.annotation.Autowired; @@ -36,9 +35,9 @@ public class CreditReportReadPlatformServiceImpl implements CreditReportReadPlat private final PlatformSecurityContext context; @Autowired - public CreditReportReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource) { + public CreditReportReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; } private static final class CreditReportDataMapper implements RowMapper { diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/CreditBureauLoanProductMappingReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/CreditBureauLoanProductMappingReadPlatformServiceImpl.java index a7b38e497..b7f3deaa3 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/CreditBureauLoanProductMappingReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/CreditBureauLoanProductMappingReadPlatformServiceImpl.java @@ -21,7 +21,6 @@ package org.apache.fineract.infrastructure.creditbureau.service; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.creditbureau.data.CreditBureauLoanProductMappingData; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.springframework.beans.factory.annotation.Autowired; @@ -36,10 +35,9 @@ public class CreditBureauLoanProductMappingReadPlatformServiceImpl implements Cr private final PlatformSecurityContext context; @Autowired - public CreditBureauLoanProductMappingReadPlatformServiceImpl(final PlatformSecurityContext context, - final RoutingDataSource dataSource) { + public CreditBureauLoanProductMappingReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; } private static final class CreditBureauLoanProductMapper implements RowMapper { diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/CreditBureauReadConfigurationServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/CreditBureauReadConfigurationServiceImpl.java index 06fa01591..303ed2d08 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/CreditBureauReadConfigurationServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/CreditBureauReadConfigurationServiceImpl.java @@ -24,7 +24,6 @@ import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.creditbureau.data.CreditBureauConfigurationData; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.springframework.beans.factory.annotation.Autowired; @@ -39,9 +38,9 @@ public class CreditBureauReadConfigurationServiceImpl implements CreditBureauRea private final PlatformSecurityContext context; @Autowired - public CreditBureauReadConfigurationServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource) { + public CreditBureauReadConfigurationServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; } private static final class CbConfigMapper implements RowMapper { diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/CreditBureauReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/CreditBureauReadPlatformServiceImpl.java index 2f33d6e3b..6ba37df24 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/CreditBureauReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/CreditBureauReadPlatformServiceImpl.java @@ -21,7 +21,6 @@ package org.apache.fineract.infrastructure.creditbureau.service; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.creditbureau.data.CreditBureauData; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.springframework.beans.factory.annotation.Autowired; @@ -36,9 +35,9 @@ public class CreditBureauReadPlatformServiceImpl implements CreditBureauReadPlat private final PlatformSecurityContext context; @Autowired - public CreditBureauReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource) { + public CreditBureauReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; } private static final class CBMapper implements RowMapper { diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/CreditReportWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/CreditReportWritePlatformServiceImpl.java index b44c4ff3a..f134d8e18 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/CreditReportWritePlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/CreditReportWritePlatformServiceImpl.java @@ -35,7 +35,6 @@ import org.apache.fineract.infrastructure.core.data.DataValidatorBuilder; import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException; import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException; import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.creditbureau.data.CreditBureauConfigurations; import org.apache.fineract.infrastructure.creditbureau.data.CreditBureauReportData; import org.apache.fineract.infrastructure.creditbureau.domain.CreditBureau; @@ -68,9 +67,8 @@ public class CreditReportWritePlatformServiceImpl implements CreditReportWritePl .resource("creditBureauIntegration"); @Autowired - public CreditReportWritePlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, - final FromJsonHelper fromApiJsonHelper, final TokenRepositoryWrapper tokenRepository, - final CreditBureauConfigurationRepositoryWrapper configDataRepository, + public CreditReportWritePlatformServiceImpl(final PlatformSecurityContext context, final FromJsonHelper fromApiJsonHelper, + final TokenRepositoryWrapper tokenRepository, final CreditBureauConfigurationRepositoryWrapper configDataRepository, final CreditBureauTokenCommandFromApiJsonDeserializer fromApiJsonDeserializer, final CreditBureauLoanProductMappingRepository loanProductMappingRepository, final CreditBureauRepository creditBureauRepository, final CreditReportRepository creditReportRepository, diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/OrganisationCreditBureauReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/OrganisationCreditBureauReadPlatformServiceImpl.java index 2a92d0975..a71313959 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/OrganisationCreditBureauReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/creditbureau/service/OrganisationCreditBureauReadPlatformServiceImpl.java @@ -21,7 +21,6 @@ package org.apache.fineract.infrastructure.creditbureau.service; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.creditbureau.data.OrganisationCreditBureauData; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.springframework.beans.factory.annotation.Autowired; @@ -36,9 +35,9 @@ public class OrganisationCreditBureauReadPlatformServiceImpl implements Organisa private final PlatformSecurityContext context; @Autowired - public OrganisationCreditBureauReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource) { + public OrganisationCreditBureauReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; } private static final class OrganisationCreditBureauMapper implements RowMapper { diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/EntityDatatableChecksReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/EntityDatatableChecksReadPlatformServiceImpl.java index 408b06c50..028520436 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/EntityDatatableChecksReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/EntityDatatableChecksReadPlatformServiceImpl.java @@ -28,7 +28,6 @@ import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.PaginationHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.SearchParameters; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.dataqueries.data.DatatableCheckStatusData; @@ -63,14 +62,14 @@ public class EntityDatatableChecksReadPlatformServiceImpl implements EntityDatat private final PaginationHelper paginationHelper; @Autowired - public EntityDatatableChecksReadPlatformServiceImpl(final RoutingDataSource dataSource, + public EntityDatatableChecksReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, final LoanProductReadPlatformService loanProductReadPlatformService, final SavingsProductReadPlatformService savingsProductReadPlatformService, final EntityDatatableChecksRepository entityDatatableChecksRepository, final ReadWriteNonCoreDataService readWriteNonCoreDataService, DatabaseSpecificSQLGenerator sqlGenerator, PaginationHelper paginationHelper) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.sqlGenerator = sqlGenerator; this.registerDataTableMapper = new RegisterDataTableMapper(); this.entityDataTableChecksMapper = new EntityDataTableChecksMapper(); 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 7a3956a16..253a4eb00 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 @@ -54,8 +54,9 @@ public class GenericDataServiceImpl implements GenericDataService { private static final Logger LOG = LoggerFactory.getLogger(GenericDataServiceImpl.class); @Autowired - public GenericDataServiceImpl(final RoutingDataSource dataSource, DatabaseSpecificSQLGenerator sqlGenerator, - DatabaseTypeResolver databaseTypeResolver, DatabaseIndependentQueryService databaseIndependentQueryService) { + public GenericDataServiceImpl(final RoutingDataSource dataSource, final JdbcTemplate jdbcTemplate, + DatabaseSpecificSQLGenerator sqlGenerator, DatabaseTypeResolver databaseTypeResolver, + DatabaseIndependentQueryService databaseIndependentQueryService) { this.dataSource = dataSource; this.sqlGenerator = sqlGenerator; this.databaseTypeResolver = databaseTypeResolver; 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 ffe624d40..2f974333e 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 @@ -36,11 +36,9 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; -import javax.sql.DataSource; import javax.ws.rs.core.StreamingOutput; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.dataqueries.data.GenericResultsetData; import org.apache.fineract.infrastructure.dataqueries.data.ReportData; import org.apache.fineract.infrastructure.dataqueries.data.ReportParameterData; @@ -65,16 +63,14 @@ public class ReadReportingServiceImpl implements ReadReportingService { private static final Logger LOG = LoggerFactory.getLogger(ReadReportingServiceImpl.class); private final JdbcTemplate jdbcTemplate; - private final DataSource dataSource; private final PlatformSecurityContext context; private final GenericDataService genericDataService; @Autowired - public ReadReportingServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, + public ReadReportingServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate, final GenericDataService genericDataService) { this.context = context; - this.dataSource = dataSource; - this.jdbcTemplate = new JdbcTemplate(this.dataSource); + this.jdbcTemplate = jdbcTemplate; this.genericDataService = genericDataService; } 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 58982f794..f90e3c82e 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 @@ -36,7 +36,6 @@ import java.util.Locale; import java.util.Map; import java.util.Set; import javax.persistence.PersistenceException; -import javax.sql.DataSource; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -55,7 +54,6 @@ import org.apache.fineract.infrastructure.core.exception.PlatformServiceUnavaila import org.apache.fineract.infrastructure.core.serialization.DatatableCommandFromApiJsonDeserializer; import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper; import org.apache.fineract.infrastructure.core.serialization.JsonParserHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.core.service.database.DatabaseTypeResolver; import org.apache.fineract.infrastructure.dataqueries.api.DataTableApiConstant; @@ -107,7 +105,6 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ "mediumblob", "mediumtext", "longblob", "longtext"); private final JdbcTemplate jdbcTemplate; - private final DataSource dataSource; private final DatabaseTypeResolver databaseTypeResolver; private final DatabaseSpecificSQLGenerator sqlGenerator; private final PlatformSecurityContext context; @@ -125,15 +122,14 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ // configurationWriteService; @Autowired(required = true) - public ReadWriteNonCoreDataServiceImpl(final RoutingDataSource dataSource, final PlatformSecurityContext context, - final FromJsonHelper fromJsonHelper, final GenericDataService genericDataService, + public ReadWriteNonCoreDataServiceImpl(final JdbcTemplate jdbcTemplate, final NamedParameterJdbcTemplate namedParameterJdbcTemplate, + final PlatformSecurityContext context, final FromJsonHelper fromJsonHelper, final GenericDataService genericDataService, final DatatableCommandFromApiJsonDeserializer fromApiJsonDeserializer, final CodeReadPlatformService codeReadPlatformService, final ConfigurationDomainService configurationDomainService, final DataTableValidator dataTableValidator, final ColumnValidator columnValidator, DatabaseTypeResolver databaseTypeResolver, DatabaseSpecificSQLGenerator sqlGenerator) { - this.dataSource = dataSource; this.databaseTypeResolver = databaseTypeResolver; this.sqlGenerator = sqlGenerator; - this.jdbcTemplate = new JdbcTemplate(this.dataSource); + this.jdbcTemplate = jdbcTemplate; this.context = context; this.fromJsonHelper = fromJsonHelper; this.helper = new JsonParserHelper(); @@ -144,7 +140,7 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ this.dataTableValidator = dataTableValidator; this.columnValidator = columnValidator; // this.configurationWriteService = configurationWriteService; - this.namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(dataSource); + this.namedParameterJdbcTemplate = namedParameterJdbcTemplate; } @Override diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/service/DocumentReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/service/DocumentReadPlatformServiceImpl.java index cef527be7..c8beb64c5 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/service/DocumentReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/service/DocumentReadPlatformServiceImpl.java @@ -22,7 +22,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.documentmanagement.contentrepository.ContentRepository; import org.apache.fineract.infrastructure.documentmanagement.contentrepository.ContentRepositoryFactory; import org.apache.fineract.infrastructure.documentmanagement.data.DocumentData; @@ -43,10 +42,10 @@ public class DocumentReadPlatformServiceImpl implements DocumentReadPlatformServ private final ContentRepositoryFactory contentRepositoryFactory; @Autowired - public DocumentReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, + public DocumentReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate, final ContentRepositoryFactory documentStoreFactory) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.contentRepositoryFactory = documentStoreFactory; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/service/ImageReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/service/ImageReadPlatformServiceImpl.java index 82c0bf2d2..3f619f4ec 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/service/ImageReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/service/ImageReadPlatformServiceImpl.java @@ -21,7 +21,6 @@ package org.apache.fineract.infrastructure.documentmanagement.service; import java.sql.ResultSet; import java.sql.SQLException; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.documentmanagement.api.ImagesApiResource.EntityTypeForImages; import org.apache.fineract.infrastructure.documentmanagement.contentrepository.ContentRepository; import org.apache.fineract.infrastructure.documentmanagement.contentrepository.ContentRepositoryFactory; @@ -48,10 +47,10 @@ public class ImageReadPlatformServiceImpl implements ImageReadPlatformService { private final StaffRepositoryWrapper staffRepositoryWrapper; @Autowired - public ImageReadPlatformServiceImpl(final RoutingDataSource dataSource, final ContentRepositoryFactory documentStoreFactory, + public ImageReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, final ContentRepositoryFactory documentStoreFactory, final ClientRepositoryWrapper clientRepositoryWrapper, StaffRepositoryWrapper staffRepositoryWrapper) { this.staffRepositoryWrapper = staffRepositoryWrapper; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.contentRepositoryFactory = documentStoreFactory; this.clientRepositoryWrapper = clientRepositoryWrapper; } 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 e720b7176..9b896fa3f 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 @@ -22,7 +22,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; import java.util.Date; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.entityaccess.data.FineractEntityRelationData; import org.apache.fineract.infrastructure.entityaccess.data.FineractEntityToEntityMappingData; import org.apache.fineract.infrastructure.entityaccess.domain.FineractEntityAccessType; @@ -48,10 +47,10 @@ public class FineractEntityAccessReadServiceImpl implements FineractEntityAccess private final FineractEntityRelationRepositoryWrapper fineractEntityRelationRepository; @Autowired - public FineractEntityAccessReadServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, + public FineractEntityAccessReadServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate, final FineractEntityRelationRepositoryWrapper fineractEntityRelationRepository) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.fineractEntityRelationRepository = fineractEntityRelationRepository; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/service/DeviceRegistrationReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/service/DeviceRegistrationReadPlatformServiceImpl.java index ee1e370a2..2140cc084 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/service/DeviceRegistrationReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/service/DeviceRegistrationReadPlatformServiceImpl.java @@ -25,7 +25,6 @@ import java.time.ZoneId; import java.util.Collection; import java.util.Date; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.gcm.domain.DeviceRegistrationData; import org.apache.fineract.infrastructure.gcm.exception.DeviceRegistrationNotFoundException; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; @@ -43,9 +42,9 @@ public class DeviceRegistrationReadPlatformServiceImpl implements DeviceRegistra private final PlatformSecurityContext context; @Autowired - public DeviceRegistrationReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource) { + public DeviceRegistrationReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; } private static final class DeviceRegistrationDataMapper implements RowMapper { diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/service/HookReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/service/HookReadPlatformServiceImpl.java index 1ab259f12..4a3e81d5b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/service/HookReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/service/HookReadPlatformServiceImpl.java @@ -24,7 +24,6 @@ import java.time.LocalDate; import java.util.Collection; import java.util.List; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.hooks.data.Event; import org.apache.fineract.infrastructure.hooks.data.EventResultSetExtractor; import org.apache.fineract.infrastructure.hooks.data.Field; @@ -51,10 +50,10 @@ public class HookReadPlatformServiceImpl implements HookReadPlatformService { @Autowired public HookReadPlatformServiceImpl(final PlatformSecurityContext context, final HookRepository hookRepository, - final RoutingDataSource dataSource) { + final JdbcTemplate jdbcTemplate) { this.context = context; this.hookRepository = hookRepository; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; } @Override diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedulerJobRunnerReadServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedulerJobRunnerReadServiceImpl.java index 6139cbebd..a8f0540f7 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedulerJobRunnerReadServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedulerJobRunnerReadServiceImpl.java @@ -24,7 +24,6 @@ import java.util.Date; import java.util.List; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.PaginationHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.SearchParameters; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.jobs.data.JobDetailData; @@ -50,9 +49,9 @@ public class SchedulerJobRunnerReadServiceImpl implements SchedulerJobRunnerRead private final PaginationHelper paginationHelper; @Autowired - public SchedulerJobRunnerReadServiceImpl(final RoutingDataSource dataSource, final ColumnValidator columnValidator, + public SchedulerJobRunnerReadServiceImpl(final JdbcTemplate jdbcTemplate, final ColumnValidator columnValidator, DatabaseSpecificSQLGenerator sqlGenerator, PaginationHelper paginationHelper) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.columnValidator = columnValidator; this.sqlGenerator = sqlGenerator; this.paginationHelper = paginationHelper; diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobConfigurationReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobConfigurationReadPlatformServiceImpl.java index 39ac75b94..74b91af81 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobConfigurationReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobConfigurationReadPlatformServiceImpl.java @@ -22,7 +22,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.reportmailingjob.data.ReportMailingJobConfigurationData; import org.apache.fineract.infrastructure.reportmailingjob.exception.ReportMailingJobConfigurationNotFoundException; import org.springframework.beans.factory.annotation.Autowired; @@ -40,8 +39,8 @@ public class ReportMailingJobConfigurationReadPlatformServiceImpl implements Rep * ReportMailingJobConfigurationReadPlatformServiceImpl constructor **/ @Autowired - public ReportMailingJobConfigurationReadPlatformServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public ReportMailingJobConfigurationReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; } @Override diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobReadPlatformServiceImpl.java index 518c610b7..1a11c6800 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobReadPlatformServiceImpl.java @@ -29,7 +29,6 @@ import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.PaginationHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.SearchParameters; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.dataqueries.data.ReportData; @@ -54,9 +53,9 @@ public class ReportMailingJobReadPlatformServiceImpl implements ReportMailingJob private final PaginationHelper paginationHelper; @Autowired - public ReportMailingJobReadPlatformServiceImpl(final RoutingDataSource dataSource, final ColumnValidator columnValidator, + public ReportMailingJobReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, final ColumnValidator columnValidator, DatabaseSpecificSQLGenerator sqlGenerator, PaginationHelper paginationHelper) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.columnValidator = columnValidator; this.sqlGenerator = sqlGenerator; this.paginationHelper = paginationHelper; diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobRunHistoryReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobRunHistoryReadPlatformServiceImpl.java index 9f5c65ea2..72bc93fd3 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobRunHistoryReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobRunHistoryReadPlatformServiceImpl.java @@ -26,7 +26,6 @@ import java.util.List; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.PaginationHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.SearchParameters; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.reportmailingjob.data.ReportMailingJobRunHistoryData; @@ -46,9 +45,9 @@ public class ReportMailingJobRunHistoryReadPlatformServiceImpl implements Report private final PaginationHelper paginationHelper; @Autowired - public ReportMailingJobRunHistoryReadPlatformServiceImpl(final RoutingDataSource dataSource, final ColumnValidator columnValidator, + public ReportMailingJobRunHistoryReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, final ColumnValidator columnValidator, DatabaseSpecificSQLGenerator sqlGenerator, PaginationHelper paginationHelper) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.sqlGenerator = sqlGenerator; this.reportMailingJobRunHistoryMapper = new ReportMailingJobRunHistoryMapper(); this.columnValidator = columnValidator; diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/ColumnValidator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/ColumnValidator.java index 18d833a95..f3c63de8b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/ColumnValidator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/ColumnValidator.java @@ -30,7 +30,6 @@ import java.util.List; import java.util.Map; import java.util.Set; import org.apache.commons.lang3.StringUtils; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -45,8 +44,8 @@ public class ColumnValidator { private final JdbcTemplate jdbcTemplate; @Autowired - public ColumnValidator(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public ColumnValidator(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; } private void validateColumn(Map> tableColumnMap) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/service/SmsReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/service/SmsReadPlatformServiceImpl.java index a860fa0e7..22ebdfe46 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/service/SmsReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/service/SmsReadPlatformServiceImpl.java @@ -30,7 +30,6 @@ import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.PaginationHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.SearchParameters; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.security.utils.ColumnValidator; @@ -54,9 +53,9 @@ public class SmsReadPlatformServiceImpl implements SmsReadPlatformService { private final ColumnValidator columnValidator; @Autowired - public SmsReadPlatformServiceImpl(final RoutingDataSource dataSource, final ColumnValidator columnValidator, + public SmsReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, final ColumnValidator columnValidator, DatabaseSpecificSQLGenerator sqlGenerator, PaginationHelper paginationHelper) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.sqlGenerator = sqlGenerator; this.smsRowMapper = new SmsMapper(); this.columnValidator = columnValidator; diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/PovertyLineServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/PovertyLineServiceImpl.java index 12073c31c..73878c437 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/PovertyLineServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/PovertyLineServiceImpl.java @@ -20,8 +20,6 @@ package org.apache.fineract.infrastructure.survey.service; import java.util.ArrayList; import java.util.List; -import javax.sql.DataSource; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.survey.data.LikeliHoodPovertyLineData; import org.apache.fineract.infrastructure.survey.data.PovertyLineData; import org.apache.fineract.infrastructure.survey.data.PpiPovertyLineData; @@ -34,13 +32,10 @@ import org.springframework.stereotype.Service; public class PovertyLineServiceImpl implements PovertyLineService { private final JdbcTemplate jdbcTemplate; - private final DataSource dataSource; @Autowired - PovertyLineServiceImpl(final RoutingDataSource dataSource) { - this.dataSource = dataSource; - this.jdbcTemplate = new JdbcTemplate(this.dataSource); - + PovertyLineServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; } @Override diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/ReadLikelihoodServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/ReadLikelihoodServiceImpl.java index 861e564a1..613491866 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/ReadLikelihoodServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/ReadLikelihoodServiceImpl.java @@ -20,8 +20,6 @@ package org.apache.fineract.infrastructure.survey.service; import java.util.ArrayList; import java.util.List; -import javax.sql.DataSource; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.survey.data.LikelihoodData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; @@ -32,13 +30,10 @@ import org.springframework.stereotype.Service; public class ReadLikelihoodServiceImpl implements ReadLikelihoodService { private final JdbcTemplate jdbcTemplate; - private final DataSource dataSource; @Autowired - ReadLikelihoodServiceImpl(final RoutingDataSource dataSource) { - this.dataSource = dataSource; - this.jdbcTemplate = new JdbcTemplate(this.dataSource); - + ReadLikelihoodServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; } @Override diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/ReadSurveyServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/ReadSurveyServiceImpl.java index ddd7c6657..f6e58f9a8 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/ReadSurveyServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/ReadSurveyServiceImpl.java @@ -22,9 +22,7 @@ import java.time.LocalDate; import java.util.ArrayList; import java.util.Date; import java.util.List; -import javax.sql.DataSource; import org.apache.fineract.infrastructure.core.service.DateUtils; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.dataqueries.api.DataTableApiConstant; import org.apache.fineract.infrastructure.dataqueries.data.DatatableData; import org.apache.fineract.infrastructure.dataqueries.data.GenericResultsetData; @@ -46,17 +44,15 @@ public class ReadSurveyServiceImpl implements ReadSurveyService { private final PlatformSecurityContext context; private final JdbcTemplate jdbcTemplate; - private final DataSource dataSource; private final GenericDataService genericDataService; private final ReadWriteNonCoreDataService readWriteNonCoreDataService; @Autowired - public ReadSurveyServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, + public ReadSurveyServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate, final GenericDataService genericDataService, final ReadWriteNonCoreDataService readWriteNonCoreDataService) { this.context = context; - this.dataSource = dataSource; - this.jdbcTemplate = new JdbcTemplate(this.dataSource); + this.jdbcTemplate = jdbcTemplate; this.genericDataService = genericDataService; this.readWriteNonCoreDataService = readWriteNonCoreDataService; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/interoperation/service/InteropServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/interoperation/service/InteropServiceImpl.java index 55d7bab65..747acb3fa 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/interoperation/service/InteropServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/interoperation/service/InteropServiceImpl.java @@ -49,7 +49,6 @@ import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException; import org.apache.fineract.infrastructure.core.serialization.DefaultToApiJsonSerializer; import org.apache.fineract.infrastructure.core.service.DateUtils; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.interoperation.data.InteropAccountData; @@ -150,7 +149,7 @@ public class InteropServiceImpl implements InteropService { ApplicationCurrencyRepository applicationCurrencyRepository, NoteRepository noteRepository, PaymentTypeRepository paymentTypeRepository, InteropIdentifierRepository identifierRepository, LoanRepository loanRepository, SavingsHelper savingsHelper, SavingsAccountTransactionSummaryWrapper savingsAccountTransactionSummaryWrapper, - SavingsAccountDomainService savingsAccountService, final RoutingDataSource dataSource, + SavingsAccountDomainService savingsAccountService, final JdbcTemplate jdbcTemplate, final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService, final DefaultToApiJsonSerializer toApiJsonSerializer, DatabaseSpecificSQLGenerator sqlGenerator) { this.securityContext = securityContext; @@ -165,7 +164,7 @@ public class InteropServiceImpl implements InteropService { this.savingsHelper = savingsHelper; this.savingsAccountTransactionSummaryWrapper = savingsAccountTransactionSummaryWrapper; this.savingsAccountService = savingsAccountService; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.commandsSourceWritePlatformService = commandsSourceWritePlatformService; this.toApiJsonSerializer = toApiJsonSerializer; this.sqlGenerator = sqlGenerator; diff --git a/fineract-provider/src/main/java/org/apache/fineract/mix/service/MixTaxonomyMappingReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/mix/service/MixTaxonomyMappingReadPlatformServiceImpl.java index 2c47d0988..d1ec5a3e4 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/mix/service/MixTaxonomyMappingReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/mix/service/MixTaxonomyMappingReadPlatformServiceImpl.java @@ -20,7 +20,6 @@ package org.apache.fineract.mix.service; import java.sql.ResultSet; import java.sql.SQLException; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.mix.data.MixTaxonomyMappingData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.EmptyResultDataAccessException; @@ -34,8 +33,8 @@ public class MixTaxonomyMappingReadPlatformServiceImpl implements MixTaxonomyMap private final JdbcTemplate jdbcTemplate; @Autowired - public MixTaxonomyMappingReadPlatformServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public MixTaxonomyMappingReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; } private static final class TaxonomyMappingMapper implements RowMapper { diff --git a/fineract-provider/src/main/java/org/apache/fineract/mix/service/MixTaxonomyReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/mix/service/MixTaxonomyReadPlatformServiceImpl.java index 9f09ba2cd..a8d4fff98 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/mix/service/MixTaxonomyReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/mix/service/MixTaxonomyReadPlatformServiceImpl.java @@ -21,7 +21,6 @@ package org.apache.fineract.mix.service; import java.sql.ResultSet; import java.sql.SQLException; import java.util.List; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.mix.data.MixTaxonomyData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; @@ -35,8 +34,8 @@ public class MixTaxonomyReadPlatformServiceImpl implements MixTaxonomyReadPlatfo private final MixTaxonomyMapper mixTaxonomyMapper; @Autowired - public MixTaxonomyReadPlatformServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public MixTaxonomyReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; this.mixTaxonomyMapper = new MixTaxonomyMapper(); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/mix/service/NamespaceReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/mix/service/NamespaceReadPlatformServiceImpl.java index c2816e4fd..e571bf7b2 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/mix/service/NamespaceReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/mix/service/NamespaceReadPlatformServiceImpl.java @@ -20,7 +20,6 @@ package org.apache.fineract.mix.service; import java.sql.ResultSet; import java.sql.SQLException; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.mix.data.NamespaceData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; @@ -34,8 +33,8 @@ public class NamespaceReadPlatformServiceImpl implements NamespaceReadPlatformSe private final NamespaceMapper namespaceMapper; @Autowired - public NamespaceReadPlatformServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public NamespaceReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; this.namespaceMapper = new NamespaceMapper(); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/mix/service/XBRLResultServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/mix/service/XBRLResultServiceImpl.java index 2abb831bf..1360bd4d5 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/mix/service/XBRLResultServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/mix/service/XBRLResultServiceImpl.java @@ -29,7 +29,6 @@ import java.util.regex.Pattern; import javax.script.ScriptEngine; import javax.script.ScriptEngineManager; import javax.script.ScriptException; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.mix.data.MixTaxonomyData; import org.apache.fineract.mix.data.MixTaxonomyMappingData; import org.apache.fineract.mix.data.XBRLData; @@ -53,11 +52,11 @@ public class XBRLResultServiceImpl implements XBRLResultService { private HashMap accountBalanceMap; @Autowired - public XBRLResultServiceImpl(final RoutingDataSource dataSource, final MixTaxonomyMappingReadPlatformService readTaxonomyMappingService, + public XBRLResultServiceImpl(final JdbcTemplate jdbcTemplate, final MixTaxonomyMappingReadPlatformService readTaxonomyMappingService, final MixTaxonomyReadPlatformService readTaxonomyService) { this.readTaxonomyMappingService = readTaxonomyMappingService; this.readTaxonomyService = readTaxonomyService; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; } @Override diff --git a/fineract-provider/src/main/java/org/apache/fineract/notification/service/NotificationReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/notification/service/NotificationReadPlatformServiceImpl.java index 2d8ad9a5d..a780cb75d 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/notification/service/NotificationReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/notification/service/NotificationReadPlatformServiceImpl.java @@ -24,7 +24,6 @@ import java.util.HashMap; import java.util.List; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.PaginationHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.SearchParameters; import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; @@ -51,9 +50,9 @@ public class NotificationReadPlatformServiceImpl implements NotificationReadPlat private HashMap> tenantNotificationResponseHeaderCache = new HashMap<>(); @Autowired - public NotificationReadPlatformServiceImpl(final RoutingDataSource dataSource, final PlatformSecurityContext context, + public NotificationReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, final PlatformSecurityContext context, final ColumnValidator columnValidator, DatabaseSpecificSQLGenerator sqlGenerator, PaginationHelper paginationHelper) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.context = context; this.columnValidator = columnValidator; this.paginationHelper = paginationHelper; diff --git a/fineract-provider/src/main/java/org/apache/fineract/notification/service/TopicReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/notification/service/TopicReadPlatformServiceImpl.java index b55eb822b..879dfd5bd 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/notification/service/TopicReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/notification/service/TopicReadPlatformServiceImpl.java @@ -21,7 +21,6 @@ package org.apache.fineract.notification.service; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.notification.data.TopicData; import org.apache.fineract.notification.exception.TopicNotFoundException; import org.springframework.beans.factory.annotation.Autowired; @@ -36,8 +35,8 @@ public class TopicReadPlatformServiceImpl implements TopicReadPlatformService { private final JdbcTemplate jdbcTemplate; @Autowired - public TopicReadPlatformServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public TopicReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; } private static final class TopicMapper implements RowMapper { diff --git a/fineract-provider/src/main/java/org/apache/fineract/notification/service/TopicSubscriberReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/notification/service/TopicSubscriberReadPlatformServiceImpl.java index 252d5d472..fa7697180 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/notification/service/TopicSubscriberReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/notification/service/TopicSubscriberReadPlatformServiceImpl.java @@ -23,7 +23,6 @@ import java.sql.SQLException; import java.time.LocalDate; import java.util.Collection; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.notification.data.TopicSubscriberData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; @@ -36,8 +35,8 @@ public class TopicSubscriberReadPlatformServiceImpl implements TopicSubscriberRe private final JdbcTemplate jdbcTemplate; @Autowired - public TopicSubscriberReadPlatformServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public TopicSubscriberReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; } private static final class TopicSubscriberMapper implements RowMapper { diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayReadPlatformServiceImpl.java index 1ee945c55..0a10a8136 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayReadPlatformServiceImpl.java @@ -29,7 +29,6 @@ import java.util.Date; import java.util.List; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.organisation.holiday.data.HolidayData; import org.apache.fineract.organisation.holiday.domain.RescheduleType; @@ -47,9 +46,9 @@ public class HolidayReadPlatformServiceImpl implements HolidayReadPlatformServic private final JdbcTemplate jdbcTemplate; @Autowired - public HolidayReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource) { + public HolidayReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; } private static final class HolidayMapper implements RowMapper { diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/service/CurrencyReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/service/CurrencyReadPlatformServiceImpl.java index 83fbce50b..403ec344c 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/service/CurrencyReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/monetary/service/CurrencyReadPlatformServiceImpl.java @@ -22,7 +22,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.organisation.monetary.data.CurrencyData; import org.springframework.beans.factory.annotation.Autowired; @@ -38,9 +37,9 @@ public class CurrencyReadPlatformServiceImpl implements CurrencyReadPlatformServ private final CurrencyMapper currencyRowMapper; @Autowired - public CurrencyReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource) { + public CurrencyReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.currencyRowMapper = new CurrencyMapper(); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/service/OfficeReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/service/OfficeReadPlatformServiceImpl.java index ef9c09982..41debe000 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/service/OfficeReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/service/OfficeReadPlatformServiceImpl.java @@ -26,7 +26,6 @@ import java.util.ArrayList; import java.util.Collection; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.service.DateUtils; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.SearchParameters; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; @@ -56,12 +55,12 @@ public class OfficeReadPlatformServiceImpl implements OfficeReadPlatformService @Autowired public OfficeReadPlatformServiceImpl(final PlatformSecurityContext context, - final CurrencyReadPlatformService currencyReadPlatformService, final RoutingDataSource dataSource, + final CurrencyReadPlatformService currencyReadPlatformService, final JdbcTemplate jdbcTemplate, final ColumnValidator columnValidator, DatabaseSpecificSQLGenerator sqlGenerator) { this.context = context; this.currencyReadPlatformService = currencyReadPlatformService; this.columnValidator = columnValidator; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.sqlGenerator = sqlGenerator; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCategoryReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCategoryReadPlatformServiceImpl.java index ecc7fa6d4..454d0df27 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCategoryReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCategoryReadPlatformServiceImpl.java @@ -22,7 +22,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.organisation.provisioning.data.ProvisioningCategoryData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; @@ -36,8 +35,8 @@ public class ProvisioningCategoryReadPlatformServiceImpl implements Provisioning private final ProvisioningCategoryRowMapper provisionCategoryRowMapper; @Autowired - public ProvisioningCategoryReadPlatformServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public ProvisioningCategoryReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; this.provisionCategoryRowMapper = new ProvisioningCategoryRowMapper(); } 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 e429a2558..b1b713177 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 @@ -25,7 +25,6 @@ import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder; import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.organisation.provisioning.domain.ProvisioningCategory; import org.apache.fineract.organisation.provisioning.domain.ProvisioningCategoryRepository; import org.apache.fineract.organisation.provisioning.exception.ProvisioningCategoryCannotBeDeletedException; @@ -52,10 +51,10 @@ public class ProvisioningCategoryWritePlatformServiceJpaRepositoryImpl implement @Autowired public ProvisioningCategoryWritePlatformServiceJpaRepositoryImpl(final ProvisioningCategoryRepository provisioningCategoryRepository, - final ProvisioningCategoryDefinitionJsonDeserializer fromApiJsonDeserializer, final RoutingDataSource dataSource) { + final ProvisioningCategoryDefinitionJsonDeserializer fromApiJsonDeserializer, final JdbcTemplate jdbcTemplate) { this.provisioningCategoryRepository = provisioningCategoryRepository; this.fromApiJsonDeserializer = fromApiJsonDeserializer; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; } @Override diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCriteriaReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCriteriaReadPlatformServiceImpl.java index aae16f899..f1388f69a 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCriteriaReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCriteriaReadPlatformServiceImpl.java @@ -26,7 +26,6 @@ import java.util.Collection; import java.util.List; import org.apache.fineract.accounting.glaccount.data.GLAccountData; import org.apache.fineract.accounting.glaccount.service.GLAccountReadPlatformService; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.organisation.provisioning.data.ProvisioningCategoryData; import org.apache.fineract.organisation.provisioning.data.ProvisioningCriteriaData; import org.apache.fineract.organisation.provisioning.data.ProvisioningCriteriaDefinitionData; @@ -49,12 +48,12 @@ public class ProvisioningCriteriaReadPlatformServiceImpl implements Provisioning private final LoanProductReadPlatformService loanProductReaPlatformService; @Autowired - public ProvisioningCriteriaReadPlatformServiceImpl(final RoutingDataSource dataSource, + public ProvisioningCriteriaReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, final ProvisioningCategoryReadPlatformService provisioningCategoryReadPlatformService, final LoanProductReadPlatformService loanProductReadPlatformService, final GLAccountReadPlatformService glAccountReadPlatformService, final LoanProductReadPlatformService loanProductReaPlatformService) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.provisioningCategoryReadPlatformService = provisioningCategoryReadPlatformService; this.loanProductReadPlatformService = loanProductReadPlatformService; this.glAccountReadPlatformService = glAccountReadPlatformService; diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffReadPlatformServiceImpl.java index 2f8b3e78d..ac3da7dbd 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffReadPlatformServiceImpl.java @@ -27,7 +27,6 @@ import java.util.List; import java.util.Map; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.exception.UnrecognizedQueryParamException; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.infrastructure.security.utils.ColumnValidator; import org.apache.fineract.infrastructure.security.utils.SQLBuilder; @@ -52,10 +51,10 @@ public class StaffReadPlatformServiceImpl implements StaffReadPlatformService { private final ColumnValidator columnValidator; @Autowired - public StaffReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, + public StaffReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate, final ColumnValidator columnValidator) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.columnValidator = columnValidator; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/data/CashierTransactionDataValidator.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/data/CashierTransactionDataValidator.java index 3a9c69f1c..5100fd93e 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/data/CashierTransactionDataValidator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/data/CashierTransactionDataValidator.java @@ -25,7 +25,6 @@ import java.time.ZonedDateTime; import java.util.Date; import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.service.DateUtils; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.SearchParameters; import org.apache.fineract.organisation.teller.domain.Cashier; import org.apache.fineract.organisation.teller.domain.Teller; @@ -50,9 +49,9 @@ public class CashierTransactionDataValidator { @Autowired public CashierTransactionDataValidator(final TellerManagementReadPlatformService tellerManagementReadPlatformService, - final RoutingDataSource dataSource) { + final JdbcTemplate jdbcTemplate) { this.tellerManagementReadPlatformService = tellerManagementReadPlatformService; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; } public void validateSettleCashAndCashOutTransactions(final Long cashierId, String currencyCode, final BigDecimal transactionAmount) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerManagementReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerManagementReadPlatformServiceImpl.java index cd04c17f2..a960cf312 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerManagementReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerManagementReadPlatformServiceImpl.java @@ -31,7 +31,6 @@ import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.exception.UnrecognizedQueryParamException; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.PaginationHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.SearchParameters; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; @@ -76,12 +75,12 @@ public class TellerManagementReadPlatformServiceImpl implements TellerManagement private final ColumnValidator columnValidator; @Autowired - public TellerManagementReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, + public TellerManagementReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate, final OfficeReadPlatformService officeReadPlatformService, StaffReadPlatformService staffReadPlatformService, final CurrencyReadPlatformService currencyReadPlatformService, final ColumnValidator columnValidator, DatabaseSpecificSQLGenerator sqlGenerator, PaginationHelper paginationHelper) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.officeReadPlatformService = officeReadPlatformService; this.staffReadPlatformService = staffReadPlatformService; this.currencyReadPlatformService = currencyReadPlatformService; diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/service/WorkingDaysReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/service/WorkingDaysReadPlatformServiceImpl.java index 24800a13b..33dbc84a3 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/service/WorkingDaysReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/service/WorkingDaysReadPlatformServiceImpl.java @@ -24,7 +24,6 @@ import java.util.Arrays; import java.util.Collection; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.organisation.workingdays.data.WorkingDaysData; import org.apache.fineract.organisation.workingdays.domain.RepaymentRescheduleType; import org.apache.fineract.organisation.workingdays.domain.WorkingDaysEnumerations; @@ -41,8 +40,8 @@ public class WorkingDaysReadPlatformServiceImpl implements WorkingDaysReadPlatfo private final JdbcTemplate jdbcTemplate; @Autowired - public WorkingDaysReadPlatformServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public WorkingDaysReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; } private static final class WorkingDaysMapper implements RowMapper { 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 4fbf9b61a..407401b55 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 @@ -24,7 +24,6 @@ import java.util.Collection; import java.util.List; import java.util.Map; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.portfolio.account.data.AccountAssociationsData; import org.apache.fineract.portfolio.account.data.PortfolioAccountData; import org.apache.fineract.portfolio.account.domain.AccountAssociationType; @@ -45,8 +44,8 @@ public class AccountAssociationsReadPlatformServiceImpl implements AccountAssoci private final JdbcTemplate jdbcTemplate; @Autowired - public AccountAssociationsReadPlatformServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public AccountAssociationsReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; } @Override diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountTransfersReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountTransfersReadPlatformServiceImpl.java index 73686e391..63e3a26b5 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountTransfersReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountTransfersReadPlatformServiceImpl.java @@ -33,7 +33,6 @@ import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.PaginationHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.SearchParameters; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.security.utils.ColumnValidator; @@ -73,11 +72,11 @@ public class AccountTransfersReadPlatformServiceImpl implements AccountTransfers private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); @Autowired - public AccountTransfersReadPlatformServiceImpl(final RoutingDataSource dataSource, + public AccountTransfersReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, final ClientReadPlatformService clientReadPlatformService, final OfficeReadPlatformService officeReadPlatformService, final PortfolioAccountReadPlatformService portfolioAccountReadPlatformService, final ColumnValidator columnValidator, DatabaseSpecificSQLGenerator sqlGenerator, PaginationHelper paginationHelper) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.clientReadPlatformService = clientReadPlatformService; this.officeReadPlatformService = officeReadPlatformService; this.portfolioAccountReadPlatformService = portfolioAccountReadPlatformService; 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 8e49c0ee3..d9c633c79 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 @@ -25,7 +25,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.organisation.monetary.data.CurrencyData; import org.apache.fineract.portfolio.account.PortfolioAccountType; @@ -49,8 +48,8 @@ public class PortfolioAccountReadPlatformServiceImpl implements PortfolioAccount private final PortfolioLoanAccountRefundByTransferMapper accountRefundByTransferMapper; @Autowired - public PortfolioAccountReadPlatformServiceImpl(final RoutingDataSource dataSource, DatabaseSpecificSQLGenerator sqlGenerator) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public PortfolioAccountReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, DatabaseSpecificSQLGenerator sqlGenerator) { + this.jdbcTemplate = jdbcTemplate; this.savingsAccountMapper = new PortfolioSavingsAccountMapper(); this.loanAccountMapper = new PortfolioLoanAccountMapper(); this.accountRefundByTransferMapper = new PortfolioLoanAccountRefundByTransferMapper(sqlGenerator); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/StandingInstructionHistoryReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/StandingInstructionHistoryReadPlatformServiceImpl.java index 659f591bd..7c2e8c591 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/StandingInstructionHistoryReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/StandingInstructionHistoryReadPlatformServiceImpl.java @@ -32,7 +32,6 @@ import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.PaginationHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.SearchParameters; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.security.utils.ColumnValidator; @@ -61,9 +60,9 @@ public class StandingInstructionHistoryReadPlatformServiceImpl implements Standi private final PaginationHelper paginationHelper; @Autowired - public StandingInstructionHistoryReadPlatformServiceImpl(final RoutingDataSource dataSource, final ColumnValidator columnValidator, + public StandingInstructionHistoryReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, final ColumnValidator columnValidator, DatabaseSpecificSQLGenerator sqlGenerator, PaginationHelper paginationHelper) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.sqlGenerator = sqlGenerator; this.standingInstructionHistoryMapper = new StandingInstructionHistoryMapper(); this.columnValidator = columnValidator; 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 66b05255e..71fd0ff98 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 @@ -39,7 +39,6 @@ import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.PaginationHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.SearchParameters; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.security.utils.ColumnValidator; @@ -86,12 +85,12 @@ public class StandingInstructionReadPlatformServiceImpl implements StandingInstr private final PaginationHelper paginationHelper; @Autowired - public StandingInstructionReadPlatformServiceImpl(final RoutingDataSource dataSource, + public StandingInstructionReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, final ClientReadPlatformService clientReadPlatformService, final OfficeReadPlatformService officeReadPlatformService, final PortfolioAccountReadPlatformService portfolioAccountReadPlatformService, final DropdownReadPlatformService dropdownReadPlatformService, final ColumnValidator columnValidator, DatabaseSpecificSQLGenerator sqlGenerator, PaginationHelper paginationHelper) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.clientReadPlatformService = clientReadPlatformService; this.officeReadPlatformService = officeReadPlatformService; this.portfolioAccountReadPlatformService = portfolioAccountReadPlatformService; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/StandingInstructionWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/StandingInstructionWritePlatformServiceImpl.java index 255a14411..0cb92eeb2 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/StandingInstructionWritePlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/StandingInstructionWritePlatformServiceImpl.java @@ -39,7 +39,6 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformService import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException; import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException; import org.apache.fineract.infrastructure.core.service.DateUtils; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.jobs.annotation.CronTarget; import org.apache.fineract.infrastructure.jobs.exception.JobExecutionException; @@ -94,7 +93,7 @@ public class StandingInstructionWritePlatformServiceImpl implements StandingInst final AccountTransferDetailRepository accountTransferDetailRepository, final StandingInstructionRepository standingInstructionRepository, final StandingInstructionReadPlatformService standingInstructionReadPlatformService, - final AccountTransfersWritePlatformService accountTransfersWritePlatformService, final RoutingDataSource dataSource, + final AccountTransfersWritePlatformService accountTransfersWritePlatformService, final JdbcTemplate jdbcTemplate, DatabaseSpecificSQLGenerator sqlGenerator) { this.standingInstructionDataValidator = standingInstructionDataValidator; this.standingInstructionAssembler = standingInstructionAssembler; @@ -102,7 +101,7 @@ public class StandingInstructionWritePlatformServiceImpl implements StandingInst this.standingInstructionRepository = standingInstructionRepository; this.standingInstructionReadPlatformService = standingInstructionReadPlatformService; this.accountTransfersWritePlatformService = accountTransfersWritePlatformService; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.sqlGenerator = sqlGenerator; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/service/AccountDetailsReadPlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/service/AccountDetailsReadPlatformServiceJpaRepositoryImpl.java index 4cad313a4..dc25af81d 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/service/AccountDetailsReadPlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/service/AccountDetailsReadPlatformServiceJpaRepositoryImpl.java @@ -26,7 +26,6 @@ import java.util.Collection; import java.util.List; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.utils.ColumnValidator; import org.apache.fineract.organisation.monetary.data.CurrencyData; import org.apache.fineract.portfolio.accountdetails.data.AccountSummaryCollectionData; @@ -61,10 +60,10 @@ public class AccountDetailsReadPlatformServiceJpaRepositoryImpl implements Accou @Autowired public AccountDetailsReadPlatformServiceJpaRepositoryImpl(final ClientReadPlatformService clientReadPlatformService, - final RoutingDataSource dataSource, final GroupReadPlatformService groupReadPlatformService, + final JdbcTemplate jdbcTemplate, final GroupReadPlatformService groupReadPlatformService, final ColumnValidator columnValidator) { this.clientReadPlatformService = clientReadPlatformService; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.groupReadPlatformService = groupReadPlatformService; this.columnValidator = columnValidator; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/service/AddressReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/service/AddressReadPlatformServiceImpl.java index 5448867a6..bfa306594 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/service/AddressReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/service/AddressReadPlatformServiceImpl.java @@ -27,7 +27,6 @@ import java.util.Date; import java.util.List; import org.apache.fineract.infrastructure.codes.data.CodeValueData; import org.apache.fineract.infrastructure.codes.service.CodeValueReadPlatformService; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.portfolio.address.data.AddressData; import org.springframework.beans.factory.annotation.Autowired; @@ -43,10 +42,10 @@ public class AddressReadPlatformServiceImpl implements AddressReadPlatformServic private final CodeValueReadPlatformService readService; @Autowired - public AddressReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, + public AddressReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate, final CodeValueReadPlatformService readService) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.readService = readService; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/service/FieldConfigurationReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/service/FieldConfigurationReadPlatformServiceImpl.java index 47355e5d9..2be0911d8 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/service/FieldConfigurationReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/address/service/FieldConfigurationReadPlatformServiceImpl.java @@ -22,7 +22,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; import java.util.List; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.portfolio.address.data.FieldConfigurationData; import org.springframework.beans.factory.annotation.Autowired; @@ -37,9 +36,9 @@ public class FieldConfigurationReadPlatformServiceImpl implements FieldConfigura private final PlatformSecurityContext context; @Autowired - public FieldConfigurationReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource) { + public FieldConfigurationReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; } private static final class FieldMapper implements RowMapper { 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 0f276b622..123ccc345 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 @@ -31,7 +31,6 @@ import org.apache.fineract.infrastructure.configuration.domain.ConfigurationDoma import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.service.DateUtils; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.portfolio.calendar.data.CalendarData; import org.apache.fineract.portfolio.calendar.domain.CalendarEntityType; import org.apache.fineract.portfolio.calendar.domain.CalendarType; @@ -51,9 +50,8 @@ public class CalendarReadPlatformServiceImpl implements CalendarReadPlatformServ private final ConfigurationDomainService configurationDomainService; @Autowired - public CalendarReadPlatformServiceImpl(final RoutingDataSource dataSource, - final ConfigurationDomainService configurationDomainService) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public CalendarReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, final ConfigurationDomainService configurationDomainService) { + this.jdbcTemplate = jdbcTemplate; this.configurationDomainService = configurationDomainService; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/service/ChargeReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/service/ChargeReadPlatformServiceImpl.java index 116987fcd..bcc4b5f4c 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/service/ChargeReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/service/ChargeReadPlatformServiceImpl.java @@ -32,7 +32,6 @@ import org.apache.fineract.infrastructure.configuration.domain.ConfigurationDoma import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.service.DateUtils; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.entityaccess.domain.FineractEntityType; import org.apache.fineract.infrastructure.entityaccess.service.FineractEntityAccessUtil; import org.apache.fineract.organisation.monetary.data.CurrencyData; @@ -73,17 +72,18 @@ public class ChargeReadPlatformServiceImpl implements ChargeReadPlatformService @Autowired public ChargeReadPlatformServiceImpl(final CurrencyReadPlatformService currencyReadPlatformService, - final ChargeDropdownReadPlatformService chargeDropdownReadPlatformService, final RoutingDataSource dataSource, + final ChargeDropdownReadPlatformService chargeDropdownReadPlatformService, final JdbcTemplate jdbcTemplate, final DropdownReadPlatformService dropdownReadPlatformService, final FineractEntityAccessUtil fineractEntityAccessUtil, final AccountingDropdownReadPlatformService accountingDropdownReadPlatformService, - final TaxReadPlatformService taxReadPlatformService, final ConfigurationDomainServiceJpa configurationDomainServiceJpa) { + final TaxReadPlatformService taxReadPlatformService, final ConfigurationDomainServiceJpa configurationDomainServiceJpa, + final NamedParameterJdbcTemplate namedParameterJdbcTemplate) { this.chargeDropdownReadPlatformService = chargeDropdownReadPlatformService; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.currencyReadPlatformService = currencyReadPlatformService; this.dropdownReadPlatformService = dropdownReadPlatformService; this.fineractEntityAccessUtil = fineractEntityAccessUtil; this.accountingDropdownReadPlatformService = accountingDropdownReadPlatformService; - this.namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(dataSource); + this.namedParameterJdbcTemplate = namedParameterJdbcTemplate; this.taxReadPlatformService = taxReadPlatformService; this.configurationDomainServiceJpa = configurationDomainServiceJpa; } 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 ca76143b4..3d8fa48eb 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 @@ -21,7 +21,6 @@ package org.apache.fineract.portfolio.charge.service; import java.util.Collection; import java.util.Map; import javax.persistence.PersistenceException; -import javax.sql.DataSource; import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.fineract.accounting.glaccount.domain.GLAccount; import org.apache.fineract.accounting.glaccount.domain.GLAccountRepositoryWrapper; @@ -29,7 +28,6 @@ import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.data.CommandProcessingResult; import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder; import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.entityaccess.domain.FineractEntityAccessType; import org.apache.fineract.infrastructure.entityaccess.service.FineractEntityAccessUtil; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; @@ -64,7 +62,6 @@ public class ChargeWritePlatformServiceJpaRepositoryImpl implements ChargeWriteP private final PlatformSecurityContext context; private final ChargeDefinitionCommandFromApiJsonDeserializer fromApiJsonDeserializer; private final JdbcTemplate jdbcTemplate; - private final DataSource dataSource; private final ChargeRepository chargeRepository; private final LoanProductRepository loanProductRepository; private final FineractEntityAccessUtil fineractEntityAccessUtil; @@ -75,13 +72,12 @@ public class ChargeWritePlatformServiceJpaRepositoryImpl implements ChargeWriteP @Autowired public ChargeWritePlatformServiceJpaRepositoryImpl(final PlatformSecurityContext context, final ChargeDefinitionCommandFromApiJsonDeserializer fromApiJsonDeserializer, final ChargeRepository chargeRepository, - final LoanProductRepository loanProductRepository, final RoutingDataSource dataSource, + final LoanProductRepository loanProductRepository, final JdbcTemplate jdbcTemplate, final FineractEntityAccessUtil fineractEntityAccessUtil, final GLAccountRepositoryWrapper glAccountRepository, final TaxGroupRepositoryWrapper taxGroupRepository, final PaymentTypeRepositoryWrapper paymentTyperepositoryWrapper) { this.context = context; this.fromApiJsonDeserializer = fromApiJsonDeserializer; - this.dataSource = dataSource; - this.jdbcTemplate = new JdbcTemplate(this.dataSource); + this.jdbcTemplate = jdbcTemplate; this.chargeRepository = chargeRepository; this.loanProductRepository = loanProductRepository; this.fineractEntityAccessUtil = fineractEntityAccessUtil; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientAddressReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientAddressReadPlatformServiceImpl.java index ec127f27e..bec219b14 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientAddressReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientAddressReadPlatformServiceImpl.java @@ -21,7 +21,6 @@ package org.apache.fineract.portfolio.client.service; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.portfolio.address.data.ClientAddressData; import org.springframework.beans.factory.annotation.Autowired; @@ -36,9 +35,9 @@ public class ClientAddressReadPlatformServiceImpl implements ClientAddressReadPl private final PlatformSecurityContext context; @Autowired - public ClientAddressReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource) { + public ClientAddressReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; } private static final class ClientAddrMapper implements RowMapper { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientChargeReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientChargeReadPlatformServiceImpl.java index ecb8bf135..fa11db23a 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientChargeReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientChargeReadPlatformServiceImpl.java @@ -27,7 +27,6 @@ import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.PaginationHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.SearchParameters; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; @@ -53,10 +52,10 @@ public class ClientChargeReadPlatformServiceImpl implements ClientChargeReadPlat private final ClientChargeMapper clientChargeMapper; @Autowired - public ClientChargeReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, + public ClientChargeReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate, DatabaseSpecificSQLGenerator sqlGenerator, PaginationHelper paginationHelper) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.sqlGenerator = sqlGenerator; this.clientChargeMapper = new ClientChargeMapper(); this.paginationHelper = paginationHelper; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientFamilyMembersReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientFamilyMembersReadPlatformServiceImpl.java index 0b9f24ef6..0156bf116 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientFamilyMembersReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientFamilyMembersReadPlatformServiceImpl.java @@ -27,7 +27,6 @@ import java.util.List; import org.apache.fineract.infrastructure.codes.data.CodeValueData; import org.apache.fineract.infrastructure.codes.service.CodeValueReadPlatformService; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.portfolio.client.data.ClientFamilyMembersData; import org.springframework.beans.factory.annotation.Autowired; @@ -43,10 +42,10 @@ public class ClientFamilyMembersReadPlatformServiceImpl implements ClientFamilyM private final CodeValueReadPlatformService codeValueReadPlatformService; @Autowired - public ClientFamilyMembersReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, + public ClientFamilyMembersReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate, final CodeValueReadPlatformService codeValueReadPlatformService) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.codeValueReadPlatformService = codeValueReadPlatformService; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientIdentifierReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientIdentifierReadPlatformServiceImpl.java index 3ed3b92dd..e1047ae6a 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientIdentifierReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientIdentifierReadPlatformServiceImpl.java @@ -23,7 +23,6 @@ import java.sql.SQLException; import java.util.Collection; import org.apache.fineract.infrastructure.codes.data.CodeValueData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.portfolio.client.data.ClientIdentifierData; import org.apache.fineract.portfolio.client.domain.ClientIdentifierStatus; @@ -42,9 +41,9 @@ public class ClientIdentifierReadPlatformServiceImpl implements ClientIdentifier private final PlatformSecurityContext context; @Autowired - public ClientIdentifierReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource) { + public ClientIdentifierReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; } @Override diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientReadPlatformServiceImpl.java index ea2a15bf8..128d47754 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientReadPlatformServiceImpl.java @@ -41,7 +41,6 @@ import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidati import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.PaginationHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.SearchParameters; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.dataqueries.data.DatatableData; @@ -104,7 +103,7 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService private final ClientCollateralManagementRepositoryWrapper clientCollateralManagementRepositoryWrapper; @Autowired - public ClientReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, + public ClientReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate, final OfficeReadPlatformService officeReadPlatformService, final StaffReadPlatformService staffReadPlatformService, final CodeValueReadPlatformService codeValueReadPlatformService, final SavingsProductReadPlatformService savingsProductReadPlatformService, @@ -116,7 +115,7 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService DatabaseSpecificSQLGenerator sqlGenerator, PaginationHelper paginationHelper) { this.context = context; this.officeReadPlatformService = officeReadPlatformService; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.staffReadPlatformService = staffReadPlatformService; this.codeValueReadPlatformService = codeValueReadPlatformService; this.savingsProductReadPlatformService = savingsProductReadPlatformService; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientTransactionReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientTransactionReadPlatformServiceImpl.java index 0cdeb6f50..d1053c22a 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientTransactionReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientTransactionReadPlatformServiceImpl.java @@ -27,7 +27,6 @@ import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.PaginationHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.SearchParameters; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.organisation.monetary.data.CurrencyData; @@ -52,9 +51,9 @@ public class ClientTransactionReadPlatformServiceImpl implements ClientTransacti private final PaginationHelper paginationHelper; @Autowired - public ClientTransactionReadPlatformServiceImpl(final RoutingDataSource dataSource, DatabaseSpecificSQLGenerator sqlGenerator, + public ClientTransactionReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, DatabaseSpecificSQLGenerator sqlGenerator, PaginationHelper paginationHelper) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.sqlGenerator = sqlGenerator; this.clientTransactionMapper = new ClientTransactionMapper(); this.paginationHelper = paginationHelper; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/service/CollateralReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/service/CollateralReadPlatformServiceImpl.java index cf98a6ce5..b47cb2711 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/service/CollateralReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/service/CollateralReadPlatformServiceImpl.java @@ -24,7 +24,6 @@ import java.sql.SQLException; import java.util.List; import org.apache.fineract.infrastructure.codes.data.CodeValueData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.organisation.monetary.data.CurrencyData; import org.apache.fineract.portfolio.collateral.data.CollateralData; @@ -44,10 +43,10 @@ public class CollateralReadPlatformServiceImpl implements CollateralReadPlatform private final LoanRepositoryWrapper loanRepositoryWrapper; @Autowired - public CollateralReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, + public CollateralReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate, final LoanRepositoryWrapper loanRepositoryWrapper) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.loanRepositoryWrapper = loanRepositoryWrapper; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/service/CollectionSheetReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/service/CollectionSheetReadPlatformServiceImpl.java index 93fed5f87..5d6f5a924 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/service/CollectionSheetReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/service/CollectionSheetReadPlatformServiceImpl.java @@ -41,7 +41,6 @@ import org.apache.fineract.infrastructure.configuration.domain.ConfigurationDoma import org.apache.fineract.infrastructure.core.api.JsonQuery; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.organisation.monetary.data.CurrencyData; @@ -85,7 +84,7 @@ import org.springframework.stereotype.Service; public class CollectionSheetReadPlatformServiceImpl implements CollectionSheetReadPlatformService { private final PlatformSecurityContext context; - private final NamedParameterJdbcTemplate namedParameterjdbcTemplate; + private final NamedParameterJdbcTemplate namedParameterJdbcTemplate; private final CenterReadPlatformService centerReadPlatformService; private final GroupReadPlatformService groupReadPlatformService; private final CollectionSheetGenerateCommandFromApiJsonDeserializer collectionSheetGenerateCommandFromApiJsonDeserializer; @@ -100,8 +99,9 @@ public class CollectionSheetReadPlatformServiceImpl implements CollectionSheetRe private final DatabaseSpecificSQLGenerator sqlGenerator; @Autowired - public CollectionSheetReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, - final CenterReadPlatformService centerReadPlatformService, final GroupReadPlatformService groupReadPlatformService, + public CollectionSheetReadPlatformServiceImpl(final PlatformSecurityContext context, + final NamedParameterJdbcTemplate namedParameterJdbcTemplate, final CenterReadPlatformService centerReadPlatformService, + final GroupReadPlatformService groupReadPlatformService, final CollectionSheetGenerateCommandFromApiJsonDeserializer collectionSheetGenerateCommandFromApiJsonDeserializer, final CalendarRepositoryWrapper calendarRepositoryWrapper, final AttendanceDropdownReadPlatformService attendanceDropdownReadPlatformService, @@ -111,7 +111,7 @@ public class CollectionSheetReadPlatformServiceImpl implements CollectionSheetRe final CalendarInstanceRepository calendarInstanceRepository, DatabaseSpecificSQLGenerator sqlGenerator) { this.context = context; this.centerReadPlatformService = centerReadPlatformService; - this.namedParameterjdbcTemplate = new NamedParameterJdbcTemplate(dataSource); + this.namedParameterJdbcTemplate = namedParameterJdbcTemplate; this.collectionSheetGenerateCommandFromApiJsonDeserializer = collectionSheetGenerateCommandFromApiJsonDeserializer; this.groupReadPlatformService = groupReadPlatformService; this.calendarRepositoryWrapper = calendarRepositoryWrapper; @@ -372,14 +372,14 @@ public class CollectionSheetReadPlatformServiceImpl implements CollectionSheetRe .addValue("groupId", group.getId()).addValue("officeHierarchy", officeHierarchy) .addValue("entityTypeId", entityType.getValue()); - final Collection collectionSheetFlatDatas = this.namedParameterjdbcTemplate + final Collection collectionSheetFlatDatas = this.namedParameterJdbcTemplate .query(mapper.collectionSheetSchema(false), namedParameters, mapper); // loan data for collection sheet JLGCollectionSheetData collectionSheetData = buildJLGCollectionSheet(transactionDate, collectionSheetFlatDatas); // mandatory savings data for collection sheet - Collection groupsWithSavingsData = this.namedParameterjdbcTemplate + Collection groupsWithSavingsData = this.namedParameterJdbcTemplate .query(mandatorySavingsExtractor.collectionSheetSchema(false), namedParameters, mandatorySavingsExtractor); // merge savings data into loan data @@ -477,14 +477,14 @@ public class CollectionSheetReadPlatformServiceImpl implements CollectionSheetRe .addValue("centerId", center.getId()).addValue("officeHierarchy", officeHierarchy) .addValue("entityTypeId", CalendarEntityType.CENTERS.getValue()); - final Collection collectionSheetFlatDatas = this.namedParameterjdbcTemplate.query(sql.toString(), + final Collection collectionSheetFlatDatas = this.namedParameterJdbcTemplate.query(sql.toString(), namedParameters, mapper); // loan data for collection sheet JLGCollectionSheetData collectionSheetData = buildJLGCollectionSheet(transactionDate, collectionSheetFlatDatas); // mandatory savings data for collection sheet - Collection groupsWithSavingsData = this.namedParameterjdbcTemplate + Collection groupsWithSavingsData = this.namedParameterJdbcTemplate .query(mandatorySavingsExtractor.collectionSheetSchema(true), namedParameters, mandatorySavingsExtractor); // merge savings data into loan data @@ -709,13 +709,13 @@ public class CollectionSheetReadPlatformServiceImpl implements CollectionSheetRe ((MapSqlParameterSource) namedParameters).addValue("staffId", staffId); } - final Collection collectionSheetFlatDatas = this.namedParameterjdbcTemplate + final Collection collectionSheetFlatDatas = this.namedParameterJdbcTemplate .query(mapper.sqlSchema(), namedParameters, mapper); IndividualMandatorySavingsCollectionsheetExtractor mandatorySavingsExtractor = new IndividualMandatorySavingsCollectionsheetExtractor( checkForOfficeId, checkForStaffId, sqlGenerator); // mandatory savings data for collection sheet - Collection clientData = this.namedParameterjdbcTemplate + Collection clientData = this.namedParameterJdbcTemplate .query(mandatorySavingsExtractor.collectionSheetSchema(), namedParameters, mandatorySavingsExtractor); // merge savings data into loan data diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRatesReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRatesReadPlatformServiceImpl.java index 0d45a4053..1c2eebee4 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRatesReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRatesReadPlatformServiceImpl.java @@ -25,7 +25,6 @@ import java.time.LocalDate; import java.util.Date; import java.util.List; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.portfolio.floatingrates.data.FloatingRateData; import org.apache.fineract.portfolio.floatingrates.data.FloatingRatePeriodData; import org.apache.fineract.portfolio.floatingrates.data.InterestRatePeriodData; @@ -42,8 +41,8 @@ public class FloatingRatesReadPlatformServiceImpl implements FloatingRatesReadPl private final JdbcTemplate jdbcTemplate; @Autowired - public FloatingRatesReadPlatformServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public FloatingRatesReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; } @Override diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/fund/service/FundReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/fund/service/FundReadPlatformServiceImpl.java index 44251bb50..ec3eb85af 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/fund/service/FundReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/fund/service/FundReadPlatformServiceImpl.java @@ -21,7 +21,6 @@ package org.apache.fineract.portfolio.fund.service; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.portfolio.fund.data.FundData; import org.apache.fineract.portfolio.fund.exception.FundNotFoundException; @@ -39,9 +38,9 @@ public class FundReadPlatformServiceImpl implements FundReadPlatformService { private final PlatformSecurityContext context; @Autowired - public FundReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource) { + public FundReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; } private static final class FundMapper implements RowMapper { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/CenterReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/CenterReadPlatformServiceImpl.java index 86448f73a..8ee7c5b78 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/CenterReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/CenterReadPlatformServiceImpl.java @@ -44,7 +44,6 @@ import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidati import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.PaginationHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.SearchParameters; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; @@ -101,7 +100,7 @@ public class CenterReadPlatformServiceImpl implements CenterReadPlatformService private static final Set SUPPORTED_ORDER_BY_VALUES = new HashSet<>(Arrays.asList("id", "name", "officeId", "officeName")); @Autowired - public CenterReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, + public CenterReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate, final ClientReadPlatformService clientReadPlatformService, final OfficeReadPlatformService officeReadPlatformService, final StaffReadPlatformService staffReadPlatformService, final CodeValueReadPlatformService codeValueReadPlatformService, final PaginationParametersDataValidator paginationParametersDataValidator, @@ -109,7 +108,7 @@ public class CenterReadPlatformServiceImpl implements CenterReadPlatformService final ColumnValidator columnValidator, DatabaseSpecificSQLGenerator sqlGenerator, PaginationHelper paginationHelper) { this.context = context; this.clientReadPlatformService = clientReadPlatformService; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.officeReadPlatformService = officeReadPlatformService; this.staffReadPlatformService = staffReadPlatformService; this.codeValueReadPlatformService = codeValueReadPlatformService; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupLevelReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupLevelReadPlatformServiceImpl.java index 10b786a31..e713dce80 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupLevelReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupLevelReadPlatformServiceImpl.java @@ -22,7 +22,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.portfolio.group.data.GroupLevelData; import org.springframework.beans.factory.annotation.Autowired; @@ -37,9 +36,9 @@ public class GroupLevelReadPlatformServiceImpl implements GroupLevelReadPlatform private final JdbcTemplate jdbcTemplate; @Autowired - public GroupLevelReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource) { + public GroupLevelReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; } @Override diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupReadPlatformServiceImpl.java index b991fb0b5..185af0fe9 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupReadPlatformServiceImpl.java @@ -33,7 +33,6 @@ import org.apache.fineract.infrastructure.core.data.PaginationParametersDataVali import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.PaginationHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.SearchParameters; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; @@ -76,13 +75,13 @@ public class GroupReadPlatformServiceImpl implements GroupReadPlatformService { private static final Set supportedOrderByValues = new HashSet<>(Arrays.asList("id", "name", "officeId", "officeName")); @Autowired - public GroupReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, + public GroupReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate, final CenterReadPlatformService centerReadPlatformService, final OfficeReadPlatformService officeReadPlatformService, final StaffReadPlatformService staffReadPlatformService, final CodeValueReadPlatformService codeValueReadPlatformService, final PaginationParametersDataValidator paginationParametersDataValidator, final ColumnValidator columnValidator, DatabaseSpecificSQLGenerator sqlGenerator, PaginationHelper paginationHelper) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.centerReadPlatformService = centerReadPlatformService; this.officeReadPlatformService = officeReadPlatformService; this.staffReadPlatformService = staffReadPlatformService; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupRolesReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupRolesReadPlatformServiceImpl.java index 2e45250fe..24c452bd4 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupRolesReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupRolesReadPlatformServiceImpl.java @@ -23,7 +23,6 @@ import java.sql.SQLException; import java.util.Collection; import org.apache.fineract.infrastructure.codes.data.CodeValueData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.portfolio.group.data.GroupRoleData; import org.apache.fineract.portfolio.group.exception.GroupRoleNotFoundException; @@ -40,9 +39,9 @@ public class GroupRolesReadPlatformServiceImpl implements GroupRolesReadPlatform private final PlatformSecurityContext context; @Autowired - public GroupRolesReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource) { + public GroupRolesReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; } @Override diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartReadPlatformServiceImpl.java index cb845949d..fc8a1fe7c 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartReadPlatformServiceImpl.java @@ -29,7 +29,6 @@ import org.apache.fineract.infrastructure.codes.data.CodeValueData; import org.apache.fineract.infrastructure.codes.service.CodeValueReadPlatformService; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.organisation.monetary.data.CurrencyData; @@ -62,12 +61,12 @@ public class InterestRateChartReadPlatformServiceImpl implements InterestRateCha private final DatabaseSpecificSQLGenerator sqlGenerator; @Autowired - public InterestRateChartReadPlatformServiceImpl(PlatformSecurityContext context, final RoutingDataSource dataSource, + public InterestRateChartReadPlatformServiceImpl(PlatformSecurityContext context, final JdbcTemplate jdbcTemplate, InterestRateChartDropdownReadPlatformService chartDropdownReadPlatformService, final InterestIncentiveDropdownReadPlatformService interestIncentiveDropdownReadPlatformService, final CodeValueReadPlatformService codeValueReadPlatformService, DatabaseSpecificSQLGenerator sqlGenerator) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.chartDropdownReadPlatformService = chartDropdownReadPlatformService; this.interestIncentiveDropdownReadPlatformService = interestIncentiveDropdownReadPlatformService; this.codeValueReadPlatformService = codeValueReadPlatformService; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartSlabReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartSlabReadPlatformServiceImpl.java index f1cfbab37..c9f16bf4c 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartSlabReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartSlabReadPlatformServiceImpl.java @@ -28,7 +28,6 @@ import org.apache.fineract.infrastructure.codes.data.CodeValueData; import org.apache.fineract.infrastructure.codes.service.CodeValueReadPlatformService; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.organisation.monetary.data.CurrencyData; @@ -57,12 +56,12 @@ public class InterestRateChartSlabReadPlatformServiceImpl implements InterestRat private final DatabaseSpecificSQLGenerator sqlGenerator; @Autowired - public InterestRateChartSlabReadPlatformServiceImpl(PlatformSecurityContext context, final RoutingDataSource dataSource, + public InterestRateChartSlabReadPlatformServiceImpl(PlatformSecurityContext context, final JdbcTemplate jdbcTemplate, InterestRateChartDropdownReadPlatformService chartDropdownReadPlatformService, final InterestIncentiveDropdownReadPlatformService interestIncentiveDropdownReadPlatformService, final CodeValueReadPlatformService codeValueReadPlatformService, DatabaseSpecificSQLGenerator sqlGenerator) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.chartDropdownReadPlatformService = chartDropdownReadPlatformService; this.interestIncentiveDropdownReadPlatformService = interestIncentiveDropdownReadPlatformService; this.codeValueReadPlatformService = codeValueReadPlatformService; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorReadPlatformServiceImpl.java index 92e6ac31d..027a0e39d 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorReadPlatformServiceImpl.java @@ -29,7 +29,6 @@ import java.util.List; import org.apache.fineract.infrastructure.codes.data.CodeValueData; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.organisation.staff.data.StaffData; import org.apache.fineract.organisation.staff.service.StaffReadPlatformService; import org.apache.fineract.portfolio.account.data.PortfolioAccountData; @@ -60,9 +59,9 @@ public class GuarantorReadPlatformServiceImpl implements GuarantorReadPlatformSe private final LoanRepositoryWrapper loanRepositoryWrapper; @Autowired - public GuarantorReadPlatformServiceImpl(final RoutingDataSource dataSource, final ClientReadPlatformService clientReadPlatformService, + public GuarantorReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, final ClientReadPlatformService clientReadPlatformService, final StaffReadPlatformService staffReadPlatformService, final LoanRepositoryWrapper loanRepositoryWrapper) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.clientReadPlatformService = clientReadPlatformService; this.staffReadPlatformService = staffReadPlatformService; this.loanRepositoryWrapper = loanRepositoryWrapper; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleHistoryReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleHistoryReadPlatformServiceImpl.java index b613effc7..f4cf49c62 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleHistoryReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleHistoryReadPlatformServiceImpl.java @@ -27,7 +27,6 @@ import java.util.ArrayList; import java.util.Collection; import org.apache.commons.lang3.ObjectUtils; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.organisation.monetary.data.CurrencyData; import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency; @@ -53,9 +52,9 @@ public class LoanScheduleHistoryReadPlatformServiceImpl implements LoanScheduleH private final PlatformSecurityContext context; @Autowired - public LoanScheduleHistoryReadPlatformServiceImpl(final RoutingDataSource dataSource, final PlatformSecurityContext context) { + public LoanScheduleHistoryReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, final PlatformSecurityContext context) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; } @SuppressWarnings("deprecation") diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/service/LoanRescheduleRequestReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/service/LoanRescheduleRequestReadPlatformServiceImpl.java index a585aa47f..aad3a4b69 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/service/LoanRescheduleRequestReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/service/LoanRescheduleRequestReadPlatformServiceImpl.java @@ -29,7 +29,6 @@ import java.util.List; import org.apache.fineract.infrastructure.codes.data.CodeValueData; import org.apache.fineract.infrastructure.codes.service.CodeValueReadPlatformService; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.portfolio.loanaccount.data.LoanTermVariationsData; import org.apache.fineract.portfolio.loanaccount.domain.LoanRepositoryWrapper; import org.apache.fineract.portfolio.loanaccount.rescheduleloan.RescheduleLoansApiConstants; @@ -53,9 +52,9 @@ public class LoanRescheduleRequestReadPlatformServiceImpl implements LoanResched private final CodeValueReadPlatformService codeValueReadPlatformService; @Autowired - public LoanRescheduleRequestReadPlatformServiceImpl(final RoutingDataSource dataSource, LoanRepositoryWrapper loanRepositoryWrapper, + public LoanRescheduleRequestReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, LoanRepositoryWrapper loanRepositoryWrapper, final CodeValueReadPlatformService codeValueReadPlatformService) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.loanRepositoryWrapper = loanRepositoryWrapper; this.codeValueReadPlatformService = codeValueReadPlatformService; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/BulkLoansReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/BulkLoansReadPlatformServiceImpl.java index 90dabd7fa..d9047bf10 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/BulkLoansReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/BulkLoansReadPlatformServiceImpl.java @@ -23,7 +23,6 @@ import java.sql.SQLException; import java.util.Collection; import java.util.List; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.organisation.staff.data.StaffAccountSummaryCollectionData; import org.apache.fineract.portfolio.accountdetails.data.LoanAccountSummaryData; @@ -43,10 +42,10 @@ public class BulkLoansReadPlatformServiceImpl implements BulkLoansReadPlatformSe private final AccountDetailsReadPlatformService accountDetailsReadPlatformService; @Autowired - public BulkLoansReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, + public BulkLoansReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate, final AccountDetailsReadPlatformService accountDetailsReadPlatformService) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.accountDetailsReadPlatformService = accountDetailsReadPlatformService; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/GLIMAccountInfoReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/GLIMAccountInfoReadPlatformServiceImpl.java index cc5e26540..475efeea1 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/GLIMAccountInfoReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/GLIMAccountInfoReadPlatformServiceImpl.java @@ -25,7 +25,6 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.portfolio.accountdetails.data.LoanAccountSummaryData; import org.apache.fineract.portfolio.accountdetails.service.AccountDetailsReadPlatformService; @@ -46,10 +45,10 @@ public class GLIMAccountInfoReadPlatformServiceImpl implements GLIMAccountInfoRe private final AccountDetailsReadPlatformService accountDetailsReadPlatforService; @Autowired - public GLIMAccountInfoReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, + public GLIMAccountInfoReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate, final AccountDetailsReadPlatformService accountDetailsReadPlatforService) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.accountDetailsReadPlatforService = accountDetailsReadPlatforService; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualWritePlatformServiceImpl.java index 8a5bc4430..a8e7bceae 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualWritePlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualWritePlatformServiceImpl.java @@ -30,10 +30,8 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.sql.DataSource; import org.apache.fineract.accounting.journalentry.service.JournalEntryWritePlatformService; import org.apache.fineract.infrastructure.core.service.DateUtils; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.organisation.monetary.domain.ApplicationCurrency; import org.apache.fineract.organisation.monetary.domain.ApplicationCurrencyRepositoryWrapper; @@ -63,7 +61,6 @@ public class LoanAccrualWritePlatformServiceImpl implements LoanAccrualWritePlat private final LoanReadPlatformService loanReadPlatformService; private final LoanChargeReadPlatformService loanChargeReadPlatformService; private final JdbcTemplate jdbcTemplate; - private final DataSource dataSource; private final DatabaseSpecificSQLGenerator sqlGenerator; private final JournalEntryWritePlatformService journalEntryWritePlatformService; private final AppUserRepositoryWrapper userRepository; @@ -71,15 +68,14 @@ public class LoanAccrualWritePlatformServiceImpl implements LoanAccrualWritePlat private final ApplicationCurrencyRepositoryWrapper applicationCurrencyRepository; @Autowired - public LoanAccrualWritePlatformServiceImpl(final RoutingDataSource dataSource, final LoanReadPlatformService loanReadPlatformService, + public LoanAccrualWritePlatformServiceImpl(final JdbcTemplate jdbcTemplate, final LoanReadPlatformService loanReadPlatformService, final JournalEntryWritePlatformService journalEntryWritePlatformService, final LoanChargeReadPlatformService loanChargeReadPlatformService, final AppUserRepositoryWrapper userRepository, final LoanRepositoryWrapper loanRepositoryWrapper, final ApplicationCurrencyRepositoryWrapper applicationCurrencyRepository, DatabaseSpecificSQLGenerator sqlGenerator) { this.loanReadPlatformService = loanReadPlatformService; - this.dataSource = dataSource; this.sqlGenerator = sqlGenerator; - this.jdbcTemplate = new JdbcTemplate(this.dataSource); + this.jdbcTemplate = jdbcTemplate; this.journalEntryWritePlatformService = journalEntryWritePlatformService; this.loanChargeReadPlatformService = loanChargeReadPlatformService; this.userRepository = userRepository; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanArrearsAgingServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanArrearsAgingServiceImpl.java index 189b0699f..3400be8e5 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanArrearsAgingServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanArrearsAgingServiceImpl.java @@ -30,7 +30,6 @@ import java.util.Map; import javax.annotation.PostConstruct; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.service.DateUtils; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.jobs.annotation.CronTarget; @@ -64,9 +63,9 @@ public class LoanArrearsAgingServiceImpl implements LoanArrearsAgingService, Bus private final JdbcTemplate jdbcTemplate; @Autowired - public LoanArrearsAgingServiceImpl(final RoutingDataSource dataSource, final BusinessEventNotifierService businessEventNotifierService, + public LoanArrearsAgingServiceImpl(final JdbcTemplate jdbcTemplate, final BusinessEventNotifierService businessEventNotifierService, DatabaseSpecificSQLGenerator sqlGenerator) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.businessEventNotifierService = businessEventNotifierService; this.sqlGenerator = sqlGenerator; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargePaidByReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargePaidByReadPlatformServiceImpl.java index aee379f0e..5df7b7071 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargePaidByReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargePaidByReadPlatformServiceImpl.java @@ -23,7 +23,6 @@ import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; import java.util.List; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.portfolio.loanaccount.data.LoanChargePaidByData; import org.springframework.beans.factory.annotation.Autowired; @@ -38,9 +37,9 @@ public class LoanChargePaidByReadPlatformServiceImpl implements LoanChargePaidBy private final PlatformSecurityContext context; @Autowired - public LoanChargePaidByReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource) { + public LoanChargePaidByReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeReadPlatformServiceImpl.java index 2f3a6a8a4..c461dba24 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeReadPlatformServiceImpl.java @@ -30,7 +30,6 @@ import java.util.Map; import org.apache.fineract.accounting.glaccount.data.GLAccountData; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.organisation.monetary.data.CurrencyData; import org.apache.fineract.portfolio.charge.data.ChargeData; @@ -57,11 +56,11 @@ public class LoanChargeReadPlatformServiceImpl implements LoanChargeReadPlatform @Autowired public LoanChargeReadPlatformServiceImpl(final PlatformSecurityContext context, - final ChargeDropdownReadPlatformService chargeDropdownReadPlatformService, final RoutingDataSource dataSource, + final ChargeDropdownReadPlatformService chargeDropdownReadPlatformService, final JdbcTemplate jdbcTemplate, final DropdownReadPlatformService dropdownReadPlatformService) { this.context = context; this.chargeDropdownReadPlatformService = chargeDropdownReadPlatformService; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.dropdownReadPlatformService = dropdownReadPlatformService; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java index 2bead6987..ea889b6bf 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java @@ -45,7 +45,6 @@ import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.PaginationHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.SearchParameters; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; @@ -168,9 +167,9 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService { final LoanProductReadPlatformService loanProductReadPlatformService, final ClientReadPlatformService clientReadPlatformService, final GroupReadPlatformService groupReadPlatformService, final LoanDropdownReadPlatformService loanDropdownReadPlatformService, final FundReadPlatformService fundReadPlatformService, final ChargeReadPlatformService chargeReadPlatformService, - final CodeValueReadPlatformService codeValueReadPlatformService, final RoutingDataSource dataSource, - final CalendarReadPlatformService calendarReadPlatformService, final StaffReadPlatformService staffReadPlatformService, - final PaymentTypeReadPlatformService paymentTypeReadPlatformService, + final CodeValueReadPlatformService codeValueReadPlatformService, final JdbcTemplate jdbcTemplate, + final NamedParameterJdbcTemplate namedParameterJdbcTemplate, final CalendarReadPlatformService calendarReadPlatformService, + final StaffReadPlatformService staffReadPlatformService, final PaymentTypeReadPlatformService paymentTypeReadPlatformService, final LoanRepaymentScheduleTransactionProcessorFactory loanRepaymentScheduleTransactionProcessorFactory, final FloatingRatesReadPlatformService floatingRatesReadPlatformService, final LoanUtilService loanUtilService, final ConfigurationDomainService configurationDomainService, @@ -188,8 +187,8 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService { this.codeValueReadPlatformService = codeValueReadPlatformService; this.calendarReadPlatformService = calendarReadPlatformService; this.staffReadPlatformService = staffReadPlatformService; - this.jdbcTemplate = new JdbcTemplate(dataSource); - this.namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; + this.namedParameterJdbcTemplate = namedParameterJdbcTemplate; this.paymentTypeReadPlatformService = paymentTypeReadPlatformService; this.loanRepaymentScheduleTransactionProcessorFactory = loanRepaymentScheduleTransactionProcessorFactory; this.floatingRatesReadPlatformService = floatingRatesReadPlatformService; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/productmix/service/ProductMixReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/productmix/service/ProductMixReadPlatformServiceImpl.java index 84bad8f50..64d65592e 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/productmix/service/ProductMixReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/productmix/service/ProductMixReadPlatformServiceImpl.java @@ -23,7 +23,6 @@ import java.sql.SQLException; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.portfolio.loanproduct.data.LoanProductData; import org.apache.fineract.portfolio.loanproduct.productmix.data.ProductMixData; @@ -44,10 +43,10 @@ public class ProductMixReadPlatformServiceImpl implements ProductMixReadPlatform private final LoanProductReadPlatformService loanProductReadPlatformService; @Autowired - public ProductMixReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, + public ProductMixReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate, final LoanProductReadPlatformService loanProductReadPlatformService) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.loanProductReadPlatformService = loanProductReadPlatformService; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanProductReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanProductReadPlatformServiceImpl.java index f201a9387..783738fd7 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanProductReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanProductReadPlatformServiceImpl.java @@ -28,7 +28,6 @@ import org.apache.fineract.accounting.common.AccountingEnumerations; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.service.DateUtils; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.entityaccess.domain.FineractEntityType; import org.apache.fineract.infrastructure.entityaccess.service.FineractEntityAccessUtil; @@ -64,12 +63,12 @@ public class LoanProductReadPlatformServiceImpl implements LoanProductReadPlatfo @Autowired public LoanProductReadPlatformServiceImpl(final PlatformSecurityContext context, - final ChargeReadPlatformService chargeReadPlatformService, final RoutingDataSource dataSource, + final ChargeReadPlatformService chargeReadPlatformService, final JdbcTemplate jdbcTemplate, final FineractEntityAccessUtil fineractEntityAccessUtil, final RateReadService rateReadService, DatabaseSpecificSQLGenerator sqlGenerator) { this.context = context; this.chargeReadPlatformService = chargeReadPlatformService; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.fineractEntityAccessUtil = fineractEntityAccessUtil; this.rateReadService = rateReadService; this.sqlGenerator = sqlGenerator; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/meeting/attendance/service/ClientAttendanceReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/meeting/attendance/service/ClientAttendanceReadPlatformServiceImpl.java index c8551b8ef..92ae9ac8f 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/meeting/attendance/service/ClientAttendanceReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/meeting/attendance/service/ClientAttendanceReadPlatformServiceImpl.java @@ -22,7 +22,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; import org.apache.fineract.infrastructure.core.data.EnumOptionData; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.portfolio.meeting.attendance.data.ClientAttendanceData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; @@ -35,8 +34,8 @@ public class ClientAttendanceReadPlatformServiceImpl implements ClientAttendance private final JdbcTemplate jdbcTemplate; @Autowired - public ClientAttendanceReadPlatformServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public ClientAttendanceReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; } private static final class ClientAttendanceDataMapper implements RowMapper { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/meeting/service/MeetingReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/meeting/service/MeetingReadPlatformServiceImpl.java index 55a762c22..23e18fefa 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/meeting/service/MeetingReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/meeting/service/MeetingReadPlatformServiceImpl.java @@ -24,7 +24,6 @@ import java.time.LocalDate; import java.util.Collection; import java.util.List; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.portfolio.calendar.service.CalendarUtils; import org.apache.fineract.portfolio.meeting.data.MeetingData; import org.apache.fineract.portfolio.meeting.exception.MeetingNotFoundException; @@ -40,8 +39,8 @@ public class MeetingReadPlatformServiceImpl implements MeetingReadPlatformServic private final JdbcTemplate jdbcTemplate; @Autowired - public MeetingReadPlatformServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public MeetingReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; } private static final class MeetingDataMapper implements RowMapper { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/service/NoteReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/service/NoteReadPlatformServiceImpl.java index 377e5fbc6..15ee735ab 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/service/NoteReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/service/NoteReadPlatformServiceImpl.java @@ -28,7 +28,6 @@ import java.util.List; import org.apache.commons.lang3.StringUtils; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.portfolio.note.data.NoteData; import org.apache.fineract.portfolio.note.domain.NoteType; import org.apache.fineract.portfolio.note.exception.NoteNotFoundException; @@ -40,8 +39,8 @@ public class NoteReadPlatformServiceImpl implements NoteReadPlatformService { private final JdbcTemplate jdbcTemplate; - public NoteReadPlatformServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public NoteReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; } private static final class NoteMapper implements RowMapper { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/starter/NoteAutoConfiguration.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/starter/NoteAutoConfiguration.java index 1bea6c8f4..2da1c9d24 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/starter/NoteAutoConfiguration.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/starter/NoteAutoConfiguration.java @@ -18,7 +18,6 @@ */ package org.apache.fineract.portfolio.note.starter; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.portfolio.client.domain.ClientRepositoryWrapper; import org.apache.fineract.portfolio.group.domain.GroupRepository; import org.apache.fineract.portfolio.loanaccount.domain.LoanRepositoryWrapper; @@ -32,14 +31,15 @@ import org.apache.fineract.portfolio.note.service.NoteWritePlatformServiceJpaRep import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.jdbc.core.JdbcTemplate; @Configuration public class NoteAutoConfiguration { @Bean @ConditionalOnMissingBean - public NoteReadPlatformService noteReadPlatformService(RoutingDataSource routingDataSource) { - return new NoteReadPlatformServiceImpl(routingDataSource); + public NoteReadPlatformService noteReadPlatformService(JdbcTemplate jdbcTemplate) { + return new NoteReadPlatformServiceImpl(jdbcTemplate); } @Bean diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/service/PaymentTypeReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/service/PaymentTypeReadPlatformServiceImpl.java index 42a1f48a5..2cd7db831 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/service/PaymentTypeReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/service/PaymentTypeReadPlatformServiceImpl.java @@ -21,7 +21,6 @@ package org.apache.fineract.portfolio.paymenttype.service; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.portfolio.paymenttype.data.PaymentTypeData; import org.springframework.beans.factory.annotation.Autowired; @@ -36,9 +35,9 @@ public class PaymentTypeReadPlatformServiceImpl implements PaymentTypeReadPlatfo private final PlatformSecurityContext context; @Autowired - public PaymentTypeReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource) { + public PaymentTypeReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; } @Override diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateReadServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateReadServiceImpl.java index 0887c4159..cd65938bc 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateReadServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateReadServiceImpl.java @@ -25,7 +25,6 @@ import java.sql.SQLException; import java.util.Collection; import java.util.List; import org.apache.fineract.infrastructure.core.data.EnumOptionData; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.portfolio.rate.data.RateData; import org.apache.fineract.portfolio.rate.domain.Rate; @@ -47,9 +46,9 @@ public class RateReadServiceImpl implements RateReadService { private final PlatformSecurityContext context; @Autowired - public RateReadServiceImpl(PlatformSecurityContext context, final RoutingDataSource dataSource) { + public RateReadServiceImpl(PlatformSecurityContext context, final JdbcTemplate jdbcTemplate) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; } @Override diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountAssembler.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountAssembler.java index 0e0839861..622823c94 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountAssembler.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountAssembler.java @@ -55,7 +55,6 @@ import org.apache.fineract.infrastructure.core.api.JsonCommand; import org.apache.fineract.infrastructure.core.exception.UnsupportedParameterException; import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper; import org.apache.fineract.infrastructure.core.service.DateUtils; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.organisation.staff.domain.Staff; import org.apache.fineract.organisation.staff.domain.StaffRepositoryWrapper; import org.apache.fineract.portfolio.account.service.AccountTransfersReadPlatformService; @@ -104,7 +103,7 @@ public class SavingsAccountAssembler { final StaffRepositoryWrapper staffRepository, final SavingsProductRepository savingProductRepository, final SavingsAccountRepositoryWrapper savingsAccountRepository, final SavingsAccountChargeAssembler savingsAccountChargeAssembler, final FromJsonHelper fromApiJsonHelper, - final AccountTransfersReadPlatformService accountTransfersReadPlatformService, final RoutingDataSource dataSource, + final AccountTransfersReadPlatformService accountTransfersReadPlatformService, final JdbcTemplate jdbcTemplate, final ConfigurationDomainService configurationDomainService) { this.savingsAccountTransactionSummaryWrapper = savingsAccountTransactionSummaryWrapper; this.clientRepository = clientRepository; @@ -115,7 +114,7 @@ public class SavingsAccountAssembler { this.savingsAccountChargeAssembler = savingsAccountChargeAssembler; this.fromApiJsonHelper = fromApiJsonHelper; savingsHelper = new SavingsHelper(accountTransfersReadPlatformService); - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.configurationDomainService = configurationDomainService; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountRepositoryWrapper.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountRepositoryWrapper.java index 3e635118e..4a988dde3 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountRepositoryWrapper.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountRepositoryWrapper.java @@ -20,7 +20,6 @@ package org.apache.fineract.portfolio.savings.domain; import java.util.Date; import java.util.List; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.portfolio.savings.DepositAccountType; import org.apache.fineract.portfolio.savings.exception.SavingsAccountNotFoundException; import org.springframework.beans.factory.annotation.Autowired; @@ -51,10 +50,10 @@ public class SavingsAccountRepositoryWrapper { @Autowired public SavingsAccountRepositoryWrapper(final SavingsAccountRepository repository, - final SavingsAccountTransactionRepository savingsAccountTransactionRepository, final RoutingDataSource dataSource) { + final SavingsAccountTransactionRepository savingsAccountTransactionRepository, final JdbcTemplate jdbcTemplate) { this.repository = repository; this.savingsAccountTransactionRepository = savingsAccountTransactionRepository; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; } @Transactional(readOnly = true) diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountInterestRateChartReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountInterestRateChartReadPlatformServiceImpl.java index 318f54af9..bf9ba6cd9 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountInterestRateChartReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountInterestRateChartReadPlatformServiceImpl.java @@ -30,7 +30,6 @@ import org.apache.fineract.infrastructure.codes.data.CodeValueData; import org.apache.fineract.infrastructure.codes.service.CodeValueReadPlatformService; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.organisation.monetary.data.CurrencyData; @@ -67,12 +66,12 @@ public class DepositAccountInterestRateChartReadPlatformServiceImpl implements D private final DatabaseSpecificSQLGenerator sqlGenerator; @Autowired - public DepositAccountInterestRateChartReadPlatformServiceImpl(PlatformSecurityContext context, final RoutingDataSource dataSource, + public DepositAccountInterestRateChartReadPlatformServiceImpl(PlatformSecurityContext context, final JdbcTemplate jdbcTemplate, InterestRateChartDropdownReadPlatformService chartDropdownReadPlatformService, final InterestIncentiveDropdownReadPlatformService interestIncentiveDropdownReadPlatformService, final CodeValueReadPlatformService codeValueReadPlatformService, DatabaseSpecificSQLGenerator sqlGenerator) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.chartDropdownReadPlatformService = chartDropdownReadPlatformService; this.interestIncentiveDropdownReadPlatformService = interestIncentiveDropdownReadPlatformService; this.codeValueReadPlatformService = codeValueReadPlatformService; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountOnHoldTransactionReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountOnHoldTransactionReadPlatformServiceImpl.java index dbdf63c43..3ab068f2f 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountOnHoldTransactionReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountOnHoldTransactionReadPlatformServiceImpl.java @@ -28,7 +28,6 @@ import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.PaginationHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.SearchParameters; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.security.utils.ColumnValidator; @@ -48,9 +47,9 @@ public class DepositAccountOnHoldTransactionReadPlatformServiceImpl implements D private final DepositAccountOnHoldTransactionsMapper mapper; @Autowired - public DepositAccountOnHoldTransactionReadPlatformServiceImpl(final RoutingDataSource dataSource, final ColumnValidator columnValidator, + public DepositAccountOnHoldTransactionReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, final ColumnValidator columnValidator, DatabaseSpecificSQLGenerator sqlGenerator, PaginationHelper paginationHelper) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.sqlGenerator = sqlGenerator; this.mapper = new DepositAccountOnHoldTransactionsMapper(); this.columnValidator = columnValidator; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountReadPlatformServiceImpl.java index 4047bb8da..d10129f29 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountReadPlatformServiceImpl.java @@ -36,7 +36,6 @@ import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.PaginationHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.organisation.monetary.data.CurrencyData; @@ -128,7 +127,7 @@ public class DepositAccountReadPlatformServiceImpl implements DepositAccountRead private static final Set supportedOrderByValues = new HashSet<>(Arrays.asList("id", "accountNumbr", "officeId", "officeName")); @Autowired - public DepositAccountReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, + public DepositAccountReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate, final DepositAccountInterestRateChartReadPlatformService chartReadPlatformService, final PaginationParametersDataValidator paginationParametersDataValidator, final ClientReadPlatformService clientReadPlatformService, final GroupReadPlatformService groupReadPlatformService, @@ -142,7 +141,7 @@ public class DepositAccountReadPlatformServiceImpl implements DepositAccountRead PaymentTypeReadPlatformService paymentTypeReadPlatformService, DatabaseSpecificSQLGenerator sqlGenerator, PaginationHelper paginationHelper) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.accountChartReadPlatformService = chartReadPlatformService; this.paginationParametersDataValidator = paginationParametersDataValidator; this.sqlGenerator = sqlGenerator; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositProductReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositProductReadPlatformServiceImpl.java index d542d5532..8dfc3db83 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositProductReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositProductReadPlatformServiceImpl.java @@ -25,7 +25,6 @@ import java.util.Collection; import org.apache.fineract.accounting.common.AccountingEnumerations; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.organisation.monetary.data.CurrencyData; import org.apache.fineract.portfolio.interestratechart.data.InterestRateChartData; @@ -53,10 +52,10 @@ public class DepositProductReadPlatformServiceImpl implements DepositProductRead private final DepositProductLookupMapper depositProductLookupsRowMapper = new DepositProductLookupMapper(); @Autowired - public DepositProductReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, + public DepositProductReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate, final InterestRateChartReadPlatformService chartReadPlatformService) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.chartReadPlatformService = chartReadPlatformService; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/GSIMReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/GSIMReadPlatformServiceImpl.java index 72ea8ae92..b9da1e4f6 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/GSIMReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/GSIMReadPlatformServiceImpl.java @@ -29,7 +29,6 @@ import java.util.Collection; import java.util.List; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.infrastructure.security.utils.ColumnValidator; import org.apache.fineract.organisation.monetary.data.CurrencyData; @@ -55,10 +54,10 @@ public class GSIMReadPlatformServiceImpl implements GSIMReadPlatformService { private final ColumnValidator columnValidator; @Autowired - public GSIMReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, + public GSIMReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate, final ColumnValidator columnValidator) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.columnValidator = columnValidator; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountChargeReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountChargeReadPlatformServiceImpl.java index c921455ab..332467a74 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountChargeReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountChargeReadPlatformServiceImpl.java @@ -30,7 +30,6 @@ import org.apache.fineract.accounting.glaccount.data.GLAccountData; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.service.DateUtils; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.organisation.monetary.data.CurrencyData; import org.apache.fineract.portfolio.charge.data.ChargeData; @@ -62,11 +61,11 @@ public class SavingsAccountChargeReadPlatformServiceImpl implements SavingsAccou @Autowired public SavingsAccountChargeReadPlatformServiceImpl(final PlatformSecurityContext context, - final ChargeDropdownReadPlatformService chargeDropdownReadPlatformService, final RoutingDataSource dataSource, + final ChargeDropdownReadPlatformService chargeDropdownReadPlatformService, final JdbcTemplate jdbcTemplate, final DropdownReadPlatformService dropdownReadPlatformService) { this.context = context; this.chargeDropdownReadPlatformService = chargeDropdownReadPlatformService; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.chargeDueMapper = new SavingsAccountChargeDueMapper(); this.dropdownReadPlatformService = dropdownReadPlatformService; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountReadPlatformServiceImpl.java index 62db2e9de..71e67943b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountReadPlatformServiceImpl.java @@ -38,7 +38,6 @@ import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.PaginationHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.SearchParameters; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.dataqueries.data.DatatableData; @@ -122,7 +121,7 @@ public class SavingsAccountReadPlatformServiceImpl implements SavingsAccountRead private final SavingsAccountAssembler savingAccountAssembler; @Autowired - public SavingsAccountReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, + public SavingsAccountReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate, final ClientReadPlatformService clientReadPlatformService, final GroupReadPlatformService groupReadPlatformService, final SavingsProductReadPlatformService savingProductReadPlatformService, final StaffReadPlatformService staffReadPlatformService, final SavingsDropdownReadPlatformService dropdownReadPlatformService, @@ -131,7 +130,7 @@ public class SavingsAccountReadPlatformServiceImpl implements SavingsAccountRead final SavingsAccountAssembler savingAccountAssembler, PaginationHelper paginationHelper, DatabaseSpecificSQLGenerator sqlGenerator) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.clientReadPlatformService = clientReadPlatformService; this.groupReadPlatformService = groupReadPlatformService; this.savingsProductReadPlatformService = savingProductReadPlatformService; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountWritePlatformServiceJpaRepositoryImpl.java index f64e79bb1..9d920fc2d 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountWritePlatformServiceJpaRepositoryImpl.java @@ -55,7 +55,6 @@ import org.apache.fineract.infrastructure.core.exception.GeneralPlatformDomainRu import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException; import org.apache.fineract.infrastructure.core.exception.PlatformServiceUnavailableException; import org.apache.fineract.infrastructure.core.service.DateUtils; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.dataqueries.data.EntityTables; import org.apache.fineract.infrastructure.dataqueries.data.StatusEnum; import org.apache.fineract.infrastructure.dataqueries.service.EntityDatatableChecksWritePlatformService; @@ -184,7 +183,7 @@ public class SavingsAccountWritePlatformServiceJpaRepositoryImpl implements Savi final EntityDatatableChecksWritePlatformService entityDatatableChecksWritePlatformService, final AppUserRepositoryWrapper appuserRepository, final StandingInstructionRepository standingInstructionRepository, final BusinessEventNotifierService businessEventNotifierService, final GSIMRepositoy gsimRepository, - final RoutingDataSource dataSource, final SavingsAccountInterestPostingService savingsAccountInterestPostingService) { + final JdbcTemplate jdbcTemplate, final SavingsAccountInterestPostingService savingsAccountInterestPostingService) { this.context = context; this.savingAccountRepositoryWrapper = savingAccountRepositoryWrapper; this.savingsAccountTransactionRepository = savingsAccountTransactionRepository; @@ -211,7 +210,7 @@ public class SavingsAccountWritePlatformServiceJpaRepositoryImpl implements Savi this.standingInstructionRepository = standingInstructionRepository; this.businessEventNotifierService = businessEventNotifierService; this.gsimRepository = gsimRepository; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.savingsAccountInterestPostingService = savingsAccountInterestPostingService; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsProductReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsProductReadPlatformServiceImpl.java index 8482c9252..54f052725 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsProductReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsProductReadPlatformServiceImpl.java @@ -25,7 +25,6 @@ import java.util.Collection; import org.apache.fineract.accounting.common.AccountingEnumerations; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.entityaccess.domain.FineractEntityType; import org.apache.fineract.infrastructure.entityaccess.service.FineractEntityAccessUtil; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; @@ -50,10 +49,10 @@ public class SavingsProductReadPlatformServiceImpl implements SavingsProductRead private final FineractEntityAccessUtil fineractEntityAccessUtil; @Autowired - public SavingsProductReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, + public SavingsProductReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate, final FineractEntityAccessUtil fineractEntityAccessUtil) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.fineractEntityAccessUtil = fineractEntityAccessUtil; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsSchedularServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsSchedularServiceImpl.java index 6793ad69f..915369fb2 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsSchedularServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsSchedularServiceImpl.java @@ -36,7 +36,6 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.fineract.infrastructure.configuration.domain.ConfigurationDomainService; import org.apache.fineract.infrastructure.core.domain.FineractPlatformTenant; import org.apache.fineract.infrastructure.core.service.DateUtils; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil; import org.apache.fineract.infrastructure.jobs.annotation.CronTarget; import org.apache.fineract.infrastructure.jobs.exception.JobExecutionException; @@ -73,7 +72,7 @@ public class SavingsSchedularServiceImpl implements SavingsSchedularService { final SavingsAccountWritePlatformService savingsAccountWritePlatformService, final SavingsAccountReadPlatformService savingAccountReadPlatformService, final SavingsAccountRepositoryWrapper savingsAccountRepository, final ApplicationContext applicationContext, - final ConfigurationDomainService configurationDomainService, final RoutingDataSource dataSource, + final ConfigurationDomainService configurationDomainService, final JdbcTemplate jdbcTemplate, final TransactionTemplate transactionTemplate) { this.savingAccountAssembler = savingAccountAssembler; this.savingsAccountWritePlatformService = savingsAccountWritePlatformService; @@ -81,7 +80,7 @@ public class SavingsSchedularServiceImpl implements SavingsSchedularService { this.savingsAccountRepository = savingsAccountRepository; this.applicationContext = applicationContext; this.configurationDomainService = configurationDomainService; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.transactionTemplate = transactionTemplate; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/search/service/SearchReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/search/service/SearchReadPlatformServiceImpl.java index f0bf5b3f4..1a7896c6b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/search/service/SearchReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/search/service/SearchReadPlatformServiceImpl.java @@ -28,7 +28,6 @@ import java.util.Date; import org.apache.commons.lang3.StringUtils; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.organisation.office.data.OfficeData; import org.apache.fineract.organisation.office.service.OfficeReadPlatformService; @@ -54,17 +53,17 @@ import org.springframework.stereotype.Service; @Service public class SearchReadPlatformServiceImpl implements SearchReadPlatformService { - private final NamedParameterJdbcTemplate namedParameterjdbcTemplate; + private final NamedParameterJdbcTemplate namedParameterJdbcTemplate; private final PlatformSecurityContext context; private final LoanProductReadPlatformService loanProductReadPlatformService; private final OfficeReadPlatformService officeReadPlatformService; @Autowired - public SearchReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, + public SearchReadPlatformServiceImpl(final PlatformSecurityContext context, final NamedParameterJdbcTemplate namedParameterJdbcTemplate, final LoanProductReadPlatformService loanProductReadPlatformService, final OfficeReadPlatformService officeReadPlatformService) { this.context = context; - this.namedParameterjdbcTemplate = new NamedParameterJdbcTemplate(dataSource); + this.namedParameterJdbcTemplate = namedParameterJdbcTemplate; this.loanProductReadPlatformService = loanProductReadPlatformService; this.officeReadPlatformService = officeReadPlatformService; } @@ -83,7 +82,7 @@ public class SearchReadPlatformServiceImpl implements SearchReadPlatformService } else { params.addValue("search", "%" + searchConditions.getSearchQuery() + "%"); } - return this.namedParameterjdbcTemplate.query(rm.searchSchema(searchConditions), params, rm); + return this.namedParameterJdbcTemplate.query(rm.searchSchema(searchConditions), params, rm); } private static final class SearchMapper implements RowMapper { @@ -204,7 +203,7 @@ public class SearchReadPlatformServiceImpl implements SearchReadPlatformService final AdHocQuerySearchMapper rm = new AdHocQuerySearchMapper(); final MapSqlParameterSource params = new MapSqlParameterSource(); - return this.namedParameterjdbcTemplate.query(rm.schema(searchConditions, params), params, rm); + return this.namedParameterJdbcTemplate.query(rm.schema(searchConditions, params), params, rm); } private static final class AdHocQuerySearchMapper implements RowMapper { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/service/SelfAccountTransferReadServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/service/SelfAccountTransferReadServiceImpl.java index e0abed9c5..0970f5f27 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/service/SelfAccountTransferReadServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/service/SelfAccountTransferReadServiceImpl.java @@ -21,7 +21,6 @@ package org.apache.fineract.portfolio.self.account.service; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.portfolio.self.account.data.SelfAccountTemplateData; import org.apache.fineract.useradministration.domain.AppUser; import org.springframework.beans.factory.annotation.Autowired; @@ -35,8 +34,8 @@ public class SelfAccountTransferReadServiceImpl implements SelfAccountTransferRe private final JdbcTemplate jdbcTemplate; @Autowired - public SelfAccountTransferReadServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public SelfAccountTransferReadServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; } @Override diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/service/SelfBeneficiariesTPTReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/service/SelfBeneficiariesTPTReadPlatformServiceImpl.java index dc8e44e73..ff1a7c906 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/service/SelfBeneficiariesTPTReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/service/SelfBeneficiariesTPTReadPlatformServiceImpl.java @@ -22,7 +22,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; import org.apache.fineract.infrastructure.core.data.EnumOptionData; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.portfolio.account.PortfolioAccountType; import org.apache.fineract.portfolio.account.service.AccountTransferEnumerations; @@ -43,9 +42,9 @@ public class SelfBeneficiariesTPTReadPlatformServiceImpl implements SelfBenefici private final AccountTemplateMapper accountTemplateMapper; @Autowired - public SelfBeneficiariesTPTReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource) { + public SelfBeneficiariesTPTReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.mapper = new BeneficiaryMapper(); this.accountTemplateMapper = new AccountTemplateMapper(); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/client/service/AppuserClientMapperReadServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/client/service/AppuserClientMapperReadServiceImpl.java index ddf444130..6f53e0697 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/client/service/AppuserClientMapperReadServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/client/service/AppuserClientMapperReadServiceImpl.java @@ -18,7 +18,6 @@ */ package org.apache.fineract.portfolio.self.client.service; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.portfolio.client.exception.ClientNotFoundException; import org.apache.fineract.useradministration.domain.AppUser; @@ -33,8 +32,8 @@ public class AppuserClientMapperReadServiceImpl implements AppuserClientMapperRe private final PlatformSecurityContext context; @Autowired - public AppuserClientMapperReadServiceImpl(final RoutingDataSource dataSource, final PlatformSecurityContext context) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public AppuserClientMapperReadServiceImpl(final JdbcTemplate jdbcTemplate, final PlatformSecurityContext context) { + this.jdbcTemplate = jdbcTemplate; this.context = context; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/loanaccount/service/AppuserLoansMapperReadServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/loanaccount/service/AppuserLoansMapperReadServiceImpl.java index 23dd652f2..997c2cc8e 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/loanaccount/service/AppuserLoansMapperReadServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/loanaccount/service/AppuserLoansMapperReadServiceImpl.java @@ -18,7 +18,6 @@ */ package org.apache.fineract.portfolio.self.loanaccount.service; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; @@ -29,8 +28,8 @@ public class AppuserLoansMapperReadServiceImpl implements AppuserLoansMapperRead private final JdbcTemplate jdbcTemplate; @Autowired - public AppuserLoansMapperReadServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public AppuserLoansMapperReadServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; } @Override diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/pockets/service/PocketAccountMappingReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/pockets/service/PocketAccountMappingReadPlatformServiceImpl.java index 57199bfb7..1f5f6d400 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/pockets/service/PocketAccountMappingReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/pockets/service/PocketAccountMappingReadPlatformServiceImpl.java @@ -21,7 +21,6 @@ package org.apache.fineract.portfolio.self.pockets.service; import java.util.ArrayList; import java.util.Collection; import org.apache.fineract.infrastructure.accountnumberformat.domain.EntityAccountType; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.portfolio.self.pockets.data.PocketAccountMappingData; import org.apache.fineract.portfolio.self.pockets.domain.PocketAccountMapping; @@ -41,10 +40,10 @@ public class PocketAccountMappingReadPlatformServiceImpl implements PocketAccoun private final PocketAccountMappingRepositoryWrapper pocketAccountMappingRepositoryWrapper; @Autowired - public PocketAccountMappingReadPlatformServiceImpl(final RoutingDataSource dataSource, final PlatformSecurityContext context, + public PocketAccountMappingReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, final PlatformSecurityContext context, final PocketRepositoryWrapper pocketRepositoryWrapper, final PocketAccountMappingRepositoryWrapper pocketAccountMappingRepositoryWrapper) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.context = context; this.pocketRepositoryWrapper = pocketRepositoryWrapper; this.pocketAccountMappingRepositoryWrapper = pocketAccountMappingRepositoryWrapper; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/registration/service/SelfServiceRegistrationReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/registration/service/SelfServiceRegistrationReadPlatformServiceImpl.java index 92b288c4c..30655c2a2 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/registration/service/SelfServiceRegistrationReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/registration/service/SelfServiceRegistrationReadPlatformServiceImpl.java @@ -18,7 +18,6 @@ */ package org.apache.fineract.portfolio.self.registration.service; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; @@ -29,8 +28,8 @@ public class SelfServiceRegistrationReadPlatformServiceImpl implements SelfServi private final JdbcTemplate jdbcTemplate; @Autowired - public SelfServiceRegistrationReadPlatformServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public SelfServiceRegistrationReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; } @Override diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/savings/service/AppuserSavingsMapperReadServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/savings/service/AppuserSavingsMapperReadServiceImpl.java index 999002092..01e9e0f24 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/savings/service/AppuserSavingsMapperReadServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/savings/service/AppuserSavingsMapperReadServiceImpl.java @@ -18,7 +18,6 @@ */ package org.apache.fineract.portfolio.self.savings.service; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; @@ -29,8 +28,8 @@ public class AppuserSavingsMapperReadServiceImpl implements AppuserSavingsMapper private final JdbcTemplate jdbcTemplate; @Autowired - public AppuserSavingsMapperReadServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public AppuserSavingsMapperReadServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; } @Override diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/shareaccounts/service/AppUserShareAccountsMapperReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/shareaccounts/service/AppUserShareAccountsMapperReadPlatformServiceImpl.java index 7af7fb0be..7594e6159 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/shareaccounts/service/AppUserShareAccountsMapperReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/shareaccounts/service/AppUserShareAccountsMapperReadPlatformServiceImpl.java @@ -19,7 +19,6 @@ package org.apache.fineract.portfolio.self.shareaccounts.service; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; @@ -30,8 +29,8 @@ public class AppUserShareAccountsMapperReadPlatformServiceImpl implements AppUse private final JdbcTemplate jdbcTemplate; @Autowired - public AppUserShareAccountsMapperReadPlatformServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public AppUserShareAccountsMapperReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; } @Override diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/PurchasedSharesReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/PurchasedSharesReadPlatformServiceImpl.java index b1e29b10d..bf5f8c439 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/PurchasedSharesReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/PurchasedSharesReadPlatformServiceImpl.java @@ -25,7 +25,6 @@ import java.time.LocalDate; import java.util.Collection; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.portfolio.shareaccounts.data.ShareAccountTransactionData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; @@ -38,8 +37,8 @@ public class PurchasedSharesReadPlatformServiceImpl implements PurchasedSharesRe private final JdbcTemplate jdbcTemplate; @Autowired - public PurchasedSharesReadPlatformServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public PurchasedSharesReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; } @Override diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountChargeReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountChargeReadPlatformServiceImpl.java index 76cb4da14..ad6e39597 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountChargeReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountChargeReadPlatformServiceImpl.java @@ -24,7 +24,6 @@ import java.sql.SQLException; import java.util.Collection; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.organisation.monetary.data.CurrencyData; import org.apache.fineract.portfolio.charge.data.ChargeData; import org.apache.fineract.portfolio.charge.service.ChargeEnumerations; @@ -40,8 +39,8 @@ public class ShareAccountChargeReadPlatformServiceImpl implements ShareAccountCh private final JdbcTemplate jdbcTemplate; @Autowired - public ShareAccountChargeReadPlatformServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public ShareAccountChargeReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; } @Override diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountDividendReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountDividendReadPlatformServiceImpl.java index e11a665fb..6f03922db 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountDividendReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountDividendReadPlatformServiceImpl.java @@ -28,7 +28,6 @@ import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.PaginationHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.SearchParameters; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.security.utils.ColumnValidator; @@ -50,9 +49,9 @@ public class ShareAccountDividendReadPlatformServiceImpl implements ShareAccount private final DatabaseSpecificSQLGenerator sqlGenerator; @Autowired - public ShareAccountDividendReadPlatformServiceImpl(final RoutingDataSource dataSource, final ColumnValidator columnValidator, + public ShareAccountDividendReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, final ColumnValidator columnValidator, DatabaseSpecificSQLGenerator sqlGenerator, PaginationHelper paginationHelper) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.columnValidator = columnValidator; this.paginationHelper = paginationHelper; this.sqlGenerator = sqlGenerator; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountReadPlatformServiceImpl.java index 8484a59fa..5a5ceb07a 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountReadPlatformServiceImpl.java @@ -35,7 +35,6 @@ import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.PaginationHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.organisation.monetary.data.CurrencyData; import org.apache.fineract.portfolio.accountdetails.data.ShareAccountSummaryData; @@ -87,7 +86,7 @@ public class ShareAccountReadPlatformServiceImpl implements ShareAccountReadPlat private final DatabaseSpecificSQLGenerator sqlGenerator; @Autowired - public ShareAccountReadPlatformServiceImpl(final RoutingDataSource dataSource, final ApplicationContext applicationContext, + public ShareAccountReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, final ApplicationContext applicationContext, final ChargeReadPlatformService chargeReadPlatformService, final ShareProductDropdownReadPlatformService shareProductDropdownReadPlatformService, final SavingsAccountReadPlatformService savingsAccountReadPlatformService, @@ -95,7 +94,7 @@ public class ShareAccountReadPlatformServiceImpl implements ShareAccountReadPlat final ShareAccountChargeReadPlatformService shareAccountChargeReadPlatformService, final PurchasedSharesReadPlatformService purchasedSharesReadPlatformService, DatabaseSpecificSQLGenerator sqlGenerator, PaginationHelper paginationHelper) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.applicationContext = applicationContext; this.chargeReadPlatformService = chargeReadPlatformService; this.shareProductDropdownReadPlatformService = shareProductDropdownReadPlatformService; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/service/ShareProductDividendReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/service/ShareProductDividendReadPlatformServiceImpl.java index 26d8e0dd0..2c7fc7743 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/service/ShareProductDividendReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/service/ShareProductDividendReadPlatformServiceImpl.java @@ -29,7 +29,6 @@ import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.PaginationHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.SearchParameters; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.security.utils.ColumnValidator; @@ -51,9 +50,9 @@ public class ShareProductDividendReadPlatformServiceImpl implements ShareProduct private final DatabaseSpecificSQLGenerator sqlGenerator; @Autowired - public ShareProductDividendReadPlatformServiceImpl(final RoutingDataSource dataSource, final ColumnValidator columnValidator, + public ShareProductDividendReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, final ColumnValidator columnValidator, DatabaseSpecificSQLGenerator sqlGenerator, PaginationHelper paginationHelper) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.columnValidator = columnValidator; this.paginationHelper = paginationHelper; this.sqlGenerator = sqlGenerator; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/service/ShareProductReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/service/ShareProductReadPlatformServiceImpl.java index 5fdf26172..bef215564 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/service/ShareProductReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/service/ShareProductReadPlatformServiceImpl.java @@ -36,7 +36,6 @@ import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; import org.apache.fineract.infrastructure.core.service.Page; import org.apache.fineract.infrastructure.core.service.PaginationHelper; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.organisation.monetary.data.CurrencyData; import org.apache.fineract.organisation.monetary.service.CurrencyReadPlatformService; @@ -67,13 +66,13 @@ public class ShareProductReadPlatformServiceImpl implements ProductReadPlatformS private final DatabaseSpecificSQLGenerator sqlGenerator; @Autowired - public ShareProductReadPlatformServiceImpl(final RoutingDataSource dataSource, + public ShareProductReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, final CurrencyReadPlatformService currencyReadPlatformService, final ChargeReadPlatformService chargeReadPlatformService, final ShareProductDropdownReadPlatformService shareProductDropdownReadPlatformService, final AccountingDropdownReadPlatformService accountingDropdownReadPlatformService, final ProductToGLAccountMappingReadPlatformService accountMappingReadPlatformService, DatabaseSpecificSQLGenerator sqlGenerator, PaginationHelper paginationHelper) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.currencyReadPlatformService = currencyReadPlatformService; this.chargeReadPlatformService = chargeReadPlatformService; this.shareProductDropdownReadPlatformService = shareProductDropdownReadPlatformService; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/service/TaxReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/service/TaxReadPlatformServiceImpl.java index b97f4087b..b0de1759c 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/service/TaxReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/service/TaxReadPlatformServiceImpl.java @@ -29,7 +29,6 @@ import org.apache.fineract.accounting.common.AccountingEnumerations; import org.apache.fineract.accounting.glaccount.data.GLAccountData; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.portfolio.tax.data.TaxComponentData; import org.apache.fineract.portfolio.tax.data.TaxComponentHistoryData; import org.apache.fineract.portfolio.tax.data.TaxGroupData; @@ -51,9 +50,9 @@ public class TaxReadPlatformServiceImpl implements TaxReadPlatformService { private final AccountingDropdownReadPlatformService accountingDropdownReadPlatformService; @Autowired - public TaxReadPlatformServiceImpl(final RoutingDataSource dataSource, + public TaxReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, final AccountingDropdownReadPlatformService accountingDropdownReadPlatformService) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.accountingDropdownReadPlatformService = accountingDropdownReadPlatformService; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/spm/service/ScorecardReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/spm/service/ScorecardReadPlatformServiceImpl.java index 70fc11ed6..185d94462 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/spm/service/ScorecardReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/spm/service/ScorecardReadPlatformServiceImpl.java @@ -26,7 +26,6 @@ import java.util.Collection; import java.util.Date; import java.util.List; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.spm.data.ScorecardData; import org.apache.fineract.spm.data.ScorecardValue; @@ -42,9 +41,9 @@ public class ScorecardReadPlatformServiceImpl implements ScorecardReadPlatformSe private final PlatformSecurityContext context; @Autowired - public ScorecardReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource) { + public ScorecardReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; } private static final class ScorecardMapper implements RowMapper { diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/AppUserReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/AppUserReadPlatformServiceImpl.java index f0432adf0..1d1eefff8 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/AppUserReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/AppUserReadPlatformServiceImpl.java @@ -25,7 +25,6 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.organisation.office.data.OfficeData; import org.apache.fineract.organisation.office.service.OfficeReadPlatformService; @@ -57,14 +56,14 @@ public class AppUserReadPlatformServiceImpl implements AppUserReadPlatformServic private final StaffReadPlatformService staffReadPlatformService; @Autowired - public AppUserReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, + public AppUserReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate, final OfficeReadPlatformService officeReadPlatformService, final RoleReadPlatformService roleReadPlatformService, final AppUserRepository appUserRepository, final StaffReadPlatformService staffReadPlatformService) { this.context = context; this.officeReadPlatformService = officeReadPlatformService; this.roleReadPlatformService = roleReadPlatformService; this.appUserRepository = appUserRepository; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.staffReadPlatformService = staffReadPlatformService; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/PasswordValidationPolicyReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/PasswordValidationPolicyReadPlatformServiceImpl.java index b03af1fb4..a78ab456d 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/PasswordValidationPolicyReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/PasswordValidationPolicyReadPlatformServiceImpl.java @@ -22,7 +22,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.useradministration.data.PasswordValidationPolicyData; import org.apache.fineract.useradministration.exception.PasswordValidationPolicyNotFoundException; @@ -40,8 +39,8 @@ public class PasswordValidationPolicyReadPlatformServiceImpl implements Password private final PasswordValidationPolicyMapper passwordValidationPolicyMapper; @Autowired - public PasswordValidationPolicyReadPlatformServiceImpl(final RoutingDataSource dataSource, DatabaseSpecificSQLGenerator sqlGenerator) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public PasswordValidationPolicyReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate, DatabaseSpecificSQLGenerator sqlGenerator) { + this.jdbcTemplate = jdbcTemplate; this.sqlGenerator = sqlGenerator; this.passwordValidationPolicyMapper = new PasswordValidationPolicyMapper(sqlGenerator); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/PermissionReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/PermissionReadPlatformServiceImpl.java index 3e8d96e9a..caef435f8 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/PermissionReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/PermissionReadPlatformServiceImpl.java @@ -21,7 +21,6 @@ package org.apache.fineract.useradministration.service; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.useradministration.data.PermissionData; @@ -42,10 +41,10 @@ public class PermissionReadPlatformServiceImpl implements PermissionReadPlatform private final PlatformSecurityContext context; @Autowired - public PermissionReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, + public PermissionReadPlatformServiceImpl(final PlatformSecurityContext context, final JdbcTemplate jdbcTemplate, DatabaseSpecificSQLGenerator sqlGenerator) { this.context = context; - this.jdbcTemplate = new JdbcTemplate(dataSource); + this.jdbcTemplate = jdbcTemplate; this.sqlGenerator = sqlGenerator; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/RoleReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/RoleReadPlatformServiceImpl.java index ea3b74f35..1d991c104 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/RoleReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/RoleReadPlatformServiceImpl.java @@ -22,7 +22,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; import org.apache.fineract.infrastructure.core.domain.JdbcSupport; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.portfolio.self.registration.SelfServiceApiConstants; import org.apache.fineract.useradministration.data.RoleData; import org.apache.fineract.useradministration.exception.RoleNotFoundException; @@ -39,8 +38,8 @@ public class RoleReadPlatformServiceImpl implements RoleReadPlatformService { private final RoleMapper roleRowMapper; @Autowired - public RoleReadPlatformServiceImpl(final RoutingDataSource dataSource) { - this.jdbcTemplate = new JdbcTemplate(dataSource); + public RoleReadPlatformServiceImpl(final JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; this.roleRowMapper = new RoleMapper(); } diff --git a/fineract-provider/src/test/java/org/apache/fineract/TestConfiguration.java b/fineract-provider/src/test/java/org/apache/fineract/TestConfiguration.java index 9ef254355..e14fcab7c 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/TestConfiguration.java +++ b/fineract-provider/src/test/java/org/apache/fineract/TestConfiguration.java @@ -48,6 +48,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.transaction.annotation.EnableTransactionManagement; @@ -136,4 +137,9 @@ public class TestConfiguration { DataSource mockDataSource = mock(DataSource.class, Mockito.RETURNS_MOCKS); return mockDataSource; } + + @Bean + public JdbcTemplate jdbcTemplate() { + return mock(JdbcTemplate.class); + } } diff --git a/fineract-provider/src/test/java/org/apache/fineract/mix/report/MixXbrlTaxonomyStepDefinitions.java b/fineract-provider/src/test/java/org/apache/fineract/mix/report/MixXbrlTaxonomyStepDefinitions.java index 676ce4844..8b5c4adf9 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/mix/report/MixXbrlTaxonomyStepDefinitions.java +++ b/fineract-provider/src/test/java/org/apache/fineract/mix/report/MixXbrlTaxonomyStepDefinitions.java @@ -23,9 +23,9 @@ import static org.mockito.Mockito.mock; import io.cucumber.java8.En; import java.util.List; -import org.apache.fineract.infrastructure.core.service.RoutingDataSource; import org.apache.fineract.mix.service.XBRLResultServiceImpl; import org.assertj.core.util.Arrays; +import org.springframework.jdbc.core.JdbcTemplate; public class MixXbrlTaxonomyStepDefinitions implements En { @@ -37,7 +37,7 @@ public class MixXbrlTaxonomyStepDefinitions implements En { public MixXbrlTaxonomyStepDefinitions() { Given("/^A XBRL template (.*)$/", (String template) -> { - this.readService = new XBRLResultServiceImpl(mock(RoutingDataSource.class), null, null); + this.readService = new XBRLResultServiceImpl(mock(JdbcTemplate.class), null, null); this.template = template; }); diff --git a/fineract-provider/src/test/java/org/apache/fineract/module/service/TestDefaultConfiguration.java b/fineract-provider/src/test/java/org/apache/fineract/module/service/TestDefaultConfiguration.java index 5f1bd24e0..ffe76f46b 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/module/service/TestDefaultConfiguration.java +++ b/fineract-provider/src/test/java/org/apache/fineract/module/service/TestDefaultConfiguration.java @@ -32,6 +32,7 @@ import org.apache.fineract.portfolio.note.domain.NoteRepository; import org.apache.fineract.portfolio.note.serialization.NoteCommandFromApiJsonDeserializer; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; +import org.springframework.jdbc.core.JdbcTemplate; @EnableConfigurationProperties({ FineractProperties.class }) public class TestDefaultConfiguration { @@ -52,6 +53,11 @@ public class TestDefaultConfiguration { return mock(RoutingDataSource.class); } + @Bean + public JdbcTemplate jdbcTemplate() { + return mock(JdbcTemplate.class); + } + @Bean public NoteRepository noteRepository() { return mock(NoteRepository.class); diff --git a/fineract-provider/src/test/java/org/apache/fineract/module/service/TestOverrideConfiguration.java b/fineract-provider/src/test/java/org/apache/fineract/module/service/TestOverrideConfiguration.java index dfc054421..6abb1ad04 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/module/service/TestOverrideConfiguration.java +++ b/fineract-provider/src/test/java/org/apache/fineract/module/service/TestOverrideConfiguration.java @@ -31,6 +31,7 @@ import org.apache.fineract.portfolio.note.domain.NoteRepository; import org.apache.fineract.portfolio.note.serialization.NoteCommandFromApiJsonDeserializer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; +import org.springframework.jdbc.core.JdbcTemplate; @ComponentScan("org.apache.fineract.module.service.custom") public class TestOverrideConfiguration { @@ -51,6 +52,11 @@ public class TestOverrideConfiguration { return mock(RoutingDataSource.class); } + @Bean + public JdbcTemplate jdbcTemplate() { + return mock(JdbcTemplate.class); + } + @Bean public NoteRepository noteRepository() { return mock(NoteRepository.class);