From f8c5de3e96c4fff8154436406e38da6debcd624f Mon Sep 17 00:00:00 2001 From: bd2019us Date: Sat, 13 Apr 2019 19:52:58 -0500 Subject: [PATCH] [FINERACT-747] change String.replaceAll() to replace() to improve performance --- .../accounting/rule/api/AccountingRuleJsonInputParams.java | 4 ++-- .../FixedDepositTransactionWorkbookPopulator.java | 2 +- .../loanrepayment/LoanRepaymentWorkbookPopulator.java | 4 ++-- .../savings/SavingsTransactionsWorkbookPopulator.java | 2 +- .../fineract/portfolio/common/domain/ConditionType.java | 4 ++-- .../group/service/CenterReadPlatformServiceImpl.java | 6 +++--- .../group/service/GroupReadPlatformServiceImpl.java | 6 +++--- .../loanaccount/service/LoanReadPlatformServiceImpl.java | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleJsonInputParams.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleJsonInputParams.java index 91d286e24..92099490b 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleJsonInputParams.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleJsonInputParams.java @@ -48,10 +48,10 @@ public enum AccountingRuleJsonInputParams { @Override public String toString() { - return name().toString().replaceAll("_", " "); + return name().toString().replace("_", " "); } public String getValue() { return this.value; } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/fixeddeposits/FixedDepositTransactionWorkbookPopulator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/fixeddeposits/FixedDepositTransactionWorkbookPopulator.java index 0b2d32419..79545241d 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/fixeddeposits/FixedDepositTransactionWorkbookPopulator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/fixeddeposits/FixedDepositTransactionWorkbookPopulator.java @@ -158,7 +158,7 @@ public class FixedDepositTransactionWorkbookPopulator extends AbstractWorkbookPo //Account Number Named after Clients for(int j = 0; j < clientsWithActiveSavings.size(); j++) { Name name = savingsTransactionWorkbook.createName(); - name.setNameName("Account_" + clientsWithActiveSavings.get(j).replaceAll(" ", "_") + "_" + clientIdsWithActiveSavings.get(j) + "_"); + name.setNameName("Account_" + clientsWithActiveSavings.get(j).replace(" ", "_") + "_" + clientIdsWithActiveSavings.get(j) + "_"); name.setRefersToFormula(TemplatePopulateImportConstants.FIXED_DEPOSIT_TRANSACTION_SHEET_NAME+"!$Q$" + clientNameToBeginEndIndexes.get(clientsWithActiveSavings.get(j))[0] + ":$Q$" + clientNameToBeginEndIndexes.get(clientsWithActiveSavings.get(j))[1]); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/loanrepayment/LoanRepaymentWorkbookPopulator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/loanrepayment/LoanRepaymentWorkbookPopulator.java index 55f24b831..cf17656d3 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/loanrepayment/LoanRepaymentWorkbookPopulator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/loanrepayment/LoanRepaymentWorkbookPopulator.java @@ -199,7 +199,7 @@ public class LoanRepaymentWorkbookPopulator extends AbstractWorkbookPopulator { // Account Number Named after Clients for (int j = 0; j < clientsWithActiveLoans.size(); j++) { Name name = loanRepaymentWorkbook.createName(); - name.setNameName("Account_" + clientsWithActiveLoans.get(j).replaceAll(" ", "_") + "_" + name.setNameName("Account_" + clientsWithActiveLoans.get(j).replace(" ", "_") + "_" + clientIdsWithActiveLoans.get(j) + "_"); name.setRefersToFormula( TemplatePopulateImportConstants.LOAN_REPAYMENT_SHEET_NAME+"!$T$" + clientNameToBeginEndIndexes.get(clientsWithActiveLoans.get(j))[0] + ":$T$" @@ -296,4 +296,4 @@ public class LoanRepaymentWorkbookPopulator extends AbstractWorkbookPopulator { } -} \ No newline at end of file +} diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/savings/SavingsTransactionsWorkbookPopulator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/savings/SavingsTransactionsWorkbookPopulator.java index 29f195369..58310e4a5 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/savings/SavingsTransactionsWorkbookPopulator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/savings/SavingsTransactionsWorkbookPopulator.java @@ -163,7 +163,7 @@ public class SavingsTransactionsWorkbookPopulator extends AbstractWorkbookPopula //Account Number Named after Clients for(int j = 0; j < clientsWithActiveSavings.size(); j++) { Name name = savingsTransactionWorkbook.createName(); - name.setNameName("Account_" + clientsWithActiveSavings.get(j).replaceAll(" ", "_") + "_" + clientIdsWithActiveSavings.get(j) + "_"); + name.setNameName("Account_" + clientsWithActiveSavings.get(j).replace(" ", "_") + "_" + clientIdsWithActiveSavings.get(j) + "_"); name.setRefersToFormula(TemplatePopulateImportConstants.SAVINGS_TRANSACTION_SHEET_NAME+"!$Q$" + clientNameToBeginEndIndexes.get(clientsWithActiveSavings.get(j))[0] + ":$Q$" + clientNameToBeginEndIndexes.get(clientsWithActiveSavings.get(j))[1]); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/domain/ConditionType.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/domain/ConditionType.java index 1784e8299..85bea15a9 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/domain/ConditionType.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/domain/ConditionType.java @@ -53,7 +53,7 @@ public enum ConditionType { @Override public String toString() { - return name().toString().replaceAll("_", " "); + return name().toString().replace("_", " "); } public Integer getValue() { @@ -94,4 +94,4 @@ public enum ConditionType { return values.toArray(); } -} \ No newline at end of file +} 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 656af43bf..5b42c4e66 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 @@ -131,8 +131,8 @@ public class CenterReadPlatformServiceImpl implements CenterReadPlatformService String sqlQueryCriteria = searchCriteria.getSqlSearch(); if (StringUtils.isNotBlank(sqlQueryCriteria)) { SQLInjectionValidator.validateSQLInput(sqlQueryCriteria); - sqlQueryCriteria = sqlQueryCriteria.replaceAll(" display_name ", " g.display_name "); - sqlQueryCriteria = sqlQueryCriteria.replaceAll("display_name ", "g.display_name "); + sqlQueryCriteria = sqlQueryCriteria.replace(" display_name ", " g.display_name "); + sqlQueryCriteria = sqlQueryCriteria.replace("display_name ", "g.display_name "); extraCriteria.append(" and (").append(sqlQueryCriteria).append(") "); this.columnValidator.validateSqlInjection(schemaSl, sqlQueryCriteria); } @@ -630,4 +630,4 @@ public class CenterReadPlatformServiceImpl implements CenterReadPlatformService "Validation errors exist.", dataValidationErrors); } } -} \ No newline at end of file +} 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 72f044cca..889ba8f49 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 @@ -221,8 +221,8 @@ public class GroupReadPlatformServiceImpl implements GroupReadPlatformService { String sqlSearch = searchCriteria.getSqlSearch(); if (sqlSearch != null) { SQLInjectionValidator.validateSQLInput(sqlSearch); - sqlSearch = sqlSearch.replaceAll(" display_name ", " g.display_name "); - sqlSearch = sqlSearch.replaceAll("display_name ", "g.display_name "); + sqlSearch = sqlSearch.replace(" display_name ", " g.display_name "); + sqlSearch = sqlSearch.replace("display_name ", "g.display_name "); extraCriteria.append(" and ( ").append(sqlSearch).append(") "); this.columnValidator.validateSqlInjection(schemaSql, sqlSearch); } @@ -317,4 +317,4 @@ public class GroupReadPlatformServiceImpl implements GroupReadPlatformService { return GroupGeneralData.withClosureReasons(closureReasons); } -} \ No newline at end of file +} 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 20230d6a4..043a6e371 100755 --- 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 @@ -306,7 +306,7 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService { String sqlQueryCriteria = searchParameters.getSqlSearch(); if (StringUtils.isNotBlank(sqlQueryCriteria)) { SQLInjectionValidator.validateSQLInput(sqlQueryCriteria); - sqlQueryCriteria = sqlQueryCriteria.replaceAll("accountNo", "l.account_no"); + sqlQueryCriteria = sqlQueryCriteria.replace("accountNo", "l.account_no"); this.columnValidator.validateSqlInjection(sqlBuilder.toString(), sqlQueryCriteria); sqlBuilder.append(" and (").append(sqlQueryCriteria).append(")"); }