From 2b14dc36bb091128ee5e60ae61b32dfee0d5f02a Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Thu, 17 Dec 2020 21:54:42 +0000 Subject: [PATCH] avoid string concats git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1884574 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/poi/examples/hssf/usermodel/Outlines.java | 2 +- src/java/org/apache/poi/hssf/record/FormatRecord.java | 2 +- src/java/org/apache/poi/hssf/record/LabelRecord.java | 4 ++-- .../org/apache/poi/hssf/record/OldLabelRecord.java | 4 ++-- .../org/apache/poi/ss/formula/WorkbookEvaluator.java | 10 +++++----- src/java/org/apache/poi/ss/util/CellUtil.java | 4 +--- src/java/org/apache/poi/util/POILogger.java | 2 +- .../temp/SXSSFWorkbookWithCustomZipEntrySource.java | 4 ++-- .../poi/xssf/streaming/SXSSFFormulaEvaluator.java | 2 +- .../org/apache/poi/xssf/usermodel/TestXSSFBugs.java | 4 ++-- .../poi/xssf/usermodel/TestXSSFSheetMergeRegions.java | 2 +- .../src/org/apache/poi/hdgf/chunks/Chunk.java | 5 ++--- .../org/apache/poi/hemf/record/emf/HemfComment.java | 4 ++-- .../org/apache/poi/hslf/usermodel/HSLFSimpleShape.java | 2 +- .../org/apache/poi/hslf/usermodel/HSLFSlideShow.java | 6 +++--- .../apache/poi/hwpf/converter/AbstractWordUtils.java | 2 +- .../apache/poi/hwpf/sprm/SectionSprmUncompressor.java | 2 +- 17 files changed, 29 insertions(+), 32 deletions(-) diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/Outlines.java b/src/examples/src/org/apache/poi/examples/hssf/usermodel/Outlines.java index d059a3d392..b5121448c4 100644 --- a/src/examples/src/org/apache/poi/examples/hssf/usermodel/Outlines.java +++ b/src/examples/src/org/apache/poi/examples/hssf/usermodel/Outlines.java @@ -41,7 +41,7 @@ public class Outlines implements Closeable { String log = (String) Outlines.class.getDeclaredMethod("test" + i).invoke(o); String filename = "outline" + i + ".xls"; o.writeOut(filename); - LOGGER.log(POILogger.INFO, filename + " written. " + log); + LOGGER.log(POILogger.INFO, filename, " written. ", log); } } } diff --git a/src/java/org/apache/poi/hssf/record/FormatRecord.java b/src/java/org/apache/poi/hssf/record/FormatRecord.java index 4eb4aeb56e..a08268d32c 100644 --- a/src/java/org/apache/poi/hssf/record/FormatRecord.java +++ b/src/java/org/apache/poi/hssf/record/FormatRecord.java @@ -149,7 +149,7 @@ public final class FormatRecord extends StandardRecord { } if (ris.available() > 0) { - logger.log(POILogger.INFO, "FormatRecord has "+ris.available()+" unexplained bytes. Silently skipping"); + logger.log(POILogger.INFO, "FormatRecord has ", ris.available(), " unexplained bytes. Silently skipping"); //swallow what's left while (ris.available() > 0) { ris.readByte(); diff --git a/src/java/org/apache/poi/hssf/record/LabelRecord.java b/src/java/org/apache/poi/hssf/record/LabelRecord.java index 9683c86e4c..ea20181220 100644 --- a/src/java/org/apache/poi/hssf/record/LabelRecord.java +++ b/src/java/org/apache/poi/hssf/record/LabelRecord.java @@ -78,8 +78,8 @@ public final class LabelRecord extends Record implements CellValueRecordInterfac if (in.remaining() > 0) { logger.log(POILogger.INFO, - "LabelRecord data remains: " + in.remaining() + - " : " + HexDump.toHex(in.readRemainder()) + "LabelRecord data remains: ", in.remaining(), + " : ", HexDump.toHex(in.readRemainder()) ); } } diff --git a/src/java/org/apache/poi/hssf/record/OldLabelRecord.java b/src/java/org/apache/poi/hssf/record/OldLabelRecord.java index 8a4697ff12..dc3822c3e1 100644 --- a/src/java/org/apache/poi/hssf/record/OldLabelRecord.java +++ b/src/java/org/apache/poi/hssf/record/OldLabelRecord.java @@ -63,8 +63,8 @@ public final class OldLabelRecord extends OldCellRecord { if (in.remaining() > 0) { logger.log(POILogger.INFO, - "LabelRecord data remains: " + in.remaining() + - " : " + HexDump.toHex(in.readRemainder()) + "LabelRecord data remains: ", in.remaining(), + " : ", HexDump.toHex(in.readRemainder()) ); } } diff --git a/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java b/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java index 77d0937876..fa8dec334b 100644 --- a/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java +++ b/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java @@ -406,7 +406,7 @@ public final class WorkbookEvaluator { // since we don't know how to handle these yet :( Ptg ptg = ptgs[i]; if (dbgEvaluationOutputIndent > 0) { - EVAL_LOG.log(POILogger.INFO, dbgIndentStr + " * ptg " + i + ": " + ptg + ", stack: " + stack); + EVAL_LOG.log(POILogger.INFO, dbgIndentStr, " * ptg ", i, ": ", ptg, ", stack: ", stack); } if (ptg instanceof AttrPtg) { AttrPtg attrPtg = (AttrPtg) ptg; @@ -551,7 +551,7 @@ public final class WorkbookEvaluator { // logDebug("push " + opResult); stack.push(opResult); if (dbgEvaluationOutputIndent > 0) { - EVAL_LOG.log(POILogger.INFO, dbgIndentStr + " = " + opResult); + EVAL_LOG.log(POILogger.INFO, dbgIndentStr, " = ", opResult); } } @@ -570,9 +570,9 @@ public final class WorkbookEvaluator { } if (dbgEvaluationOutputIndent > 0) { - EVAL_LOG.log(POILogger.INFO, dbgIndentStr + "finshed eval of " - + new CellReference(ec.getRowIndex(), ec.getColumnIndex()).formatAsString() - + ": " + result); + EVAL_LOG.log(POILogger.INFO, dbgIndentStr, "finished eval of ", + new CellReference(ec.getRowIndex(), ec.getColumnIndex()).formatAsString(), + ": ", result); dbgEvaluationOutputIndent--; if (dbgEvaluationOutputIndent == 1) { // this evaluation is done, reset indent to stop logging diff --git a/src/java/org/apache/poi/ss/util/CellUtil.java b/src/java/org/apache/poi/ss/util/CellUtil.java index dfbbf04481..67823b5494 100644 --- a/src/java/org/apache/poi/ss/util/CellUtil.java +++ b/src/java/org/apache/poi/ss/util/CellUtil.java @@ -385,9 +385,7 @@ public final class CellUtil { } else if (FILL_PATTERN.equals(key)) { dest.put(key, getFillPattern(src, key)); } else { - if (log.check(POILogger.INFO)) { - log.log(POILogger.INFO, "Ignoring unrecognized CellUtil format properties key: " + key); - } + log.log(POILogger.INFO, "Ignoring unrecognized CellUtil format properties key: ", key); } } } diff --git a/src/java/org/apache/poi/util/POILogger.java b/src/java/org/apache/poi/util/POILogger.java index fa52baabd5..7a7e9ee135 100644 --- a/src/java/org/apache/poi/util/POILogger.java +++ b/src/java/org/apache/poi/util/POILogger.java @@ -79,7 +79,7 @@ public interface POILogger { * An example: * 
      * if (logger.check(POILogger.INFO)) {
-     *     logger.log(POILogger.INFO, "Avoid concatenating " + " strings and evaluating " + functions());
+     *     logger.log(POILogger.INFO, "Avoid concatenating ", " strings and evaluating ", functions());
      * }
      *
* diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/temp/SXSSFWorkbookWithCustomZipEntrySource.java b/src/ooxml/java/org/apache/poi/poifs/crypt/temp/SXSSFWorkbookWithCustomZipEntrySource.java index 59e4ff5b99..01a0b21e18 100644 --- a/src/ooxml/java/org/apache/poi/poifs/crypt/temp/SXSSFWorkbookWithCustomZipEntrySource.java +++ b/src/ooxml/java/org/apache/poi/poifs/crypt/temp/SXSSFWorkbookWithCustomZipEntrySource.java @@ -60,8 +60,8 @@ public class SXSSFWorkbookWithCustomZipEntrySource extends SXSSFWorkbook { @Override protected SheetDataWriter createSheetDataWriter() throws IOException { //log values to ensure these values are accessible to subclasses - LOG.log(POILogger.INFO, "isCompressTempFiles: " + isCompressTempFiles()); - LOG.log(POILogger.INFO, "SharedStringSource: " + getSharedStringSource()); + LOG.log(POILogger.INFO, "isCompressTempFiles: ", isCompressTempFiles()); + LOG.log(POILogger.INFO, "SharedStringSource: ", getSharedStringSource()); return new SheetDataWriterWithDecorator(); } } diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java b/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java index 69f704ef78..7b8526d7e0 100644 --- a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java +++ b/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java @@ -111,7 +111,7 @@ public final class SXSSFFormulaEvaluator extends BaseXSSFFormulaEvaluator { int lastFlushedRowNum = ((SXSSFSheet) sheet).getLastFlushedRowNum(); if (lastFlushedRowNum > -1) { if (! skipOutOfWindow) throw new RowFlushedException(0); - logger.log(POILogger.INFO, "Rows up to " + lastFlushedRowNum + " have already been flushed, skipping"); + logger.log(POILogger.INFO, "Rows up to ", lastFlushedRowNum, " have already been flushed, skipping"); } } diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java index 667b4ff5dc..c280784553 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java @@ -3549,14 +3549,14 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues { LOG.log(POILogger.INFO, "Autosizing columns..."); for (int i = 0; i < 3; ++i) { - LOG.log(POILogger.INFO, "Autosize " + i + " - " + Duration.between(start, Instant.now())); + LOG.log(POILogger.INFO, "Autosize ", i, " - ", Duration.between(start, Instant.now())); sheet.autoSizeColumn(i); } for (int i = 0; i < 69 - 35 + 1; ++i) for (int j = 0; j < 8; ++j) { int col = 3 + 2 + i * (8 + 2) + j; - LOG.log(POILogger.INFO, "Autosize " + col + " - " + Duration.between(start, Instant.now())); + LOG.log(POILogger.INFO, "Autosize ", col, " - ", Duration.between(start, Instant.now())); sheet.autoSizeColumn(col); } LOG.log(POILogger.INFO, Duration.between(start, Instant.now())); diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java index f4a4ed0319..4f2779d97b 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java @@ -43,7 +43,7 @@ public class TestXSSFSheetMergeRegions { if (millis < 2000) { break; } - LOG.log(POILogger.INFO, "Retry " + i + " because run-time is too high: " + millis); + LOG.log(POILogger.INFO, "Retry ", i, " because run-time is too high: ", millis); } boolean inGump = false; diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java b/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java index 49bd462fdc..9c1716b571 100644 --- a/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java +++ b/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java @@ -242,12 +242,11 @@ public final class Chunk { default: logger.log(POILogger.INFO, - "Command of type " + type + " not processed!"); + "Command of type ", type, " not processed!"); } } catch (Exception e) { - logger.log(POILogger.ERROR, "Unexpected error processing command, ignoring and continuing. Command: " + - command, e); + logger.log(POILogger.ERROR, "Unexpected error processing command, ignoring and continuing. Command: ", command, e); } // Add to the array diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfComment.java b/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfComment.java index 83e8db7598..2590fd85b9 100644 --- a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfComment.java +++ b/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfComment.java @@ -601,8 +601,8 @@ public class HemfComment { // some emf comments are truncated, so we don't use readFully here int readBytes = leis.read(wmfData); if (readBytes < wmfData.length) { - logger.log(POILogger.INFO, "Emf comment with WMF: expected "+wmfData.length+ - " bytes - received only "+readBytes+" bytes."); + logger.log(POILogger.INFO, "Emf comment with WMF: expected ", wmfData.length, + " bytes - received only ", readBytes, " bytes."); } return leis.getReadIndex()-startIdx; diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java index 6e8c3699a7..fff3764bb4 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java @@ -322,7 +322,7 @@ public abstract class HSLFSimpleShape extends HSLFShape implements SimpleShape