diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java index e145ce4b6..0ba4a0fe9 100644 --- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java +++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java @@ -52,7 +52,7 @@ import org.slf4j.LoggerFactory; @SuppressWarnings("unchecked") public class Utils { - private final static Logger logger = LoggerFactory.getLogger(Utils.class); + private final static Logger LOG = LoggerFactory.getLogger(Utils.class); public static final String TENANT_PARAM_NAME = "tenantIdentifier"; public static final String DEFAULT_TENANT = "default"; @@ -80,15 +80,15 @@ public class Utils { response = RestAssured.get(HEALTH_URL); int healthHttpStatus = response.statusCode(); if (healthHttpStatus == 200) { - logger.info("{} return HTTP 200, application is now ready for integration testing!", HEALTH_URL); + LOG.info("{} return HTTP 200, application is now ready for integration testing!", HEALTH_URL); return; } else { - logger.info("{} returned HTTP {}, going to wait and retry (attempt {})", HEALTH_URL, + LOG.info("{} returned HTTP {}, going to wait and retry (attempt {})", HEALTH_URL, healthHttpStatus, attempt++); sleep(3); } } catch (Exception e) { - logger.info("{} caused {}, going to wait and retry (attempt {})", HEALTH_URL, e.getMessage(), + LOG.info("{} caused {}, going to wait and retry (attempt {})", HEALTH_URL, e.getMessage(), attempt++); lastException = e; sleep(3); @@ -96,10 +96,10 @@ public class Utils { } while (attempt < max_attempts); if (lastException != null) { - logger.error("{} still not reachable, giving up", HEALTH_URL, lastException); + LOG.error("{} still not reachable, giving up", HEALTH_URL, lastException); throw new AssertionError(HEALTH_URL + " not reachable", lastException); } else { - logger.error("{} still has not returned HTTP 200, giving up (last) body: {}", HEALTH_URL, + LOG.error("{} still has not returned HTTP 200, giving up (last) body: {}", HEALTH_URL, response.prettyPrint()); fail(HEALTH_URL + " returned " + response.prettyPrint()); } @@ -109,7 +109,7 @@ public class Utils { try { Thread.sleep(seconds * 1000); } catch (InterruptedException e) { - logger.warn("Unexpected InterruptedException", e); + LOG.warn("Unexpected InterruptedException", e); throw new IllegalStateException("Unexpected InterruptedException", e); } } @@ -117,7 +117,7 @@ public class Utils { public static String loginIntoServerAndGetBase64EncodedAuthenticationKey() { awaitSpringBootActuatorHealthyUp(); try { - logger.info("Logging in, for integration test..."); + LOG.info("Logging in, for integration test..."); // system.out.println("-----------------------------------LOGIN-----------------------------------------"); String json = RestAssured.given().contentType(ContentType.JSON) .body("{\"username\":\"mifos\", \"password\":\"password\"}").expect().log().ifError().when() diff --git a/fineract-provider/src/main/java/org/apache/fineract/ServerWithMariaDB4jApplication.java b/fineract-provider/src/main/java/org/apache/fineract/ServerWithMariaDB4jApplication.java index 53013b81b..3a6521de0 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/ServerWithMariaDB4jApplication.java +++ b/fineract-provider/src/main/java/org/apache/fineract/ServerWithMariaDB4jApplication.java @@ -47,7 +47,7 @@ import org.springframework.core.io.Resource; * @see ServerApplication for the same without the embedded MariaDB4j database */ public class ServerWithMariaDB4jApplication { - private final static Logger logger = LoggerFactory.getLogger(ServerWithMariaDB4jApplication.class); + private final static Logger LOG = LoggerFactory.getLogger(ServerWithMariaDB4jApplication.class); @Import({ MariaDB4jDataSourceConfiguration.class, EmbeddedTomcatWithSSLConfiguration.class }) public static class Configuration extends AbstractApplicationConfiguration { } @@ -55,7 +55,7 @@ public class ServerWithMariaDB4jApplication { public static void main(String[] args) throws Exception { ConfigurableApplicationContext ctx = SpringApplication.run(Configuration.class, args); if (!Desktop.isDesktopSupported()) { - logger.info("Not going to open UI homepage in local web browser, because !Desktop.isDesktopSupported()"); + LOG.info("Not going to open UI homepage in local web browser, because !Desktop.isDesktopSupported()"); } else { // apps/community-app/dist/community-app/index.html @@ -84,7 +84,7 @@ public class ServerWithMariaDB4jApplication { } else if (devResource.exists()) { openWebBrowser(devURI); } else { - logger.error("Cannot open Fineract UI in browser; not found: " + distResource.toString()); + LOG.error("Cannot open Fineract UI in browser; not found: " + distResource.toString()); } } @@ -95,10 +95,10 @@ public class ServerWithMariaDB4jApplication { private static void openWebBrowser(URI uri) { try { - logger.info("Opening Fineract UI in browser: " + uri.toString()); + LOG.info("Opening Fineract UI in browser: " + uri.toString()); Desktop.getDesktop().browse(uri); } catch (IOException e) { - logger.error("IOException when opening Fineract UI in browser: " + uri.toString(), e); + LOG.error("IOException when opening Fineract UI in browser: " + uri.toString(), e); } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/service/GLClosureWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/service/GLClosureWritePlatformServiceJpaRepositoryImpl.java index a87f57ef9..58ca57016 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/service/GLClosureWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/service/GLClosureWritePlatformServiceJpaRepositoryImpl.java @@ -47,7 +47,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class GLClosureWritePlatformServiceJpaRepositoryImpl implements GLClosureWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(GLClosureWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(GLClosureWritePlatformServiceJpaRepositoryImpl.class); private final GLClosureRepository glClosureRepository; private final OfficeRepositoryWrapper officeRepositoryWrapper; @@ -144,7 +144,7 @@ public class GLClosureWritePlatformServiceJpaRepositoryImpl implements GLClosure command.longValueOfParameterNamed(GLClosureJsonInputParams.OFFICE_ID.getValue()), new LocalDate( command.DateValueOfParameterNamed(GLClosureJsonInputParams.CLOSING_DATE.getValue()))); } - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.glClosure.unknown.data.integrity.issue", "Unknown data integrity issue with resource GL Closure: " + realCause.getMessage()); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/service/FinancialActivityAccountWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/service/FinancialActivityAccountWritePlatformServiceImpl.java index a5c469bb3..d1aa143b3 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/service/FinancialActivityAccountWritePlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/service/FinancialActivityAccountWritePlatformServiceImpl.java @@ -47,7 +47,7 @@ public class FinancialActivityAccountWritePlatformServiceImpl implements Financi private final FinancialActivityAccountRepositoryWrapper financialActivityAccountRepository; private final FinancialActivityAccountDataValidator fromApiJsonDeserializer; private final GLAccountRepositoryWrapper glAccountRepositoryWrapper; - private final static Logger logger = LoggerFactory.getLogger(FinancialActivityAccountWritePlatformServiceImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(FinancialActivityAccountWritePlatformServiceImpl.class); @Autowired public FinancialActivityAccountWritePlatformServiceImpl( @@ -154,7 +154,7 @@ public class FinancialActivityAccountWritePlatformServiceImpl implements Financi throw new DuplicateFinancialActivityAccountFoundException(financialActivityId); } - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.glAccount.unknown.data.integrity.issue", "Unknown data integrity issue with resource GL Account: " + realCause.getMessage()); } 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 209a60ccc..b03e2118c 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 @@ -57,7 +57,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class GLAccountWritePlatformServiceJpaRepositoryImpl implements GLAccountWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(GLAccountWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(GLAccountWritePlatformServiceJpaRepositoryImpl.class); private final GLAccountRepository glAccountRepository; private final JournalEntryRepository glJournalEntryRepository; @@ -232,7 +232,7 @@ public class GLAccountWritePlatformServiceJpaRepositoryImpl implements GLAccount throw new GLAccountDuplicateException(glCode); } - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.glAccount.unknown.data.integrity.issue", "Unknown data integrity issue with resource GL Account: " + realCause.getMessage()); } 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 ee512b68b..493cdc8dd 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryRunningBalanceUpdateServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryRunningBalanceUpdateServiceImpl.java @@ -53,7 +53,7 @@ import org.springframework.stereotype.Service; @Service public class JournalEntryRunningBalanceUpdateServiceImpl implements JournalEntryRunningBalanceUpdateService { - private final static Logger logger = LoggerFactory.getLogger(JournalEntryRunningBalanceUpdateServiceImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(JournalEntryRunningBalanceUpdateServiceImpl.class); private final JdbcTemplate jdbcTemplate; @@ -103,7 +103,7 @@ public class JournalEntryRunningBalanceUpdateServiceImpl implements JournalEntry Date entityDate = this.jdbcTemplate.queryForObject(dateFinder, Date.class); updateOrganizationRunningBalance(entityDate); } catch (EmptyResultDataAccessException e) { - logger.debug("No results found for updation of running balance "); + LOG.debug("No results found for updation of running balance "); } } @@ -124,7 +124,7 @@ public class JournalEntryRunningBalanceUpdateServiceImpl implements JournalEntry Date entityDate = this.jdbcTemplate.queryForObject(dateFinder, Date.class, officeId); updateRunningBalance(officeId, entityDate); } catch (EmptyResultDataAccessException e) { - logger.debug("No results found for updation of office running balance with office id: {}", officeId); + LOG.debug("No results found for updation of office running balance with office id: {}", officeId); } commandProcessingResultBuilder.withOfficeId(officeId); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryWritePlatformServiceJpaRepositoryImpl.java index 09be8e53c..75c689b37 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryWritePlatformServiceJpaRepositoryImpl.java @@ -88,7 +88,7 @@ import org.springframework.util.CollectionUtils; @Service public class JournalEntryWritePlatformServiceJpaRepositoryImpl implements JournalEntryWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(JournalEntryWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(JournalEntryWritePlatformServiceJpaRepositoryImpl.class); private final GLClosureRepository glClosureRepository; private final GLAccountRepository glAccountRepository; @@ -640,7 +640,7 @@ public class JournalEntryWritePlatformServiceJpaRepositoryImpl implements Journa private PlatformDataIntegrityException handleJournalEntryDataIntegrityIssues(final DataIntegrityViolationException dve) { final Throwable realCause = dve.getMostSpecificCause(); - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); return new PlatformDataIntegrityException("error.msg.glJournalEntry.unknown.data.integrity.issue", "Unknown data integrity issue with resource Journal Entry: " + realCause.getMessage()); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/service/AccountingRuleWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/service/AccountingRuleWritePlatformServiceJpaRepositoryImpl.java index f7a3a0da8..8a7ed6463 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/service/AccountingRuleWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/service/AccountingRuleWritePlatformServiceJpaRepositoryImpl.java @@ -57,7 +57,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class AccountingRuleWritePlatformServiceJpaRepositoryImpl implements AccountingRuleWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(AccountingRuleWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(AccountingRuleWritePlatformServiceJpaRepositoryImpl.class); private final AccountingRuleRepositoryWrapper accountingRuleRepositoryWrapper; private final AccountingRuleRepository accountingRuleRepository; @@ -89,7 +89,7 @@ public class AccountingRuleWritePlatformServiceJpaRepositoryImpl implements Acco throw new AccountingRuleDuplicateException(command.stringValueOfParameterNamed(AccountingRuleJsonInputParams.NAME.getValue())); } else if (realCause.getMessage().contains("UNIQUE_ACCOUNT_RULE_TAGS")) { throw new AccountingRuleDuplicateException(); } - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.accounting.rule.unknown.data.integrity.issue", "Unknown data integrity issue with resource Accounting Rule: " + realCause.getMessage()); } 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 a2ab24e9d..e44dc5fe4 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 @@ -41,7 +41,7 @@ import org.springframework.transaction.annotation.Transactional; @Service(value = "adHocScheduledJobRunnerService") public class AdHocScheduledJobRunnerServiceImpl implements AdHocScheduledJobRunnerService { - private final static Logger logger = LoggerFactory.getLogger(AdHocScheduledJobRunnerServiceImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(AdHocScheduledJobRunnerServiceImpl.class); private final AdHocReadPlatformService adHocReadPlatformService; private final JdbcTemplate jdbcTemplate; @@ -105,17 +105,17 @@ public class AdHocScheduledJobRunnerServiceImpl implements AdHocScheduledJobRunn .append(adhoc.getQuery()); if (insertSqlBuilder.length() > 0) { final int result = this.jdbcTemplate.update(insertSqlBuilder.toString()); - logger.info("{}: Results affected by inserted: {}", ThreadLocalContextUtil.getTenant().getName(), result); + LOG.info("{}: Results affected by inserted: {}", ThreadLocalContextUtil.getTenant().getName(), result); this.jdbcTemplate.update("UPDATE m_adhoc SET last_run=? WHERE id=?", new Date(), adhoc.getId()); } } else { - logger.info("{}: Skipping execution of {}, scheduled for execution on {}", + LOG.info("{}: Skipping execution of {}, scheduled for execution on {}", new Object[] { ThreadLocalContextUtil.getTenant().getName(), adhoc.getName(), next }); } }); }else{ - logger.info("{} Nothing to update", ThreadLocalContextUtil.getTenant().getName()); + LOG.info("{} Nothing to update", ThreadLocalContextUtil.getTenant().getName()); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocWritePlatformServiceJpaRepositoryImpl.java index 3d476548b..fd6d1ccc0 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocWritePlatformServiceJpaRepositoryImpl.java @@ -37,7 +37,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class AdHocWritePlatformServiceJpaRepositoryImpl implements AdHocWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(AdHocWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(AdHocWritePlatformServiceJpaRepositoryImpl.class); private final PlatformSecurityContext context; private final AdHocRepository adHocRepository; private final AdHocDataValidator adHocCommandFromApiJsonDeserializer; @@ -93,7 +93,7 @@ public class AdHocWritePlatformServiceJpaRepositoryImpl implements AdHocWritePla } private void logAsErrorUnexpectedDataIntegrityException(final DataIntegrityViolationException dve) { - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); } @Transactional 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 e24a097dd..2f2c7b7da 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/commands/service/AuditReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/commands/service/AuditReadPlatformServiceImpl.java @@ -74,7 +74,7 @@ import org.springframework.stereotype.Service; @Service public class AuditReadPlatformServiceImpl implements AuditReadPlatformService { - private final static Logger logger = LoggerFactory.getLogger(AuditReadPlatformServiceImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(AuditReadPlatformServiceImpl.class); private final static Set supportedOrderByValues = new HashSet<>( Arrays.asList("id", "actionName", "entityName", "resourceId", "subresourceId", "madeOnDate", "checkedOnDate", "officeName", "groupName", "clientName", "loanAccountNo", "savingsAccountNo", "clientId", "loanId")); @@ -214,7 +214,7 @@ public class AuditReadPlatformServiceImpl implements AuditReadPlatformService { this.columnValidator.validateSqlInjection(sqlBuilder.toString(), parameters.limitSql()); } - logger.info("sql: {}", sqlBuilder); + LOG.info("sql: {}", sqlBuilder); final String sqlCountRows = "SELECT FOUND_ROWS()"; return this.paginationHelper.fetchPage(this.jdbcTemplate, sqlCountRows, sqlBuilder.toString(), extraCriteria.getArguments(), rm); @@ -251,7 +251,7 @@ public class AuditReadPlatformServiceImpl implements AuditReadPlatformService { } sql += extraCriteria.getSQLTemplate(); sql += groupAndOrderBySQL; - logger.info("sql: {}", sql); + LOG.info("sql: {}", sql); return this.jdbcTemplate.query(sql, rm, extraCriteria.getArguments()); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/commands/service/PortfolioCommandSourceWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/commands/service/PortfolioCommandSourceWritePlatformServiceImpl.java index ffc3c4c09..5e74845e9 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/commands/service/PortfolioCommandSourceWritePlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/commands/service/PortfolioCommandSourceWritePlatformServiceImpl.java @@ -50,7 +50,7 @@ public class PortfolioCommandSourceWritePlatformServiceImpl implements Portfolio private final FromJsonHelper fromApiJsonHelper; private final CommandProcessingService processAndLogCommandService; private final SchedulerJobRunnerReadService schedulerJobRunnerReadService; - private final static Logger logger = LoggerFactory.getLogger(PortfolioCommandSourceWritePlatformServiceImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(PortfolioCommandSourceWritePlatformServiceImpl.class); @Autowired public PortfolioCommandSourceWritePlatformServiceImpl(final PlatformSecurityContext context, @@ -96,13 +96,13 @@ public class PortfolioCommandSourceWritePlatformServiceImpl implements Portfolio result = this.processAndLogCommandService.processAndLogCommand(wrapper, command, isApprovedByChecker); numberOfRetries = maxNumberOfRetries + 1; } catch (CannotAcquireLockException | ObjectOptimisticLockingFailureException exception) { - logger.info("The following command {} has been retried {} time(s)", command.json(), numberOfRetries); + LOG.info("The following command {} has been retried {} time(s)", command.json(), numberOfRetries); /*** * Fail if the transaction has been retired for * maxNumberOfRetries **/ if (numberOfRetries >= maxNumberOfRetries) { - logger.warn("The following command {} has been retried for the max allowed attempts of {} and will be rolled back", + LOG.warn("The following command {} has been retried for the max allowed attempts of {} and will be rolled back", command.json(), numberOfRetries); throw (exception); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/service/AccountNumberFormatWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/service/AccountNumberFormatWritePlatformServiceJpaRepositoryImpl.java index f30ad2da0..72ba73d60 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/service/AccountNumberFormatWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/service/AccountNumberFormatWritePlatformServiceJpaRepositoryImpl.java @@ -41,7 +41,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class AccountNumberFormatWritePlatformServiceJpaRepositoryImpl implements AccountNumberFormatWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(AccountNumberFormatWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(AccountNumberFormatWritePlatformServiceJpaRepositoryImpl.class); private final AccountNumberFormatRepositoryWrapper accountNumberFormatRepository; private final AccountNumberFormatDataValidator accountNumberFormatDataValidator; @@ -149,7 +149,7 @@ public class AccountNumberFormatWritePlatformServiceJpaRepositoryImpl implements "Account Format preferences for Account type `" + entityAccountType.getCode() + "` already exists", "externalId", entityAccountType.getValue(), entityAccountType.getCode()); } - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.account.number.format.unknown.data.integrity.issue", "Unknown data integrity issue with resource."); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailCampaignWritePlatformCommandHandlerImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailCampaignWritePlatformCommandHandlerImpl.java index 0277ea121..d878bb88f 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailCampaignWritePlatformCommandHandlerImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailCampaignWritePlatformCommandHandlerImpl.java @@ -99,7 +99,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class EmailCampaignWritePlatformCommandHandlerImpl implements EmailCampaignWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(EmailCampaignWritePlatformCommandHandlerImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(EmailCampaignWritePlatformCommandHandlerImpl.class); private final PlatformSecurityContext context; @@ -293,7 +293,7 @@ public class EmailCampaignWritePlatformCommandHandlerImpl implements EmailCampai LocalDateTime tenantDateNow = tenantDateTime(); LocalDateTime nextTriggerDate = emailCampaignData.getNextTriggerDate().toLocalDateTime(); - logger.info("tenant time {} trigger time {}", tenantDateNow, nextTriggerDate); + LOG.info("tenant time {} trigger time {}", tenantDateNow, nextTriggerDate); if (nextTriggerDate.isBefore(tenantDateNow)) { insertDirectCampaignIntoEmailOutboundTable(emailCampaignData.getParamValue(), emailCampaignData.getEmailSubject(), emailCampaignData.getMessage(), emailCampaignData.getCampaignName(), emailCampaignData.getId()); diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailWritePlatformServiceJpaRepositoryImpl.java index 8ff34fbfd..b3182c805 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailWritePlatformServiceJpaRepositoryImpl.java @@ -37,7 +37,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class EmailWritePlatformServiceJpaRepositoryImpl implements EmailWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(EmailWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(EmailWritePlatformServiceJpaRepositoryImpl.class); private final EmailMessageAssembler assembler; private final EmailMessageRepository repository; @@ -126,7 +126,7 @@ public class EmailWritePlatformServiceJpaRepositoryImpl implements EmailWritePla if (realCause.getMessage().contains("email_address")) { throw new PlatformDataIntegrityException("error.msg.email.no.email.address.exists", "The group, client or staff provided has no email address.", "id"); } - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.email.unknown.data.integrity.issue", "Unknown data integrity issue with resource: " + realCause.getMessage()); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignDomainServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignDomainServiceImpl.java index d9d282d98..8c9c59522 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignDomainServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignDomainServiceImpl.java @@ -64,7 +64,7 @@ import org.springframework.stereotype.Service; @Service public class SmsCampaignDomainServiceImpl implements SmsCampaignDomainService { - private static final Logger logger = LoggerFactory.getLogger(SmsCampaignDomainServiceImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(SmsCampaignDomainServiceImpl.class); //private final static int POOL_SIZE = 5 ; @@ -235,9 +235,9 @@ public class SmsCampaignDomainServiceImpl implements SmsCampaignDomainService { } } } catch (final IOException e) { - logger.error("smsParams does not contain the key: ", e); + LOG.error("smsParams does not contain the key: ", e); } catch (final RuntimeException e) { - logger.debug("Client Office Id and SMS Campaign Office id doesn't match ", e); + LOG.debug("Client Office Id and SMS Campaign Office id doesn't match ", e); } } } @@ -293,9 +293,9 @@ public class SmsCampaignDomainServiceImpl implements SmsCampaignDomainService { this.smsMessageScheduledJobService.sendTriggeredMessages(smsDataMap); } } catch (final IOException e) { - logger.error("smsParams does not contain the key: ", e); + LOG.error("smsParams does not contain the key: ", e); } catch (final RuntimeException e) { - logger.debug("Client Office Id and SMS Campaign Office id doesn't match ", e); + LOG.debug("Client Office Id and SMS Campaign Office id doesn't match ", e); } } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignWritePlatformServiceJpaImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignWritePlatformServiceJpaImpl.java index 9ec5d9278..ff22504d2 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignWritePlatformServiceJpaImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignWritePlatformServiceJpaImpl.java @@ -94,7 +94,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class SmsCampaignWritePlatformServiceJpaImpl implements SmsCampaignWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(SmsCampaignWritePlatformServiceJpaImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(SmsCampaignWritePlatformServiceJpaImpl.class); private final PlatformSecurityContext context; @@ -240,7 +240,7 @@ public class SmsCampaignWritePlatformServiceJpaImpl implements SmsCampaignWriteP } } } catch (final IOException e) { - logger.error("Error occured.", e) ; + LOG.error("Error occured.", e) ; } } @@ -302,9 +302,9 @@ public class SmsCampaignWritePlatformServiceJpaImpl implements SmsCampaignWriteP } } } catch (final IOException e) { - logger.error("Error occured.", e) ; + LOG.error("Error occured.", e) ; } catch (final RuntimeException e) { - logger.error("Error occured.", e) ; + LOG.error("Error occured.", e) ; } } @@ -347,9 +347,9 @@ public class SmsCampaignWritePlatformServiceJpaImpl implements SmsCampaignWriteP } } } catch (final IOException e) { - logger.error("Error occured.", e) ; + LOG.error("Error occured.", e) ; } catch (final RuntimeException e) { - logger.error("Error occured.", e) ; + LOG.error("Error occured.", e) ; } } @@ -391,9 +391,9 @@ public class SmsCampaignWritePlatformServiceJpaImpl implements SmsCampaignWriteP } } } catch (final IOException e) { - logger.error("Error occured.", e) ; + LOG.error("Error occured.", e) ; } catch (final RuntimeException e) { - logger.error("Error occured.", e) ; + LOG.error("Error occured.", e) ; } } @@ -537,7 +537,7 @@ public class SmsCampaignWritePlatformServiceJpaImpl implements SmsCampaignWriteP final String response = this.genericDataService.generateJsonFromGenericResultsetData(results); resultList = new ObjectMapper().readValue(response, new TypeReference>>() {}); } catch (JsonParseException e) { - logger.info("Conversion of report query results to JSON failed", e); + LOG.info("Conversion of report query results to JSON failed", e); return resultList; } // loop changes array date to string date @@ -656,7 +656,7 @@ public class SmsCampaignWritePlatformServiceJpaImpl implements SmsCampaignWriteP LocalDateTime tenantDateNow = tenantDateTime(); LocalDateTime nextTriggerDate = smsCampaign.getNextTriggerDate(); - logger.info("tenant time {} trigger time {} {}", + LOG.info("tenant time {} trigger time {} {}", new Object[] { tenantDateNow, nextTriggerDate, JobName.UPDATE_SMS_OUTBOUND_WITH_CAMPAIGN_MESSAGE.name() }); if (nextTriggerDate.isBefore(tenantDateNow)) { insertDirectCampaignIntoSmsOutboundTable(smsCampaign); @@ -697,7 +697,7 @@ public class SmsCampaignWritePlatformServiceJpaImpl implements SmsCampaignWriteP // } // // catch (Exception e) { -// logger.error("Invalid phone number or country calling code, must contain only numbers", e); +// LOG.error("Invalid phone number or country calling code, must contain only numbers", e); // } // // return formatedPhoneNumber.toString(); diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeValueWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeValueWritePlatformServiceJpaRepositoryImpl.java index a2e3928e5..cc4d88a45 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeValueWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeValueWritePlatformServiceJpaRepositoryImpl.java @@ -42,7 +42,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class CodeValueWritePlatformServiceJpaRepositoryImpl implements CodeValueWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(CodeValueWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(CodeValueWritePlatformServiceJpaRepositoryImpl.class); private final PlatformSecurityContext context; private final CodeValueRepositoryWrapper codeValueRepositoryWrapper; @@ -102,7 +102,7 @@ public class CodeValueWritePlatformServiceJpaRepositoryImpl implements CodeValue + "' already exists", "name", name); } - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.code.value.unknown.data.integrity.issue", "Unknown data integrity issue with resource: " + realCause.getMessage()); } @@ -161,7 +161,7 @@ public class CodeValueWritePlatformServiceJpaRepositoryImpl implements CodeValue .withSubEntityId(codeValueId)// .build(); } catch (final DataIntegrityViolationException dve) { - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); final Throwable realCause = dve.getMostSpecificCause(); if (realCause.getMessage().contains("code_value")) { throw new PlatformDataIntegrityException("error.msg.codeValue.in.use", "This code value is in use", codeValueId); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeWritePlatformServiceJpaRepositoryImpl.java index aaf51e5d0..686a4654d 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeWritePlatformServiceJpaRepositoryImpl.java @@ -42,7 +42,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class CodeWritePlatformServiceJpaRepositoryImpl implements CodeWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(CodeWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(CodeWritePlatformServiceJpaRepositoryImpl.class); private final PlatformSecurityContext context; private final CodeRepository codeRepository; @@ -148,7 +148,7 @@ public class CodeWritePlatformServiceJpaRepositoryImpl implements CodeWritePlatf "name", name); } - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.cund.unknown.data.integrity.issue", "Unknown data integrity issue with resource: " + realCause.getMessage()); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/ExternalServiceWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/ExternalServiceWritePlatformServiceJpaRepositoryImpl.java index 0a8094493..3432d6b9b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/ExternalServiceWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/ExternalServiceWritePlatformServiceJpaRepositoryImpl.java @@ -41,7 +41,7 @@ import org.springframework.transaction.annotation.Transactional; public class ExternalServiceWritePlatformServiceJpaRepositoryImpl implements ExternalServiceWritePlatformService { @SuppressWarnings("unused") - private final static Logger logger = LoggerFactory.getLogger(ExternalServiceWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(ExternalServiceWritePlatformServiceJpaRepositoryImpl.class); private final PlatformSecurityContext context; private final ExternalServicesPropertiesRepositoryWrapper repositoryWrapper; diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/GlobalConfigurationWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/GlobalConfigurationWritePlatformServiceJpaRepositoryImpl.java index 4de1e7497..bf35eda06 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/GlobalConfigurationWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/GlobalConfigurationWritePlatformServiceJpaRepositoryImpl.java @@ -38,7 +38,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class GlobalConfigurationWritePlatformServiceJpaRepositoryImpl implements GlobalConfigurationWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(GlobalConfigurationWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(GlobalConfigurationWritePlatformServiceJpaRepositoryImpl.class); private final PlatformSecurityContext context; private final GlobalConfigurationRepositoryWrapper repository; @@ -107,7 +107,7 @@ public class GlobalConfigurationWritePlatformServiceJpaRepositoryImpl implements private void handleDataIntegrityIssues(final DataIntegrityViolationException dve) { final Throwable realCause = dve.getMostSpecificCause(); - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.globalConfiguration.unknown.data.integrity.issue", "Unknown data integrity issue with resource: " + realCause.getMessage()); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/AbandonedConnectionCleanupShutdownListener.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/AbandonedConnectionCleanupShutdownListener.java index bc31aa33f..1d87f2c2a 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/AbandonedConnectionCleanupShutdownListener.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/AbandonedConnectionCleanupShutdownListener.java @@ -31,7 +31,7 @@ import org.springframework.stereotype.Service; @Service public class AbandonedConnectionCleanupShutdownListener implements ApplicationListener { - private final static Logger logger = LoggerFactory.getLogger(AbandonedConnectionCleanupShutdownListener.class); + private final static Logger LOG = LoggerFactory.getLogger(AbandonedConnectionCleanupShutdownListener.class); /** * @see JobRegisterServiceImpl#onApplicationEvent(ContextClosedEvent) doc @@ -46,9 +46,9 @@ public class AbandonedConnectionCleanupShutdownListener implements ApplicationLi /*try { AbandonedConnectionCleanupThread.shutdown(); tomcat memoroy leak with mysql connector. With Drizzle not required - logger.info("Shut-down of AbandonedConnectionCleanupThread successful"); + LOG.info("Shut-down of AbandonedConnectionCleanupThread successful"); } catch (Throwable t) { - logger.error("Exception occurred while shut-down of AbandonedConnectionCleanupThread", t); + LOG.error("Exception occurred while shut-down of AbandonedConnectionCleanupThread", t); }*/ // This manually deregisters JDBC driver, which prevents Tomcat 7 from @@ -58,15 +58,15 @@ public class AbandonedConnectionCleanupShutdownListener implements ApplicationLi Driver driver = drivers.nextElement(); try { java.sql.DriverManager.deregisterDriver(driver); - logger.info("JDBC driver de-registered successfully"); + LOG.info("JDBC driver de-registered successfully"); } catch (Throwable t) { - logger.error("Exception occured while deristering jdbc driver", t); + LOG.error("Exception occured while deristering jdbc driver", t); } } try { Thread.sleep(2000L); } catch (Exception e) { - logger.error("Exception Occcured while trying to sleep.", e); + LOG.error("Exception Occcured while trying to sleep.", e); } } } \ No newline at end of file diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/DatatablesApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/DatatablesApiResource.java index 99014afcc..f53502b58 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/DatatablesApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/DatatablesApiResource.java @@ -73,7 +73,7 @@ public class DatatablesApiResource { private final ReadWriteNonCoreDataService readWriteNonCoreDataService; private final ToApiJsonSerializer toApiJsonSerializer; private final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService; - private final static org.slf4j.Logger logger = LoggerFactory.getLogger(DatatablesApiResource.class); + private final static org.slf4j.Logger LOG = LoggerFactory.getLogger(DatatablesApiResource.class); @Autowired public DatatablesApiResource(final PlatformSecurityContext context, final GenericDataService genericDataService, @@ -227,7 +227,7 @@ public class DatatablesApiResource { public String getDatatableManyEntry(@PathParam("datatable") final String datatable, @PathParam("apptableId") final Long apptableId, @PathParam("datatableId") final Long datatableId, @QueryParam("order") final String order, @Context final UriInfo uriInfo) { - logger.debug("::1 we came in the getDatatbleManyEntry apiRessource method"); + LOG.debug("::1 we came in the getDatatbleManyEntry apiRessource method"); this.context.authenticatedUser().validateHasDatatableReadPermission(datatable); diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/EntityDatatableChecksApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/EntityDatatableChecksApiResource.java index 29d2e53d5..f00651aff 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/EntityDatatableChecksApiResource.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/EntityDatatableChecksApiResource.java @@ -71,7 +71,7 @@ public class EntityDatatableChecksApiResource { private final EntityDatatableChecksReadService readEntityDatatableChecksService; private final ToApiJsonSerializer toApiJsonSerializer; private final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService; - private final static org.slf4j.Logger logger = LoggerFactory.getLogger(EntityDatatableChecksApiResource.class); + private final static org.slf4j.Logger LOG = LoggerFactory.getLogger(EntityDatatableChecksApiResource.class); @Autowired public EntityDatatableChecksApiResource(final PlatformSecurityContext context, final GenericDataService genericDataService, diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/EntityDatatableChecksWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/EntityDatatableChecksWritePlatformServiceImpl.java index c7b043124..b850e53b2 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/EntityDatatableChecksWritePlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/EntityDatatableChecksWritePlatformServiceImpl.java @@ -56,7 +56,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class EntityDatatableChecksWritePlatformServiceImpl implements EntityDatatableChecksWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(EntityDatatableChecksWritePlatformServiceImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(EntityDatatableChecksWritePlatformServiceImpl.class); private final PlatformSecurityContext context; private final EntityDatatableChecksDataValidator fromApiJsonDeserializer; @@ -105,7 +105,7 @@ public class EntityDatatableChecksWritePlatformServiceImpl implements EntityData final String foreignKeyColumnName = EntityTables.getForeignKeyColumnNameOnDatatable(entity); final boolean columnExist = datatableData.hasColumn(foreignKeyColumnName); - logger.info("{} has column {} ? {}", new Object[] { datatableData.getRegisteredTableName(), foreignKeyColumnName, columnExist }); + LOG.info("{} has column {} ? {}", new Object[] { datatableData.getRegisteredTableName(), foreignKeyColumnName, columnExist }); if (!columnExist) { throw new EntityDatatableCheckNotSupportedException(datatableData.getRegisteredTableName(), entity); } @@ -163,7 +163,7 @@ public class EntityDatatableChecksWritePlatformServiceImpl implements EntityData final String datatableName = t.getDatatableName(); final Long countEntries = readWriteNonCoreDataService.countDatatableEntries(datatableName, entityId, foreignKeyColumn); - logger.info("The are {} entries in the table {}", countEntries, datatableName); + LOG.info("The are {} entries in the table {}", countEntries, datatableName); if (countEntries.intValue() == 0) { reqDatatables.add(datatableName); } @@ -189,7 +189,7 @@ public class EntityDatatableChecksWritePlatformServiceImpl implements EntityData final String datatableName = t.getDatatableName(); final Long countEntries = readWriteNonCoreDataService.countDatatableEntries(datatableName, entityId, foreignKeyColumn); - logger.info("The are {} entries in the table {}", countEntries, datatableName); + LOG.info("The are {} entries in the table {}", countEntries, datatableName); if (countEntries.intValue() == 0) { reqDatatables.add(datatableName); } @@ -289,7 +289,7 @@ public class EntityDatatableChecksWritePlatformServiceImpl implements EntityData throw new EntityDatatableCheckAlreadyExistsException(entity, status, datatableName, productId); } - logger.error("Error occured.", dae); + LOG.error("Error occured.", dae); throw new PlatformDataIntegrityException("error.msg.report.unknown.data.integrity.issue", "Unknown data integrity issue with resource: " + realCause.getMessage()); } 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 46b2958ef..e0b8497cd 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 @@ -44,7 +44,7 @@ public class GenericDataServiceImpl implements GenericDataService { private final JdbcTemplate jdbcTemplate; private final DataSource dataSource; - private final static Logger logger = LoggerFactory.getLogger(GenericDataServiceImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(GenericDataServiceImpl.class); @Autowired public GenericDataServiceImpl(final RoutingDataSource dataSource) { @@ -197,7 +197,7 @@ public class GenericDataServiceImpl implements GenericDataService { @Override public List fillResultsetColumnHeaders(final String datatable) { - logger.debug("::3 Was inside the fill ResultSetColumnHeader"); + LOG.debug("::3 Was inside the fill ResultSetColumnHeader"); final SqlRowSet columnDefinitions = getDatatableMetaData(datatable); 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 04fee44a8..0e3cb3dda 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 @@ -67,7 +67,7 @@ import org.springframework.stereotype.Service; @Service public class ReadReportingServiceImpl implements ReadReportingService { - private final static Logger logger = LoggerFactory.getLogger(ReadReportingServiceImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(ReadReportingServiceImpl.class); private final static String REPORT_NAME_REGEX_PATTERN = "^[a-zA-Z][a-zA-Z0-9\\-_\\s]{0,48}[a-zA-Z0-9]$"; private final JdbcTemplate jdbcTemplate; @@ -127,7 +127,7 @@ public class ReadReportingServiceImpl implements ReadReportingService { final StringBuilder writer = new StringBuilder(); final List columnHeaders = result.getColumnHeaders(); - logger.info("NO. of Columns: {}", columnHeaders.size()); + LOG.info("NO. of Columns: {}", columnHeaders.size()); final Integer chSize = columnHeaders.size(); for (int i = 0; i < chSize; i++) { writer.append('"' + columnHeaders.get(i).getColumnName() + '"'); @@ -145,7 +145,7 @@ public class ReadReportingServiceImpl implements ReadReportingService { String currVal; final String doubleQuote = "\""; final String twoDoubleQuotes = doubleQuote + doubleQuote; - logger.info("NO. of Rows: {}", data.size()); + LOG.info("NO. of Rows: {}", data.size()); for (int i = 0; i < data.size(); i++) { row = data.get(i).getRow(); rSize = row.size(); @@ -177,14 +177,14 @@ public class ReadReportingServiceImpl implements ReadReportingService { final Map queryParams, final boolean isSelfServiceUserReport) { final long startTime = System.currentTimeMillis(); - logger.info("STARTING REPORT: {} Type: {}", name, type); + LOG.info("STARTING REPORT: {} Type: {}", name, type); final String sql = getSQLtoRun(name, type, queryParams, isSelfServiceUserReport); final GenericResultsetData result = this.genericDataService.fillGenericResultSet(sql); final long elapsed = System.currentTimeMillis() - startTime; - logger.info("FINISHING Report/Request Name: {} - {} Elapsed Time: {}", new Object[] { name, type, elapsed }); + LOG.info("FINISHING Report/Request Name: {} - {} Elapsed Time: {}", new Object[] { name, type, elapsed }); return result; } @@ -196,7 +196,7 @@ public class ReadReportingServiceImpl implements ReadReportingService { final Set keys = queryParams.keySet(); for (final String key : keys) { final String pValue = queryParams.get(key); - // logger.info("({} : {})", key, pValue); + // LOG.info("({} : {})", key, pValue); sql = this.genericDataService.replace(sql, key, pValue); } @@ -264,7 +264,7 @@ public class ReadReportingServiceImpl implements ReadReportingService { final List data = result.getData(); List row; - logger.info("NO. of Columns: {}", columnHeaders.size()); + LOG.info("NO. of Columns: {}", columnHeaders.size()); final Integer chSize = columnHeaders.size(); final Document document = new Document(PageSize.B0.rotate()); @@ -285,7 +285,7 @@ public class ReadReportingServiceImpl implements ReadReportingService { Integer rSize; String currColType; String currVal; - logger.info("NO. of Rows: {}", data.size()); + LOG.info("NO. of Rows: {}", data.size()); for (int i = 0; i < data.size(); i++) { row = data.get(i).getRow(); rSize = row.size(); @@ -308,7 +308,7 @@ public class ReadReportingServiceImpl implements ReadReportingService { document.close(); return genaratePdf; } catch (final Exception e) { - logger.error("error.msg.reporting.error:", e); + LOG.error("error.msg.reporting.error:", e); throw new PlatformDataIntegrityException("error.msg.exception.error", e.getMessage()); } } @@ -507,14 +507,14 @@ public class ReadReportingServiceImpl implements ReadReportingService { @Override public GenericResultsetData retrieveGenericResultSetForSmsEmailCampaign(String name, String type, Map queryParams) { final long startTime = System.currentTimeMillis(); - logger.info("STARTING REPORT: {} Type: {}", name, type); + LOG.info("STARTING REPORT: {} Type: {}", name, type); final String sql = sqlToRunForSmsEmailCampaign(name, type, queryParams); final GenericResultsetData result = this.genericDataService.fillGenericResultSet(sql); final long elapsed = System.currentTimeMillis() - startTime; - logger.info("FINISHING Report/Request Name: {} - {} Elapsed Time: {}", new Object[] { name, type, elapsed }); + LOG.info("FINISHING Report/Request Name: {} - {} Elapsed Time: {}", new Object[] { name, type, elapsed }); return result; } @@ -525,7 +525,7 @@ public class ReadReportingServiceImpl implements ReadReportingService { final Set keys = queryParams.keySet(); for (String key : keys) { final String pValue = queryParams.get(key); - // logger.info("(" + key + " : " + pValue + ")"); + // LOG.info("(" + key + " : " + pValue + ")"); key = "${" + key + "}"; sql = this.genericDataService.replace(sql, key, pValue); } @@ -554,7 +554,7 @@ public class ReadReportingServiceImpl implements ReadReportingService { final String reportPath = FileSystemContentRepository.FINERACT_BASE_DIR + File.separator + "pentahoReports" + File.separator + reportName + ".prpt"; - logger.info("Report path: {}", reportPath); + LOG.info("Report path: {}", reportPath); // load report definition final ResourceManager manager = new ResourceManager(); 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 994f52d95..ccebbd336 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 @@ -88,7 +88,7 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ private final static String CODE_VALUES_TABLE = "m_code_value"; - private final static Logger logger = LoggerFactory.getLogger(ReadWriteNonCoreDataServiceImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(ReadWriteNonCoreDataServiceImpl.class); private final static HashMap apiTypeToMySQL = new HashMap() { { @@ -206,7 +206,7 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ } private void logAsErrorUnexpectedDataIntegrityException(final Exception dve) { - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); } @Transactional @@ -751,7 +751,7 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ try { codeId = this.jdbcTemplate.queryForObject(checkColumnCodeMapping.toString(), Integer.class); } catch (final EmptyResultDataAccessException e) { - logger.info("Error occured.", e); + LOG.info("Error occured.", e); } return ObjectUtils.defaultIfNull(codeId, 0); } @@ -1135,13 +1135,13 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ pkValue = datatableId; } final String sql = getUpdateSql(grs.getColumnHeaders(), dataTableName, pkName, pkValue, changes); - logger.info("Update sql: {}", sql); + LOG.info("Update sql: {}", sql); if (StringUtils.isNotBlank(sql)) { this.jdbcTemplate.update(sql); changes.put("locale", dataParams.get("locale")); changes.put("dateFormat", "yyyy-MM-dd"); } else { - logger.info("No Changes"); + LOG.info("No Changes"); } } @@ -1242,7 +1242,7 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ private CommandProcessingResult checkMainResourceExistsWithinScope(final String appTable, final Long appTableId) { final String sql = dataScopedSQL(appTable, appTableId); - logger.info("data scoped sql: {}", sql); + LOG.info("data scoped sql: {}", sql); final SqlRowSet rs = this.jdbcTemplate.queryForRowSet(sql); if (!rs.next()) { throw new DatatableNotFoundException(appTable, appTableId); } @@ -1434,7 +1434,7 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ addSql = "insert into `" + datatable + "` (`" + fkName + "` " + insertColumns + ")" + " select " + appTableId + " as id" + selectColumns; - logger.info("{}", addSql); + LOG.info("{}", addSql); return addSql; } @@ -1485,7 +1485,7 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ + " as id" + selectColumns + " , ( SELECT SUM( code_score ) FROM m_code_value WHERE m_code_value.id IN (" + scoresId + " ) ) as score"; - logger.info("{}", vaddSql); + LOG.info("{}", vaddSql); return vaddSql; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReportWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReportWritePlatformServiceImpl.java index 459cd5d5e..850d8d669 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReportWritePlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReportWritePlatformServiceImpl.java @@ -53,7 +53,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class ReportWritePlatformServiceImpl implements ReportWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(ReportWritePlatformServiceImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(ReportWritePlatformServiceImpl.class); private final PlatformSecurityContext context; private final ReportCommandFromApiJsonDeserializer fromApiJsonDeserializer; @@ -185,7 +185,7 @@ public class ReportWritePlatformServiceImpl implements ReportWritePlatformServic "name", name); } - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.report.unknown.data.integrity.issue", "Unknown data integrity issue with resource: " + realCause.getMessage()); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/FileSystemContentRepository.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/FileSystemContentRepository.java index 54f80186d..fea1ced31 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/FileSystemContentRepository.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/FileSystemContentRepository.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; public class FileSystemContentRepository implements ContentRepository { - private final static Logger logger = LoggerFactory.getLogger(FileSystemContentRepository.class); + private final static Logger LOG = LoggerFactory.getLogger(FileSystemContentRepository.class); public static final String FINERACT_BASE_DIR = System.getProperty("user.home") + File.separator + ".fineract"; @@ -86,7 +86,7 @@ public class FileSystemContentRepository implements ContentRepository { } catch (final IOException ioe) { throw new ContentManagementException(imageName, ioe.getMessage()); } catch (IllegalArgumentException iae) { - logger.error("IllegalArgumentException due to invalid Base64 encoding: {}", base64EncodedImageString, iae); + LOG.error("IllegalArgumentException due to invalid Base64 encoding: {}", base64EncodedImageString, iae); throw iae; } return fileLocation; @@ -97,7 +97,7 @@ public class FileSystemContentRepository implements ContentRepository { final boolean fileDeleted = deleteFile(location); if (!fileDeleted) { // no need to throw an Error, simply log a warning - logger.warn("Unable to delete image associated with clients with Id {}", resourceId); + LOG.warn("Unable to delete image associated with clients with Id {}", resourceId); } } @@ -169,7 +169,7 @@ public class FileSystemContentRepository implements ContentRepository { out.flush(); out.close(); } catch (final IOException ioException) { - logger.warn("writeFileToFileSystem() IOException (logged because cause is not propagated in ContentManagementException)", ioException); + LOG.warn("writeFileToFileSystem() IOException (logged because cause is not propagated in ContentManagementException)", ioException); throw new ContentManagementException(fileName, ioException.getMessage()); } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/S3ContentRepository.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/S3ContentRepository.java index b2095264f..ed75213f5 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/S3ContentRepository.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/S3ContentRepository.java @@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory; public class S3ContentRepository implements ContentRepository { - private final static Logger logger = LoggerFactory.getLogger(S3ContentRepository.class); + private final static Logger LOG = LoggerFactory.getLogger(S3ContentRepository.class); private final String s3BucketName; private final AmazonS3 s3Client; @@ -106,10 +106,10 @@ public class S3ContentRepository implements ContentRepository { deleteObjectFromS3(location); } catch (final AmazonServiceException ase) { deleteObjectAmazonServiceExceptionMessage(ase); - logger.warn("Unable to delete image associated with clients with Id {}", resourceId); + LOG.warn("Unable to delete image associated with clients with Id {}", resourceId); } catch (final AmazonClientException ace) { deleteObjectAmazonClientExceptionMessage(ace); - logger.warn("Unable to delete image associated with clients with Id {}", resourceId); + LOG.warn("Unable to delete image associated with clients with Id {}", resourceId); } } @@ -123,11 +123,11 @@ public class S3ContentRepository implements ContentRepository { FileData fileData = null; final String fileName = documentData.fileName(); try { - logger.info("Downloading an object"); + LOG.info("Downloading an object"); final S3Object s3object = this.s3Client.getObject(new GetObjectRequest(this.s3BucketName, documentData.fileLocation())); fileData = new FileData(s3object.getObjectContent(), fileName, documentData.contentType()); } catch (final AmazonClientException ace) { - logger.error("Error occured.", ace); + LOG.error("Error occured.", ace); throw new DocumentNotFoundException(documentData.getParentEntityType(), documentData.getParentEntityId(), documentData.getId()); } return fileData; @@ -139,21 +139,21 @@ public class S3ContentRepository implements ContentRepository { final S3Object s3object = this.s3Client.getObject(new GetObjectRequest(this.s3BucketName, imageData.location())); imageData.updateContent(s3object.getObjectContent()); }catch(AmazonS3Exception e) { - logger.error("Error occured.", e); + LOG.error("Error occured.", e); } return imageData; } private void deleteObjectAmazonClientExceptionMessage(final AmazonClientException ace) { final String message = "Caught an AmazonClientException." + "Error Message: " + ace.getMessage(); - logger.error("{}", message); + LOG.error("{}", message); } private void deleteObjectAmazonServiceExceptionMessage(final AmazonServiceException ase) { final String message = "Caught an AmazonServiceException." + "Error Message: " + ase.getMessage() + "HTTP Status Code: " + ase.getStatusCode() + "AWS Error Code: " + ase.getErrorCode() + "Error Type: " + ase.getErrorType() + "Request ID: " + ase.getRequestId(); - logger.error("{}", message); + LOG.error("{}", message); } private String generateFileParentDirectory(final String entityType, final Long entityId) { @@ -172,7 +172,7 @@ public class S3ContentRepository implements ContentRepository { private void uploadDocument(final String filename, final InputStream inputStream, final String s3UploadLocation) throws ContentManagementException { try { - logger.info("Uploading a new object to S3 from a file to {}", s3UploadLocation); + LOG.info("Uploading a new object to S3 from a file to {}", s3UploadLocation); this.s3Client.putObject(new PutObjectRequest(this.s3BucketName, s3UploadLocation, inputStream, new ObjectMetadata())); } catch (final AmazonClientException ace) { final String message = ace.getMessage(); diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/data/FileData.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/data/FileData.java index e0a604987..b16a4611e 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/data/FileData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/data/FileData.java @@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory; public class FileData { - private static final Logger logger = LoggerFactory.getLogger(FileData.class); + private static final Logger LOG = LoggerFactory.getLogger(FileData.class); private final File file; private final String fileName; @@ -61,7 +61,7 @@ public class FileData { if (this.inputStream == null) { return new FileInputStream(this.file); } return this.inputStream; } catch (final FileNotFoundException e) { - logger.error("Error occured.", e); + LOG.error("Error occured.", e); return null; } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/data/ImageData.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/data/ImageData.java index 4f5b3bacb..f0096282f 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/data/ImageData.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/data/ImageData.java @@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory; public class ImageData { - private final static Logger logger = LoggerFactory.getLogger(ImageData.class); + private final static Logger LOG = LoggerFactory.getLogger(ImageData.class); @SuppressWarnings("unused") private final Long imageId; @@ -67,7 +67,7 @@ public class ImageData { return IOUtils.toByteArray(fileInputStream); } } catch (IOException e) { - logger.error("Error occured.", e); + LOG.error("Error occured.", e); } return null; } @@ -112,7 +112,7 @@ public class ImageData { out = resizeImage(this.inputStream, maxWidth != null ? maxWidth : Integer.MAX_VALUE, maxHeight != null ? maxHeight : Integer.MAX_VALUE); } catch (IOException e) { - logger.error("Error occured.", e); + LOG.error("Error occured.", e); } } else if (this.storageType.equals(StorageType.FILE_SYSTEM.getValue()) && this.file != null) { FileInputStream fis = null; @@ -120,13 +120,13 @@ public class ImageData { fis = new FileInputStream(this.file); out = resizeImage(fis, maxWidth != null ? maxWidth : Integer.MAX_VALUE, maxHeight != null ? maxHeight : Integer.MAX_VALUE); } catch (IOException ex) { - logger.error("Error occured.", ex); + LOG.error("Error occured.", ex); } finally { if (fis != null) { try { fis.close(); } catch (IOException ex) { - logger.error("Error occured.", ex); + LOG.error("Error occured.", ex); } } } @@ -181,7 +181,7 @@ public class ImageData { try { available = this.inputStream.available(); } catch (IOException e) { - logger.error("Error occured.", e); + LOG.error("Error occured.", e); } } else if (this.storageType.equals(StorageType.FILE_SYSTEM.getValue()) && this.file != null) { FileInputStream fileInputStream = null; @@ -190,15 +190,15 @@ public class ImageData { available = fileInputStream.available(); fileInputStream.close(); } catch (FileNotFoundException e) { - logger.error("Error occured.", e); + LOG.error("Error occured.", e); } catch (IOException e) { - logger.error("Error occured.", e); + LOG.error("Error occured.", e); } finally { if (fileInputStream != null) { try { fileInputStream.close(); } catch (IOException e) { - logger.error("Problem occurred in available function",e); + LOG.error("Problem occurred in available function",e); } } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/service/DocumentWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/service/DocumentWritePlatformServiceJpaRepositoryImpl.java index d2aaf95a8..57f5e08b6 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/service/DocumentWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/service/DocumentWritePlatformServiceJpaRepositoryImpl.java @@ -42,7 +42,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class DocumentWritePlatformServiceJpaRepositoryImpl implements DocumentWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(DocumentWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(DocumentWritePlatformServiceJpaRepositoryImpl.class); private final PlatformSecurityContext context; private final DocumentRepository documentRepository; @@ -80,7 +80,7 @@ public class DocumentWritePlatformServiceJpaRepositoryImpl implements DocumentWr return document.getId(); } catch (final DataIntegrityViolationException dve) { - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.document.unknown.data.integrity.issue", "Unknown data integrity issue with resource."); } @@ -136,11 +136,11 @@ public class DocumentWritePlatformServiceJpaRepositoryImpl implements DocumentWr return new CommandProcessingResult(documentForUpdate.getId()); } catch (final DataIntegrityViolationException dve) { - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.document.unknown.data.integrity.issue", "Unknown data integrity issue with resource."); } catch (final ContentManagementException cme) { - logger.error("Error occured.", cme); + LOG.error("Error occured.", cme); throw new ContentManagementException(documentCommand.getName(), cme.getMessage()); } } 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 12f6eb37d..474b3afd4 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 @@ -46,7 +46,7 @@ public class FineractEntityAccessReadServiceImpl implements FineractEntityAccess private final PlatformSecurityContext context; private final JdbcTemplate jdbcTemplate; - private final static Logger logger = LoggerFactory.getLogger(FineractEntityAccessReadServiceImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(FineractEntityAccessReadServiceImpl.class); private final FineractEntityRelationRepositoryWrapper fineractEntityRelationRepository; @Autowired @@ -106,7 +106,7 @@ public class FineractEntityAccessReadServiceImpl implements FineractEntityAccess if (accessListCSVStrBuf != null) { returnIdListStr = accessListCSVStrBuf.toString(); } - logger.debug("List of IDs applicable: {}", returnIdListStr); + LOG.debug("List of IDs applicable: {}", returnIdListStr); return returnIdListStr; } @@ -143,7 +143,7 @@ public class FineractEntityAccessReadServiceImpl implements FineractEntityAccess str.append("from m_entity_to_entity_mapping eem "); str.append("where eem.rel_id = ? "); str.append("and eem.from_id = ? "); - logger.debug("{}", str); + LOG.debug("{}", str); return str.toString(); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/Sender.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/Sender.java index a28431ab1..6989dd936 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/Sender.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/Sender.java @@ -89,7 +89,7 @@ public class Sender { protected static final int MAX_BACKOFF_DELAY = 1024000; protected final Random random = new Random(); - protected static final Logger logger = Logger.getLogger(Sender.class + protected static final Logger LOG = Logger.getLogger(Sender.class .getName()); private final String key; @@ -179,8 +179,8 @@ public class Sender { boolean tryAgain; do { attempt++; - if (logger.isLoggable(Level.FINE)) { - logger.fine("Attempt #" + attempt + " to send message " + if (LOG.isLoggable(Level.FINE)) { + LOG.fine("Attempt #" + attempt + " to send message " + message + " to regIds " + to); } result = sendNoRetry(message, to); @@ -265,7 +265,7 @@ public class Sender { .status(status) .errorCode(error); } else { - logger.log(Level.WARNING, + LOG.log(Level.WARNING, "Found null or " + jsonResults.size() + " results, expected one"); return null; @@ -280,7 +280,7 @@ public class Sender { String error = jsonResponse.get(JSON_ERROR).getAsString(); resultBuilder.errorCode(error); } else { - logger.log(Level.WARNING, "Expected " + JSON_MESSAGE_ID + LOG.log(Level.WARNING, "Expected " + JSON_MESSAGE_ID + " or " + JSON_ERROR + " found: " + responseBody); return null; } @@ -302,7 +302,7 @@ public class Sender { resultBuilder.success(success).failure(failure) .failedRegistrationIds(failedIds); } else { - logger.warning("Unrecognized response: " + responseBody); + LOG.warning("Unrecognized response: " + responseBody); throw newIoException(responseBody, new Exception( "Unrecognized response.")); } @@ -351,19 +351,19 @@ public class Sender { do { multicastResult = null; attempt++; - if (logger.isLoggable(Level.FINE)) { - logger.fine("Attempt #" + attempt + " to send message " + if (LOG.isLoggable(Level.FINE)) { + LOG.fine("Attempt #" + attempt + " to send message " + message + " to regIds " + unsentRegIds); } try { multicastResult = sendNoRetry(message, unsentRegIds); } catch (IOException e) { // no need for WARNING since exception might be already logged - logger.log(Level.FINEST, "IOException on attempt " + attempt, e); + LOG.log(Level.FINEST, "IOException on attempt " + attempt, e); } if (multicastResult != null) { long multicastId = multicastResult.getMulticastId(); - logger.fine("multicast_id on attempt # " + attempt + ": " + LOG.fine("multicast_id on attempt # " + attempt + ": " + multicastId); multicastIds.add(multicastId); unsentRegIds = updateStatus(unsentRegIds, results, @@ -516,37 +516,37 @@ public class Sender { private Map makeGcmHttpRequest(Map jsonRequest) throws InvalidRequestException { String requestBody = new Gson().toJson(jsonRequest); - logger.finest("JSON request: " + requestBody); + LOG.finest("JSON request: " + requestBody); HttpURLConnection conn; int status; try { conn = post(getEndpoint(), "application/json", requestBody); status = conn.getResponseCode(); } catch (IOException e) { - logger.log(Level.FINE, "IOException posting to GCM", e); + LOG.log(Level.FINE, "IOException posting to GCM", e); return null; } String responseBody; if (status != 200) { try { responseBody = getAndClose(conn.getErrorStream()); - logger.finest("JSON error response: " + responseBody); + LOG.finest("JSON error response: " + responseBody); } catch (IOException e) { // ignore the exception since it will thrown an // InvalidRequestException // anyways responseBody = "N/A"; - logger.log(Level.FINE, "Exception reading response: ", e); + LOG.log(Level.FINE, "Exception reading response: ", e); } throw new InvalidRequestException(status, responseBody); } try { responseBody = getAndClose(conn.getInputStream()); } catch (IOException e) { - logger.log(Level.WARNING, "IOException reading response", e); + LOG.log(Level.WARNING, "IOException reading response", e); return null; } - logger.finest("JSON response: " + responseBody); + LOG.finest("JSON response: " + responseBody); Map map = new HashMap<>(); map.put("responseBody", responseBody); map.put("status", status); @@ -612,7 +612,7 @@ public class Sender { // cause // is only available on Java 6 String msg = "Error parsing JSON response (" + responseBody + ")"; - logger.log(Level.WARNING, msg, e); + LOG.log(Level.WARNING, msg, e); return new IOException(msg + ":" + e); } @@ -622,7 +622,7 @@ public class Sender { closeable.close(); } catch (IOException e) { // ignore error - logger.log(Level.FINEST, "IOException closing stream", e); + LOG.log(Level.FINEST, "IOException closing stream", e); } } } @@ -692,10 +692,10 @@ public class Sender { throw new IllegalArgumentException("arguments cannot be null"); } if (!url.startsWith("https://")) { - logger.warning("URL does not use https: " + url); + LOG.warning("URL does not use https: " + url); } - logger.fine("Sending POST to " + url); - logger.finest("POST body: " + body); + LOG.fine("Sending POST to " + url); + LOG.finest("POST body: " + body); byte[] bytes = body.getBytes(StandardCharsets.UTF_8); HttpURLConnection conn = getConnection(url); conn.setDoOutput(true); diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/processor/ProcessorHelper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/processor/ProcessorHelper.java index c6688fc12..d63add6cb 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/processor/ProcessorHelper.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/processor/ProcessorHelper.java @@ -38,7 +38,7 @@ import retrofit.client.Response; @SuppressWarnings("unused") public class ProcessorHelper { - private final static Logger logger = LoggerFactory + private final static Logger LOG = LoggerFactory .getLogger(ProcessorHelper.class); @SuppressWarnings("null") @@ -95,12 +95,12 @@ public class ProcessorHelper { return new Callback() { @Override public void success(final Object o, final Response response) { - logger.info("URL: {}\tStatus: {}", url, response.getStatus()); + LOG.info("URL: {}\tStatus: {}", url, response.getStatus()); } @Override public void failure(final RetrofitError retrofitError) { - logger.info("Error occured.", retrofitError); + LOG.info("Error occured.", retrofitError); } }; } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/JobRegisterServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/JobRegisterServiceImpl.java index f3dfdde3b..f4002ad2c 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/JobRegisterServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/JobRegisterServiceImpl.java @@ -66,7 +66,7 @@ import org.springframework.stereotype.Service; @Service public class JobRegisterServiceImpl implements JobRegisterService, ApplicationListener { - private final static Logger logger = LoggerFactory.getLogger(JobRegisterServiceImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(JobRegisterServiceImpl.class); // MIFOSX-1184: This class cannot use constructor injection, because one of // its dependencies (SchedulerStopListener) has a circular dependency to @@ -164,7 +164,7 @@ public class JobRegisterServiceImpl implements JobRegisterService, ApplicationLi } catch (final Exception e) { final String msg = "Job execution failed for job with id:" + scheduledJobDetail.getId(); - logger.error("{}", msg, e); + LOG.error("{}", msg, e); throw new PlatformInternalServerException("error.msg.sheduler.job.execution.failed", msg, scheduledJobDetail.getId()); } @@ -223,7 +223,7 @@ public class JobRegisterServiceImpl implements JobRegisterService, ApplicationLi } } } catch (final SchedulerException e) { - logger.error("Error occured.", e); + LOG.error("Error occured.", e); } } jobDetail.updateTriggerMisfired(false); @@ -281,7 +281,7 @@ public class JobRegisterServiceImpl implements JobRegisterService, ApplicationLi scheduledJobDetails.updateNextRunTime(null); final String stackTrace = getStackTraceAsString(throwable); scheduledJobDetails.updateErrorLog(stackTrace); - logger.error("Could not schedule job: {}", scheduledJobDetails.getJobName(), throwable); + LOG.error("Could not schedule job: {}", scheduledJobDetails.getJobName(), throwable); } scheduledJobDetails.updateCurrentlyRunningStatus(false); } @@ -292,7 +292,7 @@ public class JobRegisterServiceImpl implements JobRegisterService, ApplicationLi try { scheduler.shutdown(); } catch (final SchedulerException e) { - logger.error("Error occured.", e); + LOG.error("Error occured.", e); } } } @@ -317,7 +317,7 @@ public class JobRegisterServiceImpl implements JobRegisterService, ApplicationLi try { scheduler.shutdown(); } catch (final SchedulerException e) { - logger.error("Error occured.", e); + LOG.error("Error occured.", e); } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedulerTriggerListener.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedulerTriggerListener.java index f89cb855b..5d9177d45 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedulerTriggerListener.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedulerTriggerListener.java @@ -35,7 +35,7 @@ import org.springframework.stereotype.Component; @Component public class SchedulerTriggerListener implements TriggerListener { - private final static Logger logger = LoggerFactory.getLogger(SchedulerTriggerListener.class); + private final static Logger LOG = LoggerFactory.getLogger(SchedulerTriggerListener.class); private final SchedularWritePlatformService schedularService; private final TenantDetailsService tenantDetailsService; @@ -54,7 +54,7 @@ public class SchedulerTriggerListener implements TriggerListener { @Override public void triggerFired(Trigger trigger, JobExecutionContext context) { - logger.debug("triggerFired() trigger={}, context={}", trigger, context); + LOG.debug("triggerFired() trigger={}, context={}", trigger, context); } @Override @@ -77,7 +77,7 @@ public class SchedulerTriggerListener implements TriggerListener { vetoJob = this.schedularService.processJobDetailForExecution(jobKey, triggerType); numberOfRetries = maxNumberOfRetries + 1; } catch (Exception exception) { // Adding generic exception as it depends on JPA provider - logger.warn("vetoJobExecution() not able to acquire the lock to update job running status at retry {} (of {}) for JobKey: {}", + LOG.warn("vetoJobExecution() not able to acquire the lock to update job running status at retry {} (of {}) for JobKey: {}", numberOfRetries, maxNumberOfRetries, jobKey, exception); try { Random random = new Random(); @@ -85,12 +85,12 @@ public class SchedulerTriggerListener implements TriggerListener { Thread.sleep(1000 + (randomNum * 1000)); numberOfRetries = numberOfRetries + 1; } catch (InterruptedException e) { - logger.error("vetoJobExecution() caught an InterruptedException", e); + LOG.error("vetoJobExecution() caught an InterruptedException", e); } } } if (vetoJob) { - logger.warn("vetoJobExecution() WILL veto the execution (returning vetoJob == true; the job's execute method will NOT be called); " + LOG.warn("vetoJobExecution() WILL veto the execution (returning vetoJob == true; the job's execute method will NOT be called); " + "maxNumberOfRetries={}, tenant={}, jobKey={}, triggerType={}, trigger={}, context={}", maxNumberOfRetries, tenantIdentifier, jobKey, triggerType, trigger, context); } @@ -99,11 +99,11 @@ public class SchedulerTriggerListener implements TriggerListener { @Override public void triggerMisfired(final Trigger trigger) { - logger.error("triggerMisfired() trigger={}", trigger); + LOG.error("triggerMisfired() trigger={}", trigger); } @Override public void triggerComplete(Trigger trigger, JobExecutionContext context, CompletedExecutionInstruction triggerInstructionCode) { - logger.debug("triggerComplete() trigger={}, context={}, completedExecutionInstruction={}", trigger, context, triggerInstructionCode); + LOG.debug("triggerComplete() trigger={}, context={}, completedExecutionInstruction={}", trigger, context, triggerInstructionCode); } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobEmailServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobEmailServiceImpl.java index 5e09beac8..bc28b65dd 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobEmailServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobEmailServiceImpl.java @@ -35,7 +35,7 @@ import org.springframework.stereotype.Service; @Service public class ReportMailingJobEmailServiceImpl implements ReportMailingJobEmailService { - private final static Logger logger = LoggerFactory.getLogger(ReportMailingJobEmailServiceImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(ReportMailingJobEmailServiceImpl.class); private final ReportMailingJobConfigurationReadPlatformService reportMailingJobConfigurationReadPlatformService; private Collection reportMailingJobConfigurationDataCollection; @@ -80,7 +80,7 @@ public class ReportMailingJobEmailServiceImpl implements ReportMailingJobEmailSe catch (MessagingException e) { // handle the exception - logger.error("Problem occurred in sendEmailWithAttachment function",e); + LOG.error("Problem occurred in sendEmailWithAttachment function",e); } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobWritePlatformServiceImpl.java index cf37d2076..d097a26f1 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobWritePlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobWritePlatformServiceImpl.java @@ -73,7 +73,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class ReportMailingJobWritePlatformServiceImpl implements ReportMailingJobWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(ReportMailingJobWritePlatformServiceImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(ReportMailingJobWritePlatformServiceImpl.class); private final ReportRepositoryWrapper reportRepositoryWrapper; private final ReportMailingJobValidator reportMailingJobValidator; private final ReportMailingJobRepositoryWrapper reportMailingJobRepositoryWrapper; @@ -399,7 +399,7 @@ public class ReportMailingJobWritePlatformServiceImpl implements ReportMailingJo ReportMailingJobConstants.NAME_PARAM_NAME, name); } - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.charge.unknown.data.integrity.issue", "Unknown data integrity issue with resource: " + realCause.getMessage()); diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareBasicAuthenticationFilter.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareBasicAuthenticationFilter.java index 3cc47555f..59daec0c4 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareBasicAuthenticationFilter.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareBasicAuthenticationFilter.java @@ -67,7 +67,7 @@ import org.springframework.stereotype.Service; public class TenantAwareBasicAuthenticationFilter extends BasicAuthenticationFilter { private static boolean firstRequestProcessed = false; - private final static Logger logger = LoggerFactory.getLogger(TenantAwareBasicAuthenticationFilter.class); + private final static Logger LOG = LoggerFactory.getLogger(TenantAwareBasicAuthenticationFilter.class); private final BasicAuthTenantDetailsService basicAuthTenantDetailsService; private final ToApiJsonSerializer toApiJsonSerializer; @@ -152,7 +152,7 @@ public class TenantAwareBasicAuthenticationFilter extends BasicAuthenticationFil } finally { task.stop(); final PlatformRequestLog log = PlatformRequestLog.from(task, request); - logger.debug("{}", this.toApiJsonSerializer.serialize(log)); + LOG.debug("{}", this.toApiJsonSerializer.serialize(log)); } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareTenantIdentifierFilter.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareTenantIdentifierFilter.java index 780bf58e1..5eebe17f7 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareTenantIdentifierFilter.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareTenantIdentifierFilter.java @@ -61,7 +61,7 @@ import org.springframework.web.filter.GenericFilterBean; public class TenantAwareTenantIdentifierFilter extends GenericFilterBean { private static boolean firstRequestProcessed = false; - private final static Logger logger = LoggerFactory.getLogger(TenantAwareTenantIdentifierFilter.class); + private final static Logger LOG = LoggerFactory.getLogger(TenantAwareTenantIdentifierFilter.class); private final BasicAuthTenantDetailsService basicAuthTenantDetailsService; private final ToApiJsonSerializer toApiJsonSerializer; @@ -152,7 +152,7 @@ public class TenantAwareTenantIdentifierFilter extends GenericFilterBean { } finally { task.stop(); final PlatformRequestLog log = PlatformRequestLog.from(task, request); - logger.info("{}", this.toApiJsonSerializer.serialize(log)); + LOG.info("{}", this.toApiJsonSerializer.serialize(log)); } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/CustomAuthenticationFailureHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/CustomAuthenticationFailureHandler.java index 24641809f..0edc6bd35 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/CustomAuthenticationFailureHandler.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/CustomAuthenticationFailureHandler.java @@ -35,7 +35,7 @@ import org.springframework.util.Assert; public class CustomAuthenticationFailureHandler implements AuthenticationFailureHandler { - protected final Logger logger = LoggerFactory.getLogger(getClass()); + protected final Logger LOG = LoggerFactory.getLogger(getClass()); private String defaultFailureUrl; private boolean forwardToDestination = false; @@ -56,18 +56,18 @@ public class CustomAuthenticationFailureHandler implements AuthenticationFailure final AuthenticationException exception) throws IOException, ServletException { if (this.defaultFailureUrl == null) { - this.logger.debug("No failure URL set, sending 401 Unauthorized error"); + this.LOG.debug("No failure URL set, sending 401 Unauthorized error"); response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Authentication Failed: " + exception.getMessage()); } else { saveException(request, exception); if (this.forwardToDestination) { - this.logger.debug("Forwarding to {}", this.defaultFailureUrl); + this.LOG.debug("Forwarding to {}", this.defaultFailureUrl); request.getRequestDispatcher(this.defaultFailureUrl).forward(request, response); } else { - this.logger.debug("Redirecting to {}", this.defaultFailureUrl); + this.LOG.debug("Redirecting to {}", this.defaultFailureUrl); final String oauthToken = request.getParameter("oauth_token"); request.setAttribute("oauth_token", oauthToken); diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/SpringSecurityPlatformSecurityContext.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/SpringSecurityPlatformSecurityContext.java index 112ae432d..6b9df7947 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/SpringSecurityPlatformSecurityContext.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/SpringSecurityPlatformSecurityContext.java @@ -44,7 +44,7 @@ import org.springframework.stereotype.Service; @Service public class SpringSecurityPlatformSecurityContext implements PlatformSecurityContext { - // private final static Logger logger = + // private final static Logger LOG = // LoggerFactory.getLogger(SpringSecurityPlatformSecurityContext.class); private final ConfigurationDomainService configurationDomainService; diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/scheduler/SmsMessageScheduledJobServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/scheduler/SmsMessageScheduledJobServiceImpl.java index 4b466b837..9109e6eed 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/scheduler/SmsMessageScheduledJobServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/scheduler/SmsMessageScheduledJobServiceImpl.java @@ -69,7 +69,7 @@ public class SmsMessageScheduledJobServiceImpl implements SmsMessageScheduledJob private final SmsMessageRepository smsMessageRepository; private final SmsReadPlatformService smsReadPlatformService; - private static final Logger logger = LoggerFactory.getLogger(SmsMessageScheduledJobServiceImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(SmsMessageScheduledJobServiceImpl.class); private final RestTemplate restTemplate = new RestTemplate(); private ExecutorService genericExecutorService ; private ExecutorService triggeredExecutorService ; @@ -168,7 +168,7 @@ public class SmsMessageScheduledJobServiceImpl implements SmsMessageScheduledJob @Override public void onApplicationEvent(ContextClosedEvent event) { genericExecutorService.shutdown(); - logger.info("Shutting down the ExecutorService"); + LOG.info("Shutting down the ExecutorService"); } } @@ -181,7 +181,7 @@ public class SmsMessageScheduledJobServiceImpl implements SmsMessageScheduledJob if (responseOne != null) { // String smsResponse = responseOne.getBody(); if (!responseOne.getStatusCode().equals(HttpStatus.ACCEPTED)) { - logger.debug("{}", responseOne.getStatusCode().name()); + LOG.debug("{}", responseOne.getStatusCode().name()); throw new ConnectionFailureException(SmsCampaignConstants.SMS); } } @@ -223,7 +223,7 @@ public class SmsMessageScheduledJobServiceImpl implements SmsMessageScheduledJob } } } catch (Exception e) { - logger.error("Error occured.", e); + LOG.error("Error occured.", e); } } @@ -242,11 +242,11 @@ public class SmsMessageScheduledJobServiceImpl implements SmsMessageScheduledJob } this.smsMessageRepository.saveAll(smsMessages); request.append(SmsMessageApiQueueResourceData.toJsonString(apiQueueResourceDatas)); - logger.info("Sending triggered SMS to specific provider with request - {}", request); + LOG.info("Sending triggered SMS to specific provider with request - {}", request); this.triggeredExecutorService.execute(new SmsTask(ThreadLocalContextUtil.getTenant(), apiQueueResourceDatas)); } catch (Exception e) { - logger.error("Error occured.", e); + LOG.error("Error occured.", e); } } @@ -320,19 +320,19 @@ public class SmsMessageScheduledJobServiceImpl implements SmsMessageScheduledJob this.smsMessageRepository.save(smsMessage); if (statusChanged) { - logger.info("Status of SMS message id: {} successfully changed to {}", smsMessage.getId(), statusType); + LOG.info("Status of SMS message id: {} successfully changed to {}", smsMessage.getId(), statusType); } } } if (smsMessageDeliveryReportDatas.size() > 0) { - logger.info("{} delivery report(s) successfully received from the intermediate gateway - sms", smsMessageDeliveryReportDatas.size()); + LOG.info("{} delivery report(s) successfully received from the intermediate gateway - sms", smsMessageDeliveryReportDatas.size()); } } } catch (Exception e) { - logger.error("Error occured.", e); + LOG.error("Error occured.", e); } page ++; totalRecords = smsMessageInternalIds.getTotalFilteredRecords(); diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/service/SmsWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/service/SmsWritePlatformServiceJpaRepositoryImpl.java index 6f5a25b20..6b2e68d24 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/service/SmsWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/service/SmsWritePlatformServiceJpaRepositoryImpl.java @@ -37,7 +37,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class SmsWritePlatformServiceJpaRepositoryImpl implements SmsWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(SmsWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(SmsWritePlatformServiceJpaRepositoryImpl.class); private final SmsMessageAssembler assembler; private final SmsMessageRepository repository; @@ -126,7 +126,7 @@ public class SmsWritePlatformServiceJpaRepositoryImpl implements SmsWritePlatfor if (realCause.getMessage().contains("mobile_no")) { throw new PlatformDataIntegrityException("error.msg.sms.no.mobile.no.exists", "The group, client or staff provided has no mobile no.", "id"); } - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.sms.unknown.data.integrity.issue", "Unknown data integrity issue with resource: " + realCause.getMessage()); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/WriteLikelihoodServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/WriteLikelihoodServiceImpl.java index a4a9596bb..5baad04d0 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/WriteLikelihoodServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/WriteLikelihoodServiceImpl.java @@ -39,7 +39,7 @@ import org.springframework.stereotype.Service; @Service public class WriteLikelihoodServiceImpl implements WriteLikelihoodService { - private final static Logger logger = LoggerFactory.getLogger(WriteLikelihoodServiceImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(WriteLikelihoodServiceImpl.class); private final PlatformSecurityContext context; private final LikelihoodDataValidator likelihoodDataValidator; private final LikelihoodRepository repository; @@ -95,7 +95,7 @@ public class WriteLikelihoodServiceImpl implements WriteLikelihoodService { private void handleDataIntegrityIssues(final DataIntegrityViolationException dve) { final Throwable realCause = dve.getMostSpecificCause(); - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.likelihood.unknown.data.integrity.issue", "Unknown data integrity issue with resource: " + realCause.getMessage()); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayWritePlatformServiceJpaRepositoryImpl.java index 1a8bf22d6..101c6d4b2 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayWritePlatformServiceJpaRepositoryImpl.java @@ -54,7 +54,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class HolidayWritePlatformServiceJpaRepositoryImpl implements HolidayWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(HolidayWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(HolidayWritePlatformServiceJpaRepositoryImpl.class); private final HolidayDataValidator fromApiJsonDeserializer; private final HolidayRepositoryWrapper holidayRepository; @@ -183,7 +183,7 @@ public class HolidayWritePlatformServiceJpaRepositoryImpl implements HolidayWrit "name", name); } - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.office.unknown.data.integrity.issue", "Unknown data integrity issue with resource."); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/service/OfficeWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/service/OfficeWritePlatformServiceJpaRepositoryImpl.java index d17242bea..21ae535fe 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/service/OfficeWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/service/OfficeWritePlatformServiceJpaRepositoryImpl.java @@ -51,7 +51,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class OfficeWritePlatformServiceJpaRepositoryImpl implements OfficeWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(OfficeWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(OfficeWritePlatformServiceJpaRepositoryImpl.class); private final PlatformSecurityContext context; private final OfficeCommandFromApiJsonDeserializer fromApiJsonDeserializer; @@ -239,7 +239,7 @@ public class OfficeWritePlatformServiceJpaRepositoryImpl implements OfficeWriteP "name", name); } - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.office.unknown.data.integrity.issue", "Unknown data integrity issue with resource."); } 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 79c1ae8ba..212e0cf07 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 @@ -41,7 +41,7 @@ import org.springframework.stereotype.Service; @Service public class ProvisioningCategoryWritePlatformServiceJpaRepositoryImpl implements ProvisioningCategoryWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(ProvisioningCategoryWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(ProvisioningCategoryWritePlatformServiceJpaRepositoryImpl.class); private final ProvisioningCategoryRepository provisioningCategoryRepository; @@ -125,7 +125,7 @@ public class ProvisioningCategoryWritePlatformServiceJpaRepositoryImpl implement throw new PlatformDataIntegrityException("error.msg.provisioning.duplicate.categoryname", "Provisioning Cateory with name `" + name + "` already exists", "category name", name); } - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.charge.unknown.data.integrity.issue", "Unknown data integrity issue with resource: " + realCause.getMessage()); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCriteriaWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCriteriaWritePlatformServiceJpaRepositoryImpl.java index 3601d4e9f..bc86c2d75 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCriteriaWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCriteriaWritePlatformServiceJpaRepositoryImpl.java @@ -53,7 +53,7 @@ import org.springframework.stereotype.Service; @Service public class ProvisioningCriteriaWritePlatformServiceJpaRepositoryImpl implements ProvisioningCriteriaWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(ProvisioningCriteriaWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(ProvisioningCriteriaWritePlatformServiceJpaRepositoryImpl.class); private final ProvisioningCriteriaDefinitionJsonDeserializer fromApiJsonDeserializer; private final ProvisioningCriteriaAssembler provisioningCriteriaAssembler; @@ -169,7 +169,7 @@ public class ProvisioningCriteriaWritePlatformServiceJpaRepositoryImpl implement "error.msg.provisioning.product.id(s).already.associated.existing.criteria", "The selected products already associated with another Provisioning Criteria"); } - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.provisioning.unknown.data.integrity.issue", "Unknown data integrity issue with resource: " + realCause.getMessage()); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffWritePlatformServiceJpaRepositoryImpl.java index 3eb8c247e..44ad74037 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffWritePlatformServiceJpaRepositoryImpl.java @@ -42,7 +42,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class StaffWritePlatformServiceJpaRepositoryImpl implements StaffWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(StaffWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(StaffWritePlatformServiceJpaRepositoryImpl.class); private final StaffCommandFromApiJsonDeserializer fromApiJsonDeserializer; private final StaffRepository staffRepository; @@ -139,7 +139,7 @@ public class StaffWritePlatformServiceJpaRepositoryImpl implements StaffWritePla + displayName + "' already exists", "displayName", displayName); } - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.staff.unknown.data.integrity.issue", "Unknown data integrity issue with resource: " + realCause.getMessage()); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerWritePlatformServiceJpaImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerWritePlatformServiceJpaImpl.java index 941a35dbd..68584bd07 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerWritePlatformServiceJpaImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerWritePlatformServiceJpaImpl.java @@ -63,7 +63,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class TellerWritePlatformServiceJpaImpl implements TellerWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(TellerWritePlatformServiceJpaImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(TellerWritePlatformServiceJpaImpl.class); private final PlatformSecurityContext context; private final TellerCommandFromApiJsonDeserializer fromApiJsonDeserializer; @@ -211,7 +211,7 @@ public class TellerWritePlatformServiceJpaImpl implements TellerWritePlatformSer "name", name); } - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.teller.unknown.data.integrity.issue", "Unknown data integrity issue with resource."); } 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 9f6a9bb0c..8c1f35c2e 100755 --- 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 @@ -41,7 +41,7 @@ import org.springframework.stereotype.Service; @Service public class AccountAssociationsReadPlatformServiceImpl implements AccountAssociationsReadPlatformService { - private final static Logger logger = LoggerFactory.getLogger(AccountAssociationsReadPlatformServiceImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(AccountAssociationsReadPlatformServiceImpl.class); private final JdbcTemplate jdbcTemplate; @Autowired @@ -61,7 +61,7 @@ public class AccountAssociationsReadPlatformServiceImpl implements AccountAssoci linkedAccount = accountAssociationsData.linkedAccount(); } } catch (final EmptyResultDataAccessException e) { - logger.debug("Linking account is not configured"); + LOG.debug("Linking account is not configured"); } return linkedAccount; } @@ -90,7 +90,7 @@ public class AccountAssociationsReadPlatformServiceImpl implements AccountAssoci linkedAccount = accountAssociationsData.linkedAccount(); } } catch (final EmptyResultDataAccessException e) { - logger.debug("Linking account is not configured"); + LOG.debug("Linking account is not configured"); } return linkedAccount; } 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 28ca79112..97df20911 100755 --- 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 @@ -71,7 +71,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class StandingInstructionWritePlatformServiceImpl implements StandingInstructionWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(StandingInstructionWritePlatformServiceImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(StandingInstructionWritePlatformServiceImpl.class); private final StandingInstructionDataValidator standingInstructionDataValidator; private final StandingInstructionAssembler standingInstructionAssembler; @@ -146,7 +146,7 @@ public class StandingInstructionWritePlatformServiceImpl implements StandingInst throw new PlatformDataIntegrityException("error.msg.standinginstruction.duplicate.name", "Standinginstruction with name `" + name + "` already exists", "name", name); } - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.client.unknown.data.integrity.issue", "Unknown data integrity issue with resource."); } 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 78561f06f..f5c08a6c4 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 @@ -56,7 +56,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class ChargeWritePlatformServiceJpaRepositoryImpl implements ChargeWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(ChargeWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(ChargeWritePlatformServiceJpaRepositoryImpl.class); private final PlatformSecurityContext context; private final ChargeDefinitionCommandFromApiJsonDeserializer fromApiJsonDeserializer; private final JdbcTemplate jdbcTemplate; @@ -233,7 +233,7 @@ public class ChargeWritePlatformServiceJpaRepositoryImpl implements ChargeWriteP "name", name); } - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.charge.unknown.data.integrity.issue", "Unknown data integrity issue with resource: " + realCause.getMessage()); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientChargeWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientChargeWritePlatformServiceJpaRepositoryImpl.java index 8a01ded1e..5a79aad45 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientChargeWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientChargeWritePlatformServiceJpaRepositoryImpl.java @@ -65,7 +65,7 @@ import org.springframework.stereotype.Service; @Service public class ClientChargeWritePlatformServiceJpaRepositoryImpl implements ClientChargeWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(ClientChargeWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(ClientChargeWritePlatformServiceJpaRepositoryImpl.class); private final PlatformSecurityContext context; private final ChargeRepositoryWrapper chargeRepository; @@ -438,7 +438,7 @@ public class ClientChargeWritePlatformServiceJpaRepositoryImpl implements Client "Client charge with id `" + clientChargeId + "` cannot be deleted as transactions have been made on the same", "clientChargeId", clientChargeId); } - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.client.charges.unknown.data.integrity.issue", "Unknown data integrity issue with resource."); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientIdentifierWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientIdentifierWritePlatformServiceJpaRepositoryImpl.java index 3f3a15198..e8f00369b 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientIdentifierWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientIdentifierWritePlatformServiceJpaRepositoryImpl.java @@ -47,7 +47,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class ClientIdentifierWritePlatformServiceJpaRepositoryImpl implements ClientIdentifierWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(ClientIdentifierWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(ClientIdentifierWritePlatformServiceJpaRepositoryImpl.class); private final PlatformSecurityContext context; private final ClientRepositoryWrapper clientRepository; @@ -200,6 +200,6 @@ public class ClientIdentifierWritePlatformServiceJpaRepositoryImpl implements Cl } private void logAsErrorUnexpectedDataIntegrityException(final Exception dve) { - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java index fd7f60a9a..4c9821901 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java @@ -96,7 +96,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class ClientWritePlatformServiceJpaRepositoryImpl implements ClientWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(ClientWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(ClientWritePlatformServiceJpaRepositoryImpl.class); private final PlatformSecurityContext context; private final ClientRepositoryWrapper clientRepository; @@ -184,7 +184,7 @@ public class ClientWritePlatformServiceJpaRepositoryImpl implements ClientWriteP .build(); } catch (DataIntegrityViolationException dve) { Throwable throwable = ExceptionUtils.getRootCause(dve.getCause()) ; - logger.error("Error occured.", throwable); + LOG.error("Error occured.", throwable); throw new PlatformDataIntegrityException("error.msg.client.unknown.data.integrity.issue", "Unknown data integrity issue with resource."); } @@ -619,7 +619,7 @@ public class ClientWritePlatformServiceJpaRepositoryImpl implements ClientWriteP } private void logAsErrorUnexpectedDataIntegrityException(final Exception dve) { - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); } @Transactional diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/service/CollateralWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/service/CollateralWritePlatformServiceJpaRepositoryImpl.java index cb24b12d5..b04aa049e 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/service/CollateralWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/service/CollateralWritePlatformServiceJpaRepositoryImpl.java @@ -51,7 +51,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class CollateralWritePlatformServiceJpaRepositoryImpl implements CollateralWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(CollateralWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(CollateralWritePlatformServiceJpaRepositoryImpl.class); private final PlatformSecurityContext context; private final LoanRepositoryWrapper loanRepositoryWrapper; @@ -177,7 +177,7 @@ public class CollateralWritePlatformServiceJpaRepositoryImpl implements Collater } private void logAsErrorUnexpectedDataIntegrityException(final DataIntegrityViolationException dve) { - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRateWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRateWritePlatformServiceImpl.java index e80a990f2..f4102a24b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRateWritePlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRateWritePlatformServiceImpl.java @@ -41,7 +41,7 @@ import org.springframework.transaction.annotation.Transactional; public class FloatingRateWritePlatformServiceImpl implements FloatingRateWritePlatformService { - private final static Logger logger = LoggerFactory + private final static Logger LOG = LoggerFactory .getLogger(FloatingRateWritePlatformServiceImpl.class); private final PlatformSecurityContext context; private final FloatingRateDataValidator fromApiJsonDeserializer; @@ -138,7 +138,7 @@ public class FloatingRateWritePlatformServiceImpl implements private void logAsErrorUnexpectedDataIntegrityException( Exception dve) { - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/fund/service/FundWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/fund/service/FundWritePlatformServiceJpaRepositoryImpl.java index 7dadc1ad2..5c76ea21f 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/fund/service/FundWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/fund/service/FundWritePlatformServiceJpaRepositoryImpl.java @@ -41,7 +41,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class FundWritePlatformServiceJpaRepositoryImpl implements FundWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(FundWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(FundWritePlatformServiceJpaRepositoryImpl.class); private final PlatformSecurityContext context; private final FundCommandFromApiJsonDeserializer fromApiJsonDeserializer; @@ -124,7 +124,7 @@ public class FundWritePlatformServiceJpaRepositoryImpl implements FundWritePlatf "name", name); } - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.fund.unknown.data.integrity.issue", "Unknown data integrity issue with resource: " + realCause.getMessage()); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupRolesWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupRolesWritePlatformServiceJpaRepositoryImpl.java index beddf4498..4265d9928 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupRolesWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupRolesWritePlatformServiceJpaRepositoryImpl.java @@ -44,7 +44,7 @@ import org.springframework.stereotype.Service; @Service public class GroupRolesWritePlatformServiceJpaRepositoryImpl implements GroupRolesWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(GroupRolesWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(GroupRolesWritePlatformServiceJpaRepositoryImpl.class); private final PlatformSecurityContext context; private final GroupRepositoryWrapper groupRepository; @@ -106,7 +106,7 @@ public class GroupRolesWritePlatformServiceJpaRepositoryImpl implements GroupRol GroupingTypesApiConstants.clientIdParamName, roleId, clientId, command.getGroupId()); } - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.group.unknown.data.integrity.issue", "Unknown data integrity issue with resource."); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupingTypesWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupingTypesWritePlatformServiceJpaRepositoryImpl.java index 4bc9d2107..e0c1ffe6b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupingTypesWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupingTypesWritePlatformServiceJpaRepositoryImpl.java @@ -96,7 +96,7 @@ import org.springframework.util.ObjectUtils; @Service public class GroupingTypesWritePlatformServiceJpaRepositoryImpl implements GroupingTypesWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(GroupingTypesWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(GroupingTypesWritePlatformServiceJpaRepositoryImpl.class); private final PlatformSecurityContext context; private final GroupRepositoryWrapper groupRepository; @@ -603,7 +603,7 @@ public class GroupingTypesWritePlatformServiceJpaRepositoryImpl implements Group .build(); } catch (DataIntegrityViolationException dve) { Throwable throwable = ExceptionUtils.getRootCause(dve.getCause()); - logger.error("Error occured.", throwable); + LOG.error("Error occured.", throwable); throw new PlatformDataIntegrityException("error.msg.group.unknown.data.integrity.issue", "Unknown data integrity issue with resource."); } @@ -798,7 +798,7 @@ public class GroupingTypesWritePlatformServiceJpaRepositoryImpl implements Group name); } - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.group.unknown.data.integrity.issue", "Unknown data integrity issue with resource."); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartSlabWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartSlabWritePlatformServiceJpaRepositoryImpl.java index 021b9ca41..ada128c97 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartSlabWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartSlabWritePlatformServiceJpaRepositoryImpl.java @@ -40,7 +40,7 @@ import org.springframework.transaction.annotation.Transactional; public class InterestRateChartSlabWritePlatformServiceJpaRepositoryImpl implements InterestRateChartSlabWritePlatformService { @SuppressWarnings("unused") - private final static Logger logger = LoggerFactory.getLogger(InterestRateChartSlabWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(InterestRateChartSlabWritePlatformServiceJpaRepositoryImpl.class); @SuppressWarnings("unused") private final PlatformSecurityContext context; private final InterestRateChartSlabDataValidator interestRateChartSlabDataValidator; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartWritePlatformServiceJpaRepositoryImpl.java index 33acb68e0..a8990c146 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartWritePlatformServiceJpaRepositoryImpl.java @@ -37,7 +37,7 @@ import org.springframework.transaction.annotation.Transactional; public class InterestRateChartWritePlatformServiceJpaRepositoryImpl implements InterestRateChartWritePlatformService { @SuppressWarnings("unused") - private final static Logger logger = LoggerFactory.getLogger(InterestRateChartWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(InterestRateChartWritePlatformServiceJpaRepositoryImpl.class); @SuppressWarnings("unused") private final PlatformSecurityContext context; private final InterestRateChartDataValidator interestRateChartDataValidator; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorWritePlatformServiceJpaRepositoryIImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorWritePlatformServiceJpaRepositoryIImpl.java index decdee40e..3c415d4cf 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorWritePlatformServiceJpaRepositoryIImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorWritePlatformServiceJpaRepositoryIImpl.java @@ -64,7 +64,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class GuarantorWritePlatformServiceJpaRepositoryIImpl implements GuarantorWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(GuarantorWritePlatformServiceJpaRepositoryIImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(GuarantorWritePlatformServiceJpaRepositoryIImpl.class); private final ClientRepositoryWrapper clientRepositoryWrapper; private final StaffRepositoryWrapper staffRepositoryWrapper; @@ -334,7 +334,7 @@ public class GuarantorWritePlatformServiceJpaRepositoryIImpl implements Guaranto private void handleGuarantorDataIntegrityIssues(final DataIntegrityViolationException dve) { final Throwable realCause = dve.getMostSpecificCause(); - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.guarantor.unknown.data.integrity.issue", "Unknown data integrity issue with resource Guarantor: " + realCause.getMessage()); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/service/LoanRescheduleRequestWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/service/LoanRescheduleRequestWritePlatformServiceImpl.java index faa3c1698..d4056c17d 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/service/LoanRescheduleRequestWritePlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/service/LoanRescheduleRequestWritePlatformServiceImpl.java @@ -92,7 +92,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class LoanRescheduleRequestWritePlatformServiceImpl implements LoanRescheduleRequestWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(LoanRescheduleRequestWritePlatformServiceImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(LoanRescheduleRequestWritePlatformServiceImpl.class); private final CodeValueRepositoryWrapper codeValueRepositoryWrapper; private final PlatformSecurityContext platformSecurityContext; @@ -606,7 +606,7 @@ public class LoanRescheduleRequestWritePlatformServiceImpl implements LoanResche **/ private void handleDataIntegrityViolation(final DataIntegrityViolationException dve) { - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.loan.reschedule.unknown.data.integrity.issue", "Unknown data integrity issue with resource."); diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanApplicationWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanApplicationWritePlatformServiceJpaRepositoryImpl.java index 8d468ef77..dedb66585 100755 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanApplicationWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanApplicationWritePlatformServiceJpaRepositoryImpl.java @@ -151,7 +151,7 @@ import org.springframework.util.CollectionUtils; @Service public class LoanApplicationWritePlatformServiceJpaRepositoryImpl implements LoanApplicationWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(LoanApplicationWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(LoanApplicationWritePlatformServiceJpaRepositoryImpl.class); private final PlatformSecurityContext context; private final FromJsonHelper fromJsonHelper; @@ -1246,7 +1246,7 @@ public void checkForProductMixRestrictions(final Loan loan) { } private void logAsErrorUnexpectedDataIntegrityException(final Exception dve) { - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); } @Transactional 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 9a3b6f42a..2b0e97080 100755 --- 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 @@ -56,7 +56,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class LoanArrearsAgingServiceImpl implements LoanArrearsAgingService, BusinessEventListner { - private final static Logger logger = LoggerFactory.getLogger(LoanArrearsAgingServiceImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(LoanArrearsAgingServiceImpl.class); private final BusinessEventNotifierService businessEventNotifierService; private final DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy-MM-dd"); private final JdbcTemplate jdbcTemplate; @@ -125,7 +125,7 @@ public class LoanArrearsAgingServiceImpl implements LoanArrearsAgingService, Bus result += i; } - logger.info("{}: Results affected by update: {}", ThreadLocalContextUtil.getTenant().getName(), result); + LOG.info("{}: Results affected by update: {}", ThreadLocalContextUtil.getTenant().getName(), result); } @Override diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanSchedularServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanSchedularServiceImpl.java index 03edf22d8..20c660cf3 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanSchedularServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanSchedularServiceImpl.java @@ -54,7 +54,7 @@ import org.springframework.util.CollectionUtils; @Service public class LoanSchedularServiceImpl implements LoanSchedularService { - private final static Logger logger = LoggerFactory.getLogger(LoanSchedularServiceImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(LoanSchedularServiceImpl.class); private final ConfigurationDomainService configurationDomainService; private final LoanReadPlatformService loanReadPlatformService; @@ -103,14 +103,14 @@ public class LoanSchedularServiceImpl implements LoanSchedularService { } catch (final PlatformApiDataValidationException e) { final List errors = e.getErrors(); for (final ApiParameterError error : errors) { - logger.error("Apply Charges due for overdue loans failed for account {} with message: {}", loanId, error.getDeveloperMessage(), e); + LOG.error("Apply Charges due for overdue loans failed for account {} with message: {}", loanId, error.getDeveloperMessage(), e); } exceptions.add(e); } catch (final AbstractPlatformDomainRuleException e) { - logger.error("Apply Charges due for overdue loans failed for account {} with message: {}", loanId, e.getDefaultUserMessage(), e); + LOG.error("Apply Charges due for overdue loans failed for account {} with message: {}", loanId, e.getDefaultUserMessage(), e); exceptions.add(e); } catch (Exception e) { - logger.error("Apply Charges due for overdue loans failed for account {}", loanId, e); + LOG.error("Apply Charges due for overdue loans failed for account {}", loanId, e); exceptions.add(e); } } @@ -131,7 +131,7 @@ public class LoanSchedularServiceImpl implements LoanSchedularService { if (!loanIds.isEmpty()) { List errors = new ArrayList<>(); for (Long loanId : loanIds) { - logger.info("recalculateInterest: Loan ID = {}", loanId); + LOG.info("recalculateInterest: Loan ID = {}", loanId); Integer numberOfRetries = 0; while (numberOfRetries <= maxNumberOfRetries) { try { @@ -139,10 +139,10 @@ public class LoanSchedularServiceImpl implements LoanSchedularService { numberOfRetries = maxNumberOfRetries + 1; } catch (CannotAcquireLockException | ObjectOptimisticLockingFailureException exception) { - logger.info("Recalulate interest job has been retried {} time(s)", numberOfRetries); + LOG.info("Recalulate interest job has been retried {} time(s)", numberOfRetries); // Fail if the transaction has been retried for maxNumberOfRetries if (numberOfRetries >= maxNumberOfRetries) { - logger.error("Recalulate interest job has been retried for the max allowed attempts of {} and will be rolled back", numberOfRetries); + LOG.error("Recalulate interest job has been retried for the max allowed attempts of {} and will be rolled back", numberOfRetries); errors.add(exception); break; } @@ -153,18 +153,18 @@ public class LoanSchedularServiceImpl implements LoanSchedularService { Thread.sleep(1000 + (randomNum * 1000)); numberOfRetries = numberOfRetries + 1; } catch (InterruptedException e) { - logger.error("Interest recalculation for loans retry failed due to InterruptedException", e) ; + LOG.error("Interest recalculation for loans retry failed due to InterruptedException", e) ; errors.add(e); break; } } catch (Exception e) { - logger.error("Interest recalculation for loans failed for account {}", loanId, e); + LOG.error("Interest recalculation for loans failed for account {}", loanId, e); numberOfRetries = maxNumberOfRetries + 1; errors.add(e); } i++; } - logger.info("recalculateInterest: Loans count {}", i); + LOG.info("recalculateInterest: Loans count {}", i); } if (!errors.isEmpty()) { throw new JobExecutionException(errors); } } @@ -176,7 +176,7 @@ public class LoanSchedularServiceImpl implements LoanSchedularService { public void recalculateInterest(Map jobParameters) { // gets the officeId final String officeId = jobParameters.get("officeId"); - logger.info("recalculateInterest: officeId={}", officeId); + LOG.info("recalculateInterest: officeId={}", officeId); Long officeIdLong = Long.valueOf(officeId); // gets the Office object @@ -206,7 +206,7 @@ public class LoanSchedularServiceImpl implements LoanSchedularService { // gets the loanIds data set iteratively and call addAccuruals for that paginated dataset do { int totalFilteredRecords = loanIds.size(); - logger.info("Starting accrual - total filtered records - {}", totalFilteredRecords); + LOG.info("Starting accrual - total filtered records - {}", totalFilteredRecords); recalculateInterest(loanIds, threadPoolSize, batchSize, executorService); maxLoanIdInList+= pageSize+1; loanIds = Collections.synchronizedList(this.loanReadPlatformService @@ -262,7 +262,7 @@ public class LoanSchedularServiceImpl implements LoanSchedularService { List> responses = executorService.invokeAll(posters); checkCompletion(responses); } catch (InterruptedException e1) { - logger.error("Interrupted while recalculateInterest", e1); + LOG.error("Interrupted while recalculateInterest", e1); } } @@ -294,12 +294,12 @@ public class LoanSchedularServiceImpl implements LoanSchedularService { } allThreadsExecuted = noOfThreadsExecuted == responses.size(); if(!allThreadsExecuted) { - logger.error("All threads could not execute."); + LOG.error("All threads could not execute."); } } catch (InterruptedException e1) { - logger.error("Interrupted while posting IR entries", e1); + LOG.error("Interrupted while posting IR entries", e1); } catch (ExecutionException e2) { - logger.error("Execution exception while posting IR entries", e2); + LOG.error("Execution exception while posting IR entries", e2); } } } \ No newline at end of file diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/RecalculateInterestPoster.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/RecalculateInterestPoster.java index 58ef5bc1c..0bf994a37 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/RecalculateInterestPoster.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/RecalculateInterestPoster.java @@ -36,7 +36,7 @@ import org.springframework.stereotype.Component; @Scope("prototype") public class RecalculateInterestPoster implements Callable { - private final static Logger logger = LoggerFactory.getLogger(RecalculateInterestPoster.class); + private final static Logger LOG = LoggerFactory.getLogger(RecalculateInterestPoster.class); private Collection loanIds; private LoanWritePlatformService loanWritePlatformService; @@ -60,7 +60,7 @@ public class RecalculateInterestPoster implements Callable { if (!loanIds.isEmpty()) { List errors = new ArrayList<>(); for (Long loanId : loanIds) { - logger.info("Loan ID {}", loanId); + LOG.info("Loan ID {}", loanId); Integer numberOfRetries = 0; while (numberOfRetries <= maxNumberOfRetries) { try { @@ -68,10 +68,10 @@ public class RecalculateInterestPoster implements Callable { numberOfRetries = maxNumberOfRetries + 1; } catch (CannotAcquireLockException | ObjectOptimisticLockingFailureException exception) { - logger.info("Recalulate interest job has been retried {} time(s)", numberOfRetries); + LOG.info("Recalulate interest job has been retried {} time(s)", numberOfRetries); // Fail if the transaction has been retired for maxNumberOfRetries if (numberOfRetries >= maxNumberOfRetries) { - logger.error("Recalulate interest job has been retried for the max allowed attempts of {} and will be rolled back", numberOfRetries); + LOG.error("Recalulate interest job has been retried for the max allowed attempts of {} and will be rolled back", numberOfRetries); errors.add(exception); break; } @@ -82,18 +82,18 @@ public class RecalculateInterestPoster implements Callable { Thread.sleep(1000 + (randomNum * 1000)); numberOfRetries = numberOfRetries + 1; } catch (InterruptedException e) { - logger.error("Interest recalculation for loans retry failed due to InterruptedException", e) ; + LOG.error("Interest recalculation for loans retry failed due to InterruptedException", e) ; errors.add(e); break; } } catch (Exception e) { - logger.error("Interest recalculation for loans failed for account {}", loanId, e); + LOG.error("Interest recalculation for loans failed for account {}", loanId, e); numberOfRetries = maxNumberOfRetries + 1; errors.add(e); } i++; } - logger.info("Loans count {}", i); + LOG.info("Loans count {}", i); } if (!errors.isEmpty()) { throw new JobExecutionException(errors); } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/productmix/service/ProductMixWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/productmix/service/ProductMixWritePlatformServiceJpaRepositoryImpl.java index 75061803e..c318f2798 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/productmix/service/ProductMixWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/productmix/service/ProductMixWritePlatformServiceJpaRepositoryImpl.java @@ -49,7 +49,7 @@ import org.springframework.util.CollectionUtils; @Service public class ProductMixWritePlatformServiceJpaRepositoryImpl implements ProductMixWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(ProductMixWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(ProductMixWritePlatformServiceJpaRepositoryImpl.class); private final PlatformSecurityContext context; private final ProductMixDataValidator fromApiJsonDeserializer; private final ProductMixRepository productMixRepository; @@ -194,7 +194,7 @@ public class ProductMixWritePlatformServiceJpaRepositoryImpl implements ProductM } private void logAsErrorUnexpectedDataIntegrityException(final DataIntegrityViolationException dve) { - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); } private List updateRestrictedIds(final Set restrictedIds, final List existedProductMixes) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanProductWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanProductWritePlatformServiceJpaRepositoryImpl.java index 213e7de3c..669f7cd85 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanProductWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanProductWritePlatformServiceJpaRepositoryImpl.java @@ -71,7 +71,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class LoanProductWritePlatformServiceJpaRepositoryImpl implements LoanProductWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(LoanProductWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(LoanProductWritePlatformServiceJpaRepositoryImpl.class); private final PlatformSecurityContext context; private final LoanProductDataValidator fromApiJsonDeserializer; private final LoanProductRepository loanProductRepository; @@ -377,7 +377,7 @@ public class LoanProductWritePlatformServiceJpaRepositoryImpl implements LoanPro } private void logAsErrorUnexpectedDataIntegrityException(final Exception dve) { - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); } private Map constructEntityMap(final BusinessEventNotificationConstants.BusinessEntity entityEvent, Object entity) { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateWriteServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateWriteServiceImpl.java index efa2d0fd6..dfa370715 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateWriteServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateWriteServiceImpl.java @@ -48,7 +48,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class RateWriteServiceImpl implements RateWriteService { - private final static Logger logger = LoggerFactory.getLogger(RateWriteServiceImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(RateWriteServiceImpl.class); private final RateRepository rateRepository; private final AppUserRepository appUserRepository; @@ -146,7 +146,7 @@ public class RateWriteServiceImpl implements RateWriteService { + "' already exists", "name", name); } - logger.error("Error due to Exception", dve); + LOG.error("Error due to Exception", dve); throw new PlatformDataIntegrityException("error.msg.fund.unknown.data.integrity.issue", "Unknown data integrity issue with resource: " + realCause.getMessage()); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl.java index ed9175e78..cea6f3c98 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl.java @@ -104,7 +104,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl implements DepositApplicationProcessWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl.class); private final PlatformSecurityContext context; private final SavingsAccountRepositoryWrapper savingAccountRepository; @@ -187,7 +187,7 @@ public class DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl impl } errorCodeBuilder.append(".unknown.data.integrity.issue"); - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException(errorCodeBuilder.toString(), "Unknown data integrity issue with savings account."); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/FixedDepositProductWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/FixedDepositProductWritePlatformServiceJpaRepositoryImpl.java index db02bc021..1675f4174 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/FixedDepositProductWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/FixedDepositProductWritePlatformServiceJpaRepositoryImpl.java @@ -57,7 +57,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class FixedDepositProductWritePlatformServiceJpaRepositoryImpl implements FixedDepositProductWritePlatformService { - private final Logger logger; + private final Logger LOG; private final PlatformSecurityContext context; private final FixedDepositProductRepository fixedDepositProductRepository; private final DepositProductDataValidator fromApiJsonDataValidator; @@ -75,7 +75,7 @@ public class FixedDepositProductWritePlatformServiceJpaRepositoryImpl implements this.fixedDepositProductRepository = fixedDepositProductRepository; this.fromApiJsonDataValidator = fromApiJsonDataValidator; this.depositProductAssembler = depositProductAssembler; - this.logger = LoggerFactory.getLogger(FixedDepositProductWritePlatformServiceJpaRepositoryImpl.class); + this.LOG = LoggerFactory.getLogger(FixedDepositProductWritePlatformServiceJpaRepositoryImpl.class); this.accountMappingWritePlatformService = accountMappingWritePlatformService; this.chartAssembler = chartAssembler; } @@ -207,6 +207,6 @@ public class FixedDepositProductWritePlatformServiceJpaRepositoryImpl implements } private void logAsErrorUnexpectedDataIntegrityException(final Exception dae) { - this.logger.error("Error occured.", dae); + this.LOG.error("Error occured.", dae); } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/RecurringDepositProductWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/RecurringDepositProductWritePlatformServiceJpaRepositoryImpl.java index d043a3841..94d8a137b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/RecurringDepositProductWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/RecurringDepositProductWritePlatformServiceJpaRepositoryImpl.java @@ -57,7 +57,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class RecurringDepositProductWritePlatformServiceJpaRepositoryImpl implements RecurringDepositProductWritePlatformService { - private final Logger logger; + private final Logger LOG; private final PlatformSecurityContext context; private final RecurringDepositProductRepository recurringDepositProductRepository; private final DepositProductDataValidator fromApiJsonDataValidator; @@ -75,7 +75,7 @@ public class RecurringDepositProductWritePlatformServiceJpaRepositoryImpl implem this.recurringDepositProductRepository = recurringDepositProductRepository; this.fromApiJsonDataValidator = fromApiJsonDataValidator; this.depositProductAssembler = depositProductAssembler; - this.logger = LoggerFactory.getLogger(RecurringDepositProductWritePlatformServiceJpaRepositoryImpl.class); + this.LOG = LoggerFactory.getLogger(RecurringDepositProductWritePlatformServiceJpaRepositoryImpl.class); this.accountMappingWritePlatformService = accountMappingWritePlatformService; this.chartAssembler = chartAssembler; } @@ -207,6 +207,6 @@ public class RecurringDepositProductWritePlatformServiceJpaRepositoryImpl implem } private void logAsErrorUnexpectedDataIntegrityException(final Exception dae) { - this.logger.error("Error occured.", dae); + this.LOG.error("Error occured.", dae); } } 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 43e910f91..cfb3bbd45 100755 --- 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 @@ -205,7 +205,7 @@ public class SavingsAccountWritePlatformServiceJpaRepositoryImpl implements Savi this.gsimRepository=gsimRepository; } - private final static Logger logger = LoggerFactory.getLogger(SavingsAccountWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(SavingsAccountWritePlatformServiceJpaRepositoryImpl.class); @Transactional @Override public CommandProcessingResult gsimActivate(final Long gsimId, final JsonCommand command) { @@ -330,7 +330,7 @@ public class SavingsAccountWritePlatformServiceJpaRepositoryImpl implements Savi if (this.savingAccountRepositoryWrapper.findOneWithNotFoundDetection(savingsId).getGsim() != null) { isGsim = true; - logger.info("is gsim"); + LOG.info("is gsim"); } final SavingsAccount account = this.savingAccountAssembler.assembleFrom(savingsId); @@ -350,16 +350,16 @@ public class SavingsAccountWritePlatformServiceJpaRepositoryImpl implements Savi if (isGsim && (deposit.getId() != null)) { - logger.debug("Deposit account has been created: {} ", deposit); + LOG.debug("Deposit account has been created: {} ", deposit); GroupSavingsIndividualMonitoring gsim = gsimRepository.findById(account.getGsim().getId()).get(); - logger.info("parent deposit : {} ", gsim.getParentDeposit()); - logger.info("child account : {} ", savingsId); + LOG.info("parent deposit : {} ", gsim.getParentDeposit()); + LOG.info("child account : {} ", savingsId); BigDecimal currentBalance = gsim.getParentDeposit(); BigDecimal newBalance = currentBalance.add(transactionAmount); gsim.setParentDeposit(newBalance); gsimRepository.save(gsim); - logger.info("balance after making deposit : {} ", gsimRepository.findById(account.getGsim().getId()).get().getParentDeposit()); + LOG.info("balance after making deposit : {} ", gsimRepository.findById(account.getGsim().getId()).get().getParentDeposit()); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl.java index 53d213e99..ba7802dc5 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl.java @@ -95,7 +95,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl implements SavingsApplicationProcessWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl.class); private final PlatformSecurityContext context; private final SavingsAccountRepositoryWrapper savingAccountRepository; @@ -181,7 +181,7 @@ public class SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl impl } errorCodeBuilder.append(".unknown.data.integrity.issue"); - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException(errorCodeBuilder.toString(), "Unknown data integrity issue with savings account."); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsProductWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsProductWritePlatformServiceJpaRepositoryImpl.java index 4cc394f66..67d4277ae 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsProductWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsProductWritePlatformServiceJpaRepositoryImpl.java @@ -58,7 +58,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class SavingsProductWritePlatformServiceJpaRepositoryImpl implements SavingsProductWritePlatformService { - private final Logger logger; + private final Logger LOG; private final PlatformSecurityContext context; private final SavingsProductRepository savingProductRepository; private final SavingsProductDataValidator fromApiJsonDataValidator; @@ -76,7 +76,7 @@ public class SavingsProductWritePlatformServiceJpaRepositoryImpl implements Savi this.savingProductRepository = savingProductRepository; this.fromApiJsonDataValidator = fromApiJsonDataValidator; this.savingsProductAssembler = savingsProductAssembler; - this.logger = LoggerFactory.getLogger(SavingsProductWritePlatformServiceJpaRepositoryImpl.class); + this.LOG = LoggerFactory.getLogger(SavingsProductWritePlatformServiceJpaRepositoryImpl.class); this.accountMappingWritePlatformService = accountMappingWritePlatformService; this.fineractEntityAccessUtil = fineractEntityAccessUtil; } @@ -105,7 +105,7 @@ public class SavingsProductWritePlatformServiceJpaRepositoryImpl implements Savi } private void logAsErrorUnexpectedDataIntegrityException(final Exception dae) { - this.logger.error("Error occured.", dae); + this.LOG.error("Error occured.", dae); } @Transactional diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/service/SelfBeneficiariesTPTWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/service/SelfBeneficiariesTPTWritePlatformServiceImpl.java index 741dfc2da..2deebfeef 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/service/SelfBeneficiariesTPTWritePlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/service/SelfBeneficiariesTPTWritePlatformServiceImpl.java @@ -53,7 +53,7 @@ import org.springframework.transaction.annotation.Transactional; public class SelfBeneficiariesTPTWritePlatformServiceImpl implements SelfBeneficiariesTPTWritePlatformService { - private final Logger logger; + private final Logger LOG; private final PlatformSecurityContext context; private final SelfBeneficiariesTPTRepository repository; private final SelfBeneficiariesTPTDataValidator validator; @@ -72,7 +72,7 @@ public class SelfBeneficiariesTPTWritePlatformServiceImpl implements this.validator = validator; this.loanRepositoryWrapper = loanRepositoryWrapper; this.savingRepositoryWrapper = savingRepositoryWrapper; - this.logger = LoggerFactory + this.LOG = LoggerFactory .getLogger(SelfBeneficiariesTPTWritePlatformServiceImpl.class); } @@ -200,7 +200,7 @@ public class SelfBeneficiariesTPTWritePlatformServiceImpl implements NAME_PARAM_NAME, name); } - this.logger.error("Error occured.", dae); + this.LOG.error("Error occured.", dae); throw new PlatformDataIntegrityException( "error.msg.beneficiary.unknown.data.integrity.issue", "Unknown data integrity issue with resource."); diff --git a/fineract-provider/src/main/java/org/apache/fineract/scheduledjobs/service/ScheduledJobRunnerServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/scheduledjobs/service/ScheduledJobRunnerServiceImpl.java index 24aa8f101..e62491ea7 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/scheduledjobs/service/ScheduledJobRunnerServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/scheduledjobs/service/ScheduledJobRunnerServiceImpl.java @@ -62,7 +62,7 @@ import org.springframework.util.CollectionUtils; @Service(value = "scheduledJobRunnerService") public class ScheduledJobRunnerServiceImpl implements ScheduledJobRunnerService { - private final static Logger logger = LoggerFactory.getLogger(ScheduledJobRunnerServiceImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(ScheduledJobRunnerServiceImpl.class); private final DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy-MM-dd"); private final DateTimeFormatter formatterWithTime = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss"); @@ -174,7 +174,7 @@ public class ScheduledJobRunnerServiceImpl implements ScheduledJobRunnerService final int result = jdbcTemplate.update(updateSqlBuilder.toString()); - logger.info("{}: Results affected by update: {}", ThreadLocalContextUtil.getTenant().getName(), result); + LOG.info("{}: Results affected by update: {}", ThreadLocalContextUtil.getTenant().getName(), result); } @Transactional @@ -209,7 +209,7 @@ public class ScheduledJobRunnerServiceImpl implements ScheduledJobRunnerService final int result = jdbcTemplate.update(updateSqlBuilder.toString()); - logger.info("{}: Results affected by update: {}", ThreadLocalContextUtil.getTenant().getName(), result); + LOG.info("{}: Results affected by update: {}", ThreadLocalContextUtil.getTenant().getName(), result); } @Override @@ -226,14 +226,14 @@ public class ScheduledJobRunnerServiceImpl implements ScheduledJobRunnerService } catch (final PlatformApiDataValidationException e) { final List errors = e.getErrors(); for (final ApiParameterError error : errors) { - logger.error("Apply annual fee failed for account: {} with message {}", savingsAccountReference.getAccountNo(), error); + LOG.error("Apply annual fee failed for account: {} with message {}", savingsAccountReference.getAccountNo(), error); } } catch (final Exception ex) { // need to handle this scenario } } - logger.info("{}: Savings accounts affected by update: {}", ThreadLocalContextUtil.getTenant().getName(), annualFeeData.size()); + LOG.info("{}: Savings accounts affected by update: {}", ThreadLocalContextUtil.getTenant().getName(), annualFeeData.size()); } @Override @@ -248,11 +248,11 @@ public class ScheduledJobRunnerServiceImpl implements ScheduledJobRunnerService exceptions.add(e); final List errors = e.getErrors(); for (final ApiParameterError error : errors) { - logger.error("Apply Charges due for savings failed for account {} with message: {}", savingsAccountReference.getAccountNo(), error.getDeveloperMessage(), e); + LOG.error("Apply Charges due for savings failed for account {} with message: {}", savingsAccountReference.getAccountNo(), error.getDeveloperMessage(), e); } } } - logger.info("{}: Savings accounts affected by update: {}", ThreadLocalContextUtil.getTenant().getName(), chargesDueData.size()); + LOG.info("{}: Savings accounts affected by update: {}", ThreadLocalContextUtil.getTenant().getName(), chargesDueData.size()); if (!exceptions.isEmpty()) { throw new JobExecutionException(exceptions); } } @@ -288,7 +288,7 @@ public class ScheduledJobRunnerServiceImpl implements ScheduledJobRunnerService final int result = jdbcTemplate.update(updateSqlBuilder.toString()); - logger.info("{} : Results affected by update: {}", ThreadLocalContextUtil.getTenant().getName(), result); + LOG.info("{} : Results affected by update: {}", ThreadLocalContextUtil.getTenant().getName(), result); } @Override @@ -304,14 +304,14 @@ public class ScheduledJobRunnerServiceImpl implements ScheduledJobRunnerService } catch (final PlatformApiDataValidationException e) { final List errors = e.getErrors(); for (final ApiParameterError error : errors) { - logger.error("Update maturity details failed for account: {} with message {}", depositAccount.accountNo(), error.getDeveloperMessage()); + LOG.error("Update maturity details failed for account: {} with message {}", depositAccount.accountNo(), error.getDeveloperMessage()); } } catch (final Exception ex) { // need to handle this scenario } } - logger.info("{}: Deposit accounts affected by update: {}", ThreadLocalContextUtil.getTenant().getName(), depositAccounts.size()); + LOG.info("{}: Deposit accounts affected by update: {}", ThreadLocalContextUtil.getTenant().getName(), depositAccounts.size()); } @Override @@ -392,12 +392,12 @@ public class ScheduledJobRunnerServiceImpl implements ScheduledJobRunnerService exceptions.add(e); final List errors = e.getErrors(); for (final ApiParameterError error : errors) { - logger.error( + LOG.error( "Post Dividends to savings failed due to ApiParameterError for Divident detail Id: {} and savings Id: {} with message: {}", id, savingsId, error.getDeveloperMessage(), e); } } catch (final Exception e) { - logger.error("Post Dividends to savings failed for Divident detail Id: {} and savings Id: {}", id, savingsId, e); + LOG.error("Post Dividends to savings failed for Divident detail Id: {} and savings Id: {}", id, savingsId, e); exceptions.add(e); } } @@ -431,7 +431,7 @@ public class ScheduledJobRunnerServiceImpl implements ScheduledJobRunnerService .append("group by je.account_id, je.office_id, je.transaction_date, Date(je.entry_date)"); final int result = jdbcTemplate.update(sqlBuilder.toString(), formattedDate); - logger.info("{}: Results affected by update: {}", ThreadLocalContextUtil.getTenant().getName(), result); + LOG.info("{}: Results affected by update: {}", ThreadLocalContextUtil.getTenant().getName(), result); } // Updating closing balance diff --git a/fineract-provider/src/main/java/org/apache/fineract/template/service/TemplateMergeService.java b/fineract-provider/src/main/java/org/apache/fineract/template/service/TemplateMergeService.java index d6b87c81a..61f1b3882 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/template/service/TemplateMergeService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/template/service/TemplateMergeService.java @@ -48,7 +48,7 @@ import org.springframework.stereotype.Service; @Service public class TemplateMergeService { - private final static Logger logger = LoggerFactory.getLogger(TemplateMergeService.class); + private final static Logger LOG = LoggerFactory.getLogger(TemplateMergeService.class); // private final FromJsonHelper fromApiJsonHelper; @@ -95,7 +95,7 @@ public class TemplateMergeService { try { this.scopes.put(entry.getKey(), getMapFromUrl(url)); } catch (final IOException e) { - logger.error("getCompiledMapFromMappers() failed", e); + LOG.error("getCompiledMapFromMappers() failed", e); } } } @@ -140,7 +140,7 @@ public class TemplateMergeService { connection.setDoInput(true); } catch (IOException | KeyManagementException | NoSuchAlgorithmException | KeyStoreException e) { - logger.error("getConnection() failed, return null", e); + LOG.error("getConnection() failed, return null", e); } return connection; @@ -160,13 +160,13 @@ public class TemplateMergeService { } } catch (final IOException e) { - logger.error("getStringFromInputStream() failed", e); + LOG.error("getStringFromInputStream() failed", e); } finally { if (br != null) { try { br.close(); } catch (final IOException e) { - logger.error("Problem occurred in getStringFromInputStream function",e); + LOG.error("Problem occurred in getStringFromInputStream function",e); } } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/domain/AppUser.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/domain/AppUser.java index 4d8a63d56..6605b8021 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/domain/AppUser.java +++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/domain/AppUser.java @@ -61,7 +61,7 @@ import org.springframework.security.core.userdetails.User; @Table(name = "m_appuser", uniqueConstraints = @UniqueConstraint(columnNames = { "username" }, name = "username_org")) public class AppUser extends AbstractPersistableCustom implements PlatformUser { - private final static Logger logger = LoggerFactory.getLogger(AppUser.class); + private final static Logger LOG = LoggerFactory.getLogger(AppUser.class); @Column(name = "email", nullable = false, length = 100) private String email; @@ -575,7 +575,7 @@ public class AppUser extends AbstractPersistableCustom implements PlatformUser { public void validateHasPermissionTo(final String function) { if (hasNotPermissionTo(function)) { final String authorizationMessage = "User has no authority to: " + function; - logger.info("Unauthorized access: userId: {} action: {} allowed: {}", getId(), function, getAuthorities()); + LOG.info("Unauthorized access: userId: {} action: {} allowed: {}", getId(), function, getAuthorities()); throw new NoAuthorizationException(authorizationMessage); } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/AppUserWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/AppUserWritePlatformServiceJpaRepositoryImpl.java index 633ae323e..f9170c757 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/AppUserWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/AppUserWritePlatformServiceJpaRepositoryImpl.java @@ -73,7 +73,7 @@ import org.springframework.util.ObjectUtils; @Service public class AppUserWritePlatformServiceJpaRepositoryImpl implements AppUserWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(AppUserWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(AppUserWritePlatformServiceJpaRepositoryImpl.class); private final PlatformSecurityContext context; private final UserDomainService userDomainService; @@ -351,7 +351,7 @@ public class AppUserWritePlatformServiceJpaRepositoryImpl implements AppUserWrit throw new PlatformDataIntegrityException("error.msg.user.self.service.user.already.exist", "Self Service User Id is already created. Go to Admin->Users to edit or delete the self-service user."); } - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.unknown.data.integrity.issue", "Unknown data integrity issue with resource."); } } diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/PasswordPreferencesWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/PasswordPreferencesWritePlatformServiceJpaRepositoryImpl.java index f388e6fd6..8c1aa1515 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/PasswordPreferencesWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/PasswordPreferencesWritePlatformServiceJpaRepositoryImpl.java @@ -40,7 +40,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class PasswordPreferencesWritePlatformServiceJpaRepositoryImpl implements PasswordPreferencesWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(PasswordPreferencesWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(PasswordPreferencesWritePlatformServiceJpaRepositoryImpl.class); private final PasswordValidationPolicyRepository validationRepository; private final PasswordPreferencesDataValidator dataValidator; @@ -88,7 +88,7 @@ public class PasswordPreferencesWritePlatformServiceJpaRepositoryImpl implements .with(changes) // .build(); } catch (final DataIntegrityViolationException dve) { - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); throw new PlatformDataIntegrityException("error.msg.password.validation.policy.unknown.data.integrity.issue", "Unknown data integrity issue with resource."); } 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 e0510e90b..4d8f089ef 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 @@ -34,7 +34,7 @@ import org.springframework.stereotype.Service; @Service public class PermissionReadPlatformServiceImpl implements PermissionReadPlatformService { - private final static Logger logger = LoggerFactory.getLogger(PermissionReadPlatformServiceImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(PermissionReadPlatformServiceImpl.class); private final JdbcTemplate jdbcTemplate; private final PlatformSecurityContext context; @@ -52,7 +52,7 @@ public class PermissionReadPlatformServiceImpl implements PermissionReadPlatform final PermissionUsageDataMapper mapper = new PermissionUsageDataMapper(); final String sql = mapper.permissionSchema(); - logger.info("retrieveAllPermissions: {}", sql); + LOG.info("retrieveAllPermissions: {}", sql); return this.jdbcTemplate.query(sql, mapper, new Object[] {}); } @@ -63,7 +63,7 @@ public class PermissionReadPlatformServiceImpl implements PermissionReadPlatform final PermissionUsageDataMapper mapper = new PermissionUsageDataMapper(); final String sql = mapper.makerCheckerablePermissionSchema(); - logger.info("retrieveAllMakerCheckerablePermissions: {}", sql); + LOG.info("retrieveAllMakerCheckerablePermissions: {}", sql); return this.jdbcTemplate.query(sql, mapper, new Object[] {}); } @@ -73,7 +73,7 @@ public class PermissionReadPlatformServiceImpl implements PermissionReadPlatform final PermissionUsageDataMapper mapper = new PermissionUsageDataMapper(); final String sql = mapper.rolePermissionSchema(); - logger.info("retrieveAllRolePermissions: {}", sql); + LOG.info("retrieveAllRolePermissions: {}", sql); return this.jdbcTemplate.query(sql, mapper, new Object[] { roleId }); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/RoleWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/RoleWritePlatformServiceJpaRepositoryImpl.java index f2e7496c8..2f4a108a8 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/RoleWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/RoleWritePlatformServiceJpaRepositoryImpl.java @@ -50,7 +50,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class RoleWritePlatformServiceJpaRepositoryImpl implements RoleWritePlatformService { - private final static Logger logger = LoggerFactory.getLogger(RoleWritePlatformServiceJpaRepositoryImpl.class); + private final static Logger LOG = LoggerFactory.getLogger(RoleWritePlatformServiceJpaRepositoryImpl.class); private final PlatformSecurityContext context; private final RoleRepository roleRepository; private final PermissionRepository permissionRepository; @@ -118,7 +118,7 @@ public class RoleWritePlatformServiceJpaRepositoryImpl implements RoleWritePlatf } private void logAsErrorUnexpectedDataIntegrityException(final Exception dve) { - logger.error("Error occured.", dve); + LOG.error("Error occured.", dve); } @Caching(evict = { @CacheEvict(value = "users", allEntries = true), @CacheEvict(value = "usersByUsername", allEntries = true) }) diff --git a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/core/exception/MultiExceptionTest.java b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/core/exception/MultiExceptionTest.java index dbf874843..0ff474c58 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/core/exception/MultiExceptionTest.java +++ b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/core/exception/MultiExceptionTest.java @@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory; class MultiExceptionTest { - Logger logger = LoggerFactory.getLogger(MultiExceptionTest.class); + Logger LOG = LoggerFactory.getLogger(MultiExceptionTest.class); @Test() void testEmpty() throws MultiException { @@ -39,7 +39,7 @@ class MultiExceptionTest { void test() throws MultiException { List causes = List.of(new IllegalArgumentException(), new IllegalStateException()); MultiException e = new MultiException(causes); - logger.warn("Biep, bieb", e); + LOG.warn("Biep, bieb", e); // Uncomment to see JUnit UI: // throw e; }