From 4b2dc6fd773b875fdcb4fa140093c7b3217d9826 Mon Sep 17 00:00:00 2001 From: gazbert Date: Wed, 13 Nov 2024 17:11:03 +0000 Subject: [PATCH] #169 - Use parameterised log statements --- .../yaml/EmailAlertsConfigYamlRepository.java | 2 +- .../yaml/EngineConfigYamlRepository.java | 2 +- .../yaml/ExchangeConfigYamlRepository.java | 2 +- .../yaml/MarketConfigYamlRepository.java | 22 ++++++++++--------- .../yaml/StrategyConfigYamlRepository.java | 22 +++++++++---------- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/bxbot-repository/src/main/java/com/gazbert/bxbot/repository/yaml/EmailAlertsConfigYamlRepository.java b/bxbot-repository/src/main/java/com/gazbert/bxbot/repository/yaml/EmailAlertsConfigYamlRepository.java index 9c078863..b2905bdc 100644 --- a/bxbot-repository/src/main/java/com/gazbert/bxbot/repository/yaml/EmailAlertsConfigYamlRepository.java +++ b/bxbot-repository/src/main/java/com/gazbert/bxbot/repository/yaml/EmailAlertsConfigYamlRepository.java @@ -64,7 +64,7 @@ public EmailAlertsConfig get() { @Override public EmailAlertsConfig save(EmailAlertsConfig config) { - log.info("About to save EmailAlertsConfig: " + config); + log.info("About to save EmailAlertsConfig: {}", config); final EmailAlertsType emailAlertsType = new EmailAlertsType(); emailAlertsType.setEmailAlerts(config); diff --git a/bxbot-repository/src/main/java/com/gazbert/bxbot/repository/yaml/EngineConfigYamlRepository.java b/bxbot-repository/src/main/java/com/gazbert/bxbot/repository/yaml/EngineConfigYamlRepository.java index 1c3fbc88..acd8f8c0 100644 --- a/bxbot-repository/src/main/java/com/gazbert/bxbot/repository/yaml/EngineConfigYamlRepository.java +++ b/bxbot-repository/src/main/java/com/gazbert/bxbot/repository/yaml/EngineConfigYamlRepository.java @@ -64,7 +64,7 @@ public EngineConfig get() { @Override public EngineConfig save(EngineConfig config) { - log.info("About to save EngineConfig: " + config); + log.info("About to save EngineConfig: {}", config); final EngineType engineType = new EngineType(); engineType.setEngine(config); diff --git a/bxbot-repository/src/main/java/com/gazbert/bxbot/repository/yaml/ExchangeConfigYamlRepository.java b/bxbot-repository/src/main/java/com/gazbert/bxbot/repository/yaml/ExchangeConfigYamlRepository.java index 3bd05c8e..10c06920 100644 --- a/bxbot-repository/src/main/java/com/gazbert/bxbot/repository/yaml/ExchangeConfigYamlRepository.java +++ b/bxbot-repository/src/main/java/com/gazbert/bxbot/repository/yaml/ExchangeConfigYamlRepository.java @@ -64,7 +64,7 @@ public ExchangeConfig get() { @Override public ExchangeConfig save(ExchangeConfig config) { - log.info("About to save ExchangeConfig: " + config); + log.info("About to save ExchangeConfig: {}", config); final ExchangeType exchangeType = new ExchangeType(); exchangeType.setExchange(config); diff --git a/bxbot-repository/src/main/java/com/gazbert/bxbot/repository/yaml/MarketConfigYamlRepository.java b/bxbot-repository/src/main/java/com/gazbert/bxbot/repository/yaml/MarketConfigYamlRepository.java index 287ba19e..a5df0334 100644 --- a/bxbot-repository/src/main/java/com/gazbert/bxbot/repository/yaml/MarketConfigYamlRepository.java +++ b/bxbot-repository/src/main/java/com/gazbert/bxbot/repository/yaml/MarketConfigYamlRepository.java @@ -70,7 +70,7 @@ public List findAll() { @Override public MarketConfig findById(String id) { - log.info("Fetching Market config for id: " + id); + log.info("Fetching Market config for id: {}", id); final MarketsType marketsType = configurationManager.loadConfig(MarketsType.class, MARKETS_CONFIG_YAML_FILENAME); @@ -94,7 +94,7 @@ public MarketConfig save(MarketConfig config) { .toList(); if (config.getId() == null || config.getId().isEmpty()) { - log.info("About to create MarketConfig: " + config); + log.info("About to create MarketConfig: {}", config); if (marketConfigs.isEmpty()) { final MarketConfig newMarketConfig = new MarketConfig(config); @@ -114,7 +114,7 @@ public MarketConfig save(MarketConfig config) { + marketsType.getMarkets()); } } else { - log.info("About to update MarketConfig: " + config); + log.info("About to update MarketConfig: {}", config); if (!marketConfigs.isEmpty()) { @@ -133,10 +133,11 @@ public MarketConfig save(MarketConfig config) { .collect(Collectors.toList())); } else { log.warn( - "Trying to update MarketConfig but id does not exist MarketConfig: " - + config + "Trying to update MarketConfig but id does not exist MarketConfig: {}" + EXISTING_MARKET_CONFIG - + marketsType.getMarkets()); + + "{}", + config, + marketsType.getMarkets()); return null; } } @@ -144,7 +145,7 @@ public MarketConfig save(MarketConfig config) { @Override public MarketConfig delete(String id) { - log.info("Deleting Market config for id: " + id); + log.info("Deleting Market config for id: {}", id); final MarketsType marketsType = configurationManager.loadConfig(MarketsType.class, MARKETS_CONFIG_YAML_FILENAME); @@ -162,10 +163,11 @@ public MarketConfig delete(String id) { return adaptInternalToExternalConfig(Collections.singletonList(marketToRemove)); } else { log.warn( - "Trying to delete MarketConfig but id does not exist. MarketConfig id: " - + id + "Trying to delete MarketConfig but id does not exist. MarketConfig id: {}" + EXISTING_MARKET_CONFIG - + marketsType.getMarkets()); + + "{}", + id, + marketsType.getMarkets()); return null; } } diff --git a/bxbot-repository/src/main/java/com/gazbert/bxbot/repository/yaml/StrategyConfigYamlRepository.java b/bxbot-repository/src/main/java/com/gazbert/bxbot/repository/yaml/StrategyConfigYamlRepository.java index 6bb40cb0..eb810c0c 100644 --- a/bxbot-repository/src/main/java/com/gazbert/bxbot/repository/yaml/StrategyConfigYamlRepository.java +++ b/bxbot-repository/src/main/java/com/gazbert/bxbot/repository/yaml/StrategyConfigYamlRepository.java @@ -68,7 +68,7 @@ public List findAll() { @Override public StrategyConfig findById(String id) { - log.info("Fetching config for Strategy id: " + id); + log.info("Fetching config for Strategy id: {}", id); final StrategiesType strategiesType = configurationManager.loadConfig(StrategiesType.class, STRATEGIES_CONFIG_YAML_FILENAME); @@ -92,7 +92,7 @@ public StrategyConfig save(StrategyConfig config) { .toList(); if (config.getId() == null || config.getId().isEmpty()) { - log.info("About to create StrategyConfig: " + config); + log.info("About to create StrategyConfig: {}", config); if (strategyConfigs.isEmpty()) { final StrategyConfig newStrategyConfig = new StrategyConfig(config); @@ -112,7 +112,7 @@ public StrategyConfig save(StrategyConfig config) { + strategiesType.getStrategies()); } } else { - log.info("About to update StrategyConfig: " + config); + log.info("About to update StrategyConfig: {}", config); if (!strategyConfigs.isEmpty()) { strategiesType @@ -132,10 +132,9 @@ public StrategyConfig save(StrategyConfig config) { .collect(Collectors.toList())); } else { log.warn( - "Trying to update StrategyConfig but id does not exist StrategyConfig: " - + config - + " Existing StrategyConfig: " - + strategiesType.getStrategies()); + "Trying to update StrategyConfig but id does not exist StrategyConfig: {} Existing StrategyConfig: {}", + config, + strategiesType.getStrategies()); return null; } } @@ -143,7 +142,7 @@ public StrategyConfig save(StrategyConfig config) { @Override public StrategyConfig delete(String id) { - log.info("Deleting Strategy config for id: " + id); + log.info("Deleting Strategy config for id: {}", id); final StrategiesType strategiesType = configurationManager.loadConfig(StrategiesType.class, STRATEGIES_CONFIG_YAML_FILENAME); @@ -162,10 +161,9 @@ public StrategyConfig delete(String id) { return adaptInternalToExternalConfig(Collections.singletonList(strategyToRemove)); } else { log.warn( - "Trying to delete StrategyConfig but id does not exist. StrategyConfig id: " - + id - + " Existing StrategyConfig: " - + strategiesType.getStrategies()); + "Trying to delete StrategyConfig but id does not exist. StrategyConfig id: {} Existing StrategyConfig: {}", + id, + strategiesType.getStrategies()); return null; } }