Author: axh
Date: Wed Feb 21 21:28:04 2024
New Revision: 1915930
URL: http://svn.apache.org/viewvc?rev=1915930&view=rev
Log:
fix Logging issues:
- don't use foreign class in Logger initialization
- update log statements to use MessageFormat syntax
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipSecureFile.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartData.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/EscherPlaceholder.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SSSlideInfoAtom.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OfficeArtContent.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleSheet.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellFormat.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellFormatPart.java
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipSecureFile.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipSecureFile.java?rev=1915930&r1=1915929&r2=1915930&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipSecureFile.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipSecureFile.java
Wed Feb 21 21:28:04 2024
@@ -119,7 +119,7 @@ public class ZipSecureFile extends ZipFi
if (maxEntrySize < 0) {
throw new IllegalArgumentException("Max entry size must be greater
than or equal to zero");
} else if (maxEntrySize > DEFAULT_MAX_ENTRY_SIZE) {
- LOG.atWarn().log("setting max entry size greater than 4Gb can be
risky; set to " + maxEntrySize + " bytes");
+ LOG.warn("setting max entry size greater than 4Gb can be risky;
set to {} bytes", maxEntrySize);
}
MAX_ENTRY_SIZE = maxEntrySize;
}
@@ -183,7 +183,7 @@ public class ZipSecureFile extends ZipFi
if (maxTextSize < 0) {
throw new IllegalArgumentException("Max text size must be greater
than or equal to zero");
}else if (maxTextSize > DEFAULT_MAX_TEXT_SIZE) {
- LOG.atWarn().log("setting max text size greater than " +
DEFAULT_MAX_TEXT_SIZE + " can be risky; set to " + maxTextSize + " chars");
+ LOG.warn("setting max text size greater than {} can be risky; set
to {} chars", DEFAULT_MAX_TEXT_SIZE, maxTextSize);
}
MAX_TEXT_SIZE = maxTextSize;
}
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartData.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartData.java?rev=1915930&r1=1915929&r2=1915930&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartData.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartData.java
Wed Feb 21 21:28:04 2024
@@ -170,8 +170,8 @@ public abstract class XDDFChartData {
if (categoryData != null && values != null) {
int numOfPoints = category.getPointCount();
if (numOfPoints != values.getPointCount()) {
- LOGGER.warn("Category and values must have the same point
count, but had " +
- numOfPoints + " categories and " +
values.getPointCount() + " values.");
+ LOGGER.warn("Category and values must have the same point
count, but had {}" +
+ " categories and {} values.", numOfPoints,
values.getPointCount());
}
}
this.categoryData = category;
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java?rev=1915930&r1=1915929&r2=1915930&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java
(original)
+++
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java
Wed Feb 21 21:28:04 2024
@@ -44,7 +44,7 @@ class TestRelationships {
private static final String SHEET_WITH_COMMENTS =
"/xl/worksheets/sheet1.xml";
- private static final Logger LOG =
LogManager.getLogger(TestPackageCoreProperties.class);
+ private static final Logger LOG =
LogManager.getLogger(TestRelationships.class);
/**
* Test relationships are correctly loaded. This at the moment fails (as
of r499)
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/EscherPlaceholder.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/EscherPlaceholder.java?rev=1915930&r1=1915929&r2=1915930&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/EscherPlaceholder.java
(original)
+++
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/EscherPlaceholder.java
Wed Feb 21 21:28:04 2024
@@ -64,7 +64,7 @@ public class EscherPlaceholder extends E
unused = LittleEndian.getShort(data, offset+14);
if (bytesRemaining + 8 != 16) {
- LOG.warn("Invalid header-data received, should have 8 bytes left,
but had: " + bytesRemaining);
+ LOG.warn("Invalid header-data received, should have 8 bytes left,
but had: {}", bytesRemaining);
}
return bytesRemaining + 8;
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SSSlideInfoAtom.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SSSlideInfoAtom.java?rev=1915930&r1=1915929&r2=1915930&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SSSlideInfoAtom.java
(original)
+++
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SSSlideInfoAtom.java
Wed Feb 21 21:28:04 2024
@@ -203,21 +203,21 @@ public class SSSlideInfoAtom extends Rec
ofs += _header.length;
if (LittleEndian.getShort(_header, 0) != 0) {
- LOG.atDebug().log("Invalid data for SSSlideInfoAtom at offset 0: "
+ LittleEndian.getShort(_header, 0));
+ LOG.debug("Invalid data for SSSlideInfoAtom at offset 0: {}",
LittleEndian.getShort(_header, 0));
}
if (LittleEndian.getShort(_header, 2) !=
RecordTypes.SSSlideInfoAtom.typeID) {
- LOG.atDebug().log("Invalid data for SSSlideInfoAtom at offset 2:
"+ LittleEndian.getShort(_header, 2));
+ LOG.debug("Invalid data for SSSlideInfoAtom at offset 2: {}",
LittleEndian.getShort(_header, 2));
}
if (LittleEndian.getShort(_header, 4) != 0x10) {
- LOG.atDebug().log("Invalid data for SSSlideInfoAtom at offset 4:
"+ LittleEndian.getShort(_header, 4));
+ LOG.debug("Invalid data for SSSlideInfoAtom at offset 4: {}",
LittleEndian.getShort(_header, 4));
}
if (LittleEndian.getShort(_header, 6) == 0) {
- LOG.atDebug().log("Invalid data for SSSlideInfoAtom at offset 6:
"+ LittleEndian.getShort(_header, 6));
+ LOG.debug("Invalid data for SSSlideInfoAtom at offset 6: {}",
LittleEndian.getShort(_header, 6));
}
_slideTime = LittleEndian.getInt(source, ofs);
if (_slideTime < 0 || _slideTime > 86399000) {
- LOG.atDebug().log("Invalid data for SSSlideInfoAtom - invalid
slideTime: "+ _slideTime);
+ LOG.debug("Invalid data for SSSlideInfoAtom - invalid slideTime:
{}", _slideTime);
}
ofs += LittleEndianConsts.INT_SIZE;
_soundIdRef = LittleEndian.getInt(source, ofs);
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OfficeArtContent.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OfficeArtContent.java?rev=1915930&r1=1915929&r2=1915930&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OfficeArtContent.java
(original)
+++
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OfficeArtContent.java
Wed Feb 21 21:28:04 2024
@@ -79,7 +79,7 @@ public final class OfficeArtContent {
int pos = offset;
pos += drawingGroupData.fillFields(data, pos, recordFactory);
if (drawingGroupData.getRecordId() ==
EscherRecordTypes.DGG_CONTAINER.typeID) {
- LOG.atDebug().log("Invalid record-id for filling Escher records: "
+ drawingGroupData.getRecordId());
+ LOG.debug("Invalid record-id for filling Escher records: {}",
drawingGroupData.getRecordId());
}
/*
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleSheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleSheet.java?rev=1915930&r1=1915929&r2=1915930&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleSheet.java
(original)
+++
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleSheet.java
Wed Feb 21 21:28:04 2024
@@ -211,9 +211,9 @@ public final class StyleSheet {
@Deprecated
private void createPap(int istd, int nesting) {
if (nesting > MAX_PAPX_NESTING) {
- LOG.warn("Encountered too deep nesting, cannot fully process
stylesheet at " + istd +
- " with more than " + MAX_PAPX_NESTING + " nested
ParagraphProperties." +
- " Some data could not be parsed.");
+ LOG.warn("Encountered too deep nesting, cannot fully process
stylesheet at {}" +
+ " with more than {} nested ParagraphProperties." +
+ " Some data could not be parsed.", istd, MAX_PAPX_NESTING);
return;
}
@@ -268,9 +268,9 @@ public final class StyleSheet {
@Deprecated
private void createChp(int istd, int nesting) {
if (nesting > MAX_CHPX_NESTING) {
- LOG.warn("Encountered too deep nesting, cannot fully process
stylesheet at " + istd +
- " with more than " + MAX_CHPX_NESTING + " nested
CharacterProperties." +
- " Some data could not be parsed.");
+ LOG.warn("Encountered too deep nesting, cannot fully process
stylesheet at {}" +
+ " with more than {} nested CharacterProperties." +
+ " Some data could not be parsed.", istd, MAX_CHPX_NESTING);
return;
}
Modified:
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java?rev=1915930&r1=1915929&r2=1915930&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java
(original)
+++
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java
Wed Feb 21 21:28:04 2024
@@ -43,7 +43,7 @@ import org.junit.jupiter.params.provider
import org.junit.jupiter.params.provider.MethodSource;
public class TestWordToTextConverter {
- private static final Logger LOG =
LogManager.getLogger(WordToTextConverter.class);
+ private static final Logger LOG =
LogManager.getLogger(TestWordToTextConverter.class);
private static final List<String> failingFiles = Arrays.asList(
// Excel file
@@ -97,13 +97,13 @@ public class TestWordToTextConverter {
@ParameterizedTest
@MethodSource("files")
void testAllFiles(File file) throws Exception {
- LOG.info("Testing " + file);
+ LOG.info("Testing {}", file);
try (FileInputStream stream = new FileInputStream(file)) {
InputStream is = FileMagic.prepareToCheckMagic(stream);
FileMagic fm = FileMagic.valueOf(is);
if (fm != FileMagic.OLE2) {
- LOG.info("Skip non-doc file " + file);
+ LOG.info("Skip non-doc file {}", file);
return;
}
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellFormat.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellFormat.java?rev=1915930&r1=1915929&r2=1915930&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellFormat.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellFormat.java Wed
Feb 21 21:28:04 2024
@@ -192,7 +192,7 @@ public class CellFormat {
parts.add(new CellFormatPart(locale, valueDesc));
} catch (RuntimeException e) {
- LOG.log(Level.WARN, "Invalid format: " +
CellFormatter.quote(m.group()), e);
+ LOG.warn("Invalid format: {}", CellFormatter.quote(m.group()),
e);
parts.add(null);
}
}
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellFormatPart.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellFormatPart.java?rev=1915930&r1=1915929&r2=1915930&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellFormatPart.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellFormatPart.java
Wed Feb 21 21:28:04 2024
@@ -256,7 +256,7 @@ public class CellFormatPart {
return null;
Color c = NAMED_COLORS.get(cdesc);
if (c == null) {
- LOG.warn("Unknown color: " + quote(cdesc));
+ LOG.warn("Unknown color: {}", quote(cdesc));
}
return c;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
