From 58167a8a27f30d5d4f1d796b49b0cbcc30209fdf Mon Sep 17 00:00:00 2001
From: Ryo Kuramoto <kuramoto@n2sm.net>
Date: Fri, 6 Mar 2020 16:46:00 +0900
Subject: [PATCH] Improve logger.debug

---
 .../elasticsearch/df/content/csv/CsvContent.java       | 10 ++++------
 .../elasticsearch/df/content/json/JsonContent.java     |  5 ++---
 .../elasticsearch/df/content/xls/XlsContent.java       |  9 ++++-----
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/codelibs/elasticsearch/df/content/csv/CsvContent.java b/src/main/java/org/codelibs/elasticsearch/df/content/csv/CsvContent.java
index 672ee97..1e92159 100644
--- a/src/main/java/org/codelibs/elasticsearch/df/content/csv/CsvContent.java
+++ b/src/main/java/org/codelibs/elasticsearch/df/content/csv/CsvContent.java
@@ -88,9 +88,8 @@ public CsvContent(final Client client, final RestRequest request, final ContentT
         }
 
         if (logger.isDebugEnabled()) {
-            logger.debug("CsvConfig: " + csvConfig + ", appendHeader: "
-                    + appendHeader + ", charsetName: " + charsetName
-                    + ", headerSet: " + headerSet);
+            logger.debug("CsvConfig: {}, appendHeader: {}, charsetName: {}, headerSet: {}",
+                    csvConfig, appendHeader, charsetName, headerSet);
         }
     }
 
@@ -137,9 +136,8 @@ public void onResponse(final SearchResponse response) {
             final int size = hits.getHits().length;
             currentCount += size;
             if (logger.isDebugEnabled()) {
-                logger.debug("scrollId: " + scrollId + ", totalHits: "
-                        + hits.getTotalHits() + ", hits: " + size + ", current: "
-                        + currentCount);
+                logger.debug("scrollId: {}, totalHits: {}, hits: {}, current: {}",
+                        scrollId, hits.getTotalHits(), size, currentCount);
             }
             try {
                 for (final SearchHit hit : hits) {
diff --git a/src/main/java/org/codelibs/elasticsearch/df/content/json/JsonContent.java b/src/main/java/org/codelibs/elasticsearch/df/content/json/JsonContent.java
index d189fb7..36dacf9 100644
--- a/src/main/java/org/codelibs/elasticsearch/df/content/json/JsonContent.java
+++ b/src/main/java/org/codelibs/elasticsearch/df/content/json/JsonContent.java
@@ -75,9 +75,8 @@ public void onResponse(final SearchResponse response) {
             final int size = hits.getHits().length;
             currentCount += size;
             if (logger.isDebugEnabled()) {
-                logger.debug("scrollId: " + scrollId + ", totalHits: "
-                        + hits.getTotalHits() + ", hits: " + size + ", current: "
-                        + currentCount);
+                logger.debug("scrollId: {}, totalHits: {}, hits: {}, current: {}",
+                        scrollId, hits.getTotalHits(), size, currentCount);
             }
             try {
                 for (final SearchHit hit : hits) {
diff --git a/src/main/java/org/codelibs/elasticsearch/df/content/xls/XlsContent.java b/src/main/java/org/codelibs/elasticsearch/df/content/xls/XlsContent.java
index cf52644..7bf00f1 100644
--- a/src/main/java/org/codelibs/elasticsearch/df/content/xls/XlsContent.java
+++ b/src/main/java/org/codelibs/elasticsearch/df/content/xls/XlsContent.java
@@ -79,8 +79,8 @@ public XlsContent(final Client client, final RestRequest request, final ContentT
         this.isExcel2007 = isExcel2007;
 
         if (logger.isDebugEnabled()) {
-            logger.debug("appendHeader: " + appendHeader + ", headerSet: "
-                    + headerSet + ", isExcel2007: " + isExcel2007);
+            logger.debug("appendHeader: {}, headerSet: {}, isExcel2007: {}",
+                    appendHeader, headerSet, isExcel2007);
         }
     }
 
@@ -150,9 +150,8 @@ public void onResponse(final SearchResponse response) {
 
                 final int size = hits.getHits().length;
                 if (logger.isDebugEnabled()) {
-                    logger.debug("scrollId: " + scrollId + ", totalHits: "
-                            + hits.getTotalHits() + ", hits: " + size
-                            + ", current: " + (currentRowNumber + size));
+                    logger.debug("scrollId: {}, totalHits: {}, hits: {}, current: {}",
+                            scrollId, hits.getTotalHits(), size, (currentRowNumber + size));
                 }
                 for (final SearchHit hit : hits) {
                     final Map<String, Object> sourceMap = hit.getSourceAsMap();