minor cleanup of logging

TheCookieLab · Feb 7, 2018 · dd53c33 · dd53c33
1 parent d6aab45
commit dd53c33
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/src/main/java/com/cf/client/poloniex/PoloniexExchangeService.java b/src/main/java/com/cf/client/poloniex/PoloniexExchangeService.java
@@ -130,7 +130,7 @@ public PoloniexTicker returnTicker(String currencyPair)
     public List<String> returnAllMarkets()
     {
         long start = System.currentTimeMillis();
-        List<String> allMarkets = new ArrayList<String>();
+        List<String> allMarkets = new ArrayList<>();
         try
         {
             String tickerData = publicClient.returnTicker();

diff --git a/src/main/java/com/cf/data/map/poloniex/PoloniexDataMapper.java b/src/main/java/com/cf/data/map/poloniex/PoloniexDataMapper.java
@@ -31,6 +31,7 @@
 import java.util.stream.Collectors;
 
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 /**
  *
@@ -39,7 +40,9 @@
 public class PoloniexDataMapper {
 
     private final Gson gson;
-    private static final DateTimeFormatter DTF = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneOffset.UTC);
+
+    private final static Logger LOGGER = LogManager.getLogger();
+    private final static DateTimeFormatter DTF = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneOffset.UTC);
     private final static String EMPTY_RESULTS = "[]";
     private final static String INVALID_CHART_DATA_DATE_RANGE_RESULT = "[{\"date\":0,\"high\":0,\"low\":0,\"open\":0,\"close\":0,\"volume\":0,\"quoteVolume\":0,\"weightedAverage\":0}]";
     private final static String INVALID_CHART_DATA_CURRENCY_PAIR_RESULT = "{\"error\":\"Invalid currency pair.\"}";
@@ -66,21 +69,27 @@ public List<PoloniexChartData> mapChartData(String chartDataResult) {
             PoloniexChartData[] chartDataResults = gson.fromJson(chartDataResult, PoloniexChartData[].class);
             results = Arrays.asList(chartDataResults);
         } catch (JsonSyntaxException | DateTimeParseException ex) {
-            LogManager.getLogger().error("Exception mapping chart data {} - {}", chartDataResult, ex.getMessage());
+            LOGGER.error("Exception mapping chart data {} - {}", chartDataResult, ex.getMessage());
             results = Collections.EMPTY_LIST;
         }
         return results;
 
     }
 
     public PoloniexFeeInfo mapFeeInfo(String feeInfoResult) {
-        PoloniexFeeInfo feeInfo = gson.fromJson(feeInfoResult, new TypeToken<PoloniexFeeInfo>() {
-        }.getType());
+        PoloniexFeeInfo feeInfo = null;
 
+        try {
+            feeInfo = gson.fromJson(feeInfoResult, new TypeToken<PoloniexFeeInfo>() {
+            }.getType());
+        } catch (Exception ex) {
+            LOGGER.error("Exception mapping fee info {} - {}", feeInfoResult, ex.getMessage());
+        }
         return feeInfo;
     }
 
     public PoloniexActiveLoanTypes mapActiveLoans(String activeLoansResult) {
+
         PoloniexActiveLoanTypes activeLoanTypes = gson.fromJson(activeLoansResult, PoloniexActiveLoanTypes.class);
 
         return activeLoanTypes;
@@ -90,7 +99,7 @@ public Map<String, PoloniexTicker> mapTicker(String tickerData) {
         return gson.fromJson(tickerData, new TypeToken<Map<String, PoloniexTicker>>() {
         }.getType());
     }
-    
+
     public PoloniexTicker mapTickerForCurrency(String currencyType, String tickerData) {
         return mapTicker(tickerData).get(currencyType);
     }

diff --git a/src/main/java/com/cf/example/GetDailyBTCChartDataExample.java b/src/main/java/com/cf/example/GetDailyBTCChartDataExample.java
@@ -43,11 +43,12 @@ public void run(String propertiesFileName)
         {
             LOG.warn("Did not find value for " + POLONIEX_API_SECRET_PROP_NAME + " in " + propertiesFileName + ". Trading API commands will fail");
         }
-
+        
         PoloniexExchangeService service = new PoloniexExchangeService(tradingAPIKey, tradingAPISecret);
         Long yesterdayEpochSecond = ZonedDateTime.now(ZoneOffset.UTC).minusDays(1).toEpochSecond();
         List<PoloniexChartData> btcDailyChartData = service.returnChartData(PoloniexExchangeService.USDT_BTC_CURRENCY_PAIR, PoloniexExchangeService.DAILY_TIME_PERIOD, yesterdayEpochSecond);
         LOG.info(btcDailyChartData);
+        LOG.info(service.returnTicker());
     }
 
     private Properties loadProperties(String propertiesFileName)