Merge pull request #55 from codelibs/improve-log

marevol · web-flow · commit 030db50a2f3e · 2020-03-06T20:44:24.000+09:00
Improve logger.debug
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
@@ -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
@@ -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
@@ -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();

Original file line number	Diff line number	Diff line change
`@@ -88,9 +88,8 @@ public CsvContent(final Client client, final RestRequest request, final ContentT`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`if (logger.isDebugEnabled()) {`
`91`		`- logger.debug("CsvConfig: " + csvConfig + ", appendHeader: "`
`92`		`- + appendHeader + ", charsetName: " + charsetName`
`93`		`- + ", headerSet: " + headerSet);`
	`91`	`+ logger.debug("CsvConfig: {}, appendHeader: {}, charsetName: {}, headerSet: {}",`
	`92`	`+ csvConfig, appendHeader, charsetName, headerSet);`
`94`	`93`	`}`
`95`	`94`	`}`
`96`	`95`
`@@ -137,9 +136,8 @@ public void onResponse(final SearchResponse response) {`
`137`	`136`	`final int size = hits.getHits().length;`
`138`	`137`	`currentCount += size;`
`139`	`138`	`if (logger.isDebugEnabled()) {`
`140`		`- logger.debug("scrollId: " + scrollId + ", totalHits: "`
`141`		`- + hits.getTotalHits() + ", hits: " + size + ", current: "`
`142`		`- + currentCount);`
	`139`	`+ logger.debug("scrollId: {}, totalHits: {}, hits: {}, current: {}",`
	`140`	`+ scrollId, hits.getTotalHits(), size, currentCount);`
`143`	`141`	`}`
`144`	`142`	`try {`
`145`	`143`	`for (final SearchHit hit : hits) {`
Original file line number	Diff line number	Diff line change
`@@ -79,8 +79,8 @@ public XlsContent(final Client client, final RestRequest request, final ContentT`
`79`	`79`	`this.isExcel2007 = isExcel2007;`
`80`	`80`
`81`	`81`	`if (logger.isDebugEnabled()) {`
`82`		`- logger.debug("appendHeader: " + appendHeader + ", headerSet: "`
`83`		`- + headerSet + ", isExcel2007: " + isExcel2007);`
	`82`	`+ logger.debug("appendHeader: {}, headerSet: {}, isExcel2007: {}",`
	`83`	`+ appendHeader, headerSet, isExcel2007);`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
`@@ -150,9 +150,8 @@ public void onResponse(final SearchResponse response) {`
`150`	`150`
`151`	`151`	`final int size = hits.getHits().length;`
`152`	`152`	`if (logger.isDebugEnabled()) {`
`153`		`- logger.debug("scrollId: " + scrollId + ", totalHits: "`
`154`		`- + hits.getTotalHits() + ", hits: " + size`
`155`		`- + ", current: " + (currentRowNumber + size));`
	`153`	`+ logger.debug("scrollId: {}, totalHits: {}, hits: {}, current: {}",`
	`154`	`+ scrollId, hits.getTotalHits(), size, (currentRowNumber + size));`
`156`	`155`	`}`
`157`	`156`	`for (final SearchHit hit : hits) {`
`158`	`157`	`final Map<String, Object> sourceMap = hit.getSourceAsMap();`