Author: tilman
Date: Tue Jul 2 13:20:51 2024
New Revision: 1918844
URL: http://svn.apache.org/viewvc?rev=1918844&view=rev
Log:
PDFBOX-5660: fix logging exception parameter type
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharString.java
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/OpenTypeScript.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocumentCatalog.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationStamp.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFDictionary.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharString.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharString.java?rev=1918844&r1=1918843&r2=1918844&view=diff
==============================================================================
---
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharString.java
(original)
+++
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharString.java
Tue Jul 2 13:20:51 2024
@@ -474,7 +474,7 @@ public class Type1CharString
}
catch (IOException e)
{
- LOG.warn("invalid seac character in glyph {} of font {}",
glyphName, fontName, e);
+ LOG.warn(() -> "invalid seac character in glyph " + glyphName + "
of font " + fontName, e);
}
// accent character
String accentName =
StandardEncoding.INSTANCE.getName(achar.intValue());
@@ -496,7 +496,7 @@ public class Type1CharString
}
catch (IOException e)
{
- LOG.warn("invalid seac character in glyph {} of font {}",
glyphName, fontName, e);
+ LOG.warn(() -> "invalid seac character in glyph " + glyphName + "
of font " + fontName, e);
}
}
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/OpenTypeScript.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/OpenTypeScript.java?rev=1918844&r1=1918843&r2=1918844&view=diff
==============================================================================
---
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/OpenTypeScript.java
(original)
+++
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/OpenTypeScript.java
Tue Jul 2 13:20:51 2024
@@ -215,7 +215,7 @@ public final class OpenTypeScript
}
catch (IOException e)
{
- LOG.warn("Could not parse Scripts.txt, mirroring char map will be
empty: {}",
+ LOG.warn(() -> "Could not parse Scripts.txt, mirroring char map
will be empty: " +
e.getMessage(), e);
}
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java?rev=1918844&r1=1918843&r2=1918844&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java
Tue Jul 2 13:20:51 2024
@@ -79,7 +79,8 @@ public abstract class BaseParser
catch (IllegalArgumentException | UnsupportedOperationException e)
{
cs = StandardCharsets.ISO_8859_1;
- LOG.warn("Charset is not supported: {}, falling back to {}",
charsetName, cs.name(), e);
+ LOG.warn(() -> "Charset is not supported: " + charsetName + ",
falling back to " +
+ StandardCharsets.ISO_8859_1.name(), e);
}
ALTERNATIVE_CHARSET = cs;
}
@@ -900,7 +901,8 @@ public abstract class BaseParser
catch (CharacterCodingException e)
{
// some malformed PDFs don't use UTF-8 see PDFBOX-3347
- LOG.debug("Buffer could not be decoded using
StandardCharsets.UTF_8 - trying {}", ALTERNATIVE_CHARSET.name(), e);
+ LOG.debug(() -> "Buffer could not be decoded using
StandardCharsets.UTF_8 - trying " +
+ ALTERNATIVE_CHARSET.name(), e);
return buffer.toString(ALTERNATIVE_CHARSET);
}
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocumentCatalog.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocumentCatalog.java?rev=1918844&r1=1918843&r2=1918844&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocumentCatalog.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocumentCatalog.java
Tue Jul 2 13:20:51 2024
@@ -476,7 +476,7 @@ public class PDDocumentCatalog implement
}
catch (IllegalArgumentException e)
{
- LOG.debug("Invalid PageMode used '{}' - setting to
PageMode.USE_NONE", mode, e);
+ LOG.debug(() -> "Invalid PageMode used '" + mode + "' -
setting to PageMode.USE_NONE", e);
return PageMode.USE_NONE;
}
}
@@ -512,7 +512,7 @@ public class PDDocumentCatalog implement
}
catch (IllegalArgumentException e)
{
- LOG.warn("Invalid PageLayout used '{}' - returning
PageLayout.SINGLE_PAGE", mode,
+ LOG.warn(() -> "Invalid PageLayout used '" + mode + "' -
returning PageLayout.SINGLE_PAGE",
e);
}
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationStamp.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationStamp.java?rev=1918844&r1=1918843&r2=1918844&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationStamp.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationStamp.java
Tue Jul 2 13:20:51 2024
@@ -100,7 +100,7 @@ public class FDFAnnotationStamp extends
catch (XPathExpressionException e)
{
// should not happen
- LOG.error("Error while evaluating XPath expression for appearance:
{}", e.getMessage(), e);
+ LOG.error(() -> "Error while evaluating XPath expression for
appearance: " + e.getMessage(), e);
return;
}
byte[] decodedAppearanceXML;
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFDictionary.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFDictionary.java?rev=1918844&r1=1918843&r2=1918844&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFDictionary.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFDictionary.java
Tue Jul 2 13:20:51 2024
@@ -98,9 +98,10 @@ public class FDFDictionary implements CO
}
catch (IOException e)
{
- LOG.warn(
- "Error parsing ID entry for attribute
'original' [{}]. ID entry ignored.",
- original, e);
+ LOG.warn(() ->
+ "Error parsing ID entry for attribute
'original' [" +
+ original + "]. ID entry ignored.",
+ e);
}
try
{
@@ -108,9 +109,10 @@ public class FDFDictionary implements CO
}
catch (IOException e)
{
- LOG.warn(
- "Error parsing ID entry for attribute
'modified' [{}]. ID entry ignored.",
- modified, e);
+ LOG.warn(() ->
+ "Error parsing ID entry for attribute
'modified' [ + " +
+ modified + "]. ID entry ignored.",
+ e);
}
setID(ids);
break;
@@ -129,8 +131,9 @@ public class FDFDictionary implements CO
}
catch (IOException e)
{
- LOG.warn("Error parsing field entry [{}].
Field ignored.",
- currentNode.getNodeValue(), e);
+ LOG.warn(() -> "Error parsing field entry
[" +
+ currentNode.getNodeValue() + "].
Field ignored.",
+ e);
}
}
}
@@ -210,9 +213,10 @@ public class FDFDictionary implements CO
}
catch (IOException e)
{
- LOG.warn(
- "Error parsing annotation
information [{}]. Annotation ignored",
- annot.getNodeValue(), e);
+ LOG.warn(() ->
+ "Error parsing annotation
information [" +
+ annot.getNodeValue() + "].
Annotation ignored",
+ e);
}
}
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java?rev=1918844&r1=1918843&r2=1918844&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java
Tue Jul 2 13:20:51 2024
@@ -126,7 +126,7 @@ public class PDCIDFontType2 extends PDCI
catch (IOException e)
{
fontIsDamaged = true;
- LOG.warn("Could not read embedded OTF for font {}",
getBaseFont(), e);
+ LOG.warn(() -> "Could not read embedded OTF for font " +
getBaseFont(), e);
}
if (ttfFont instanceof OpenTypeFont && !((OpenTypeFont)
ttfFont).isSupportedOTF())
{
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java?rev=1918844&r1=1918843&r2=1918844&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java
Tue Jul 2 13:20:51 2024
@@ -126,7 +126,7 @@ public class PDTrueTypeFont extends PDSi
}
catch (IOException e)
{
- LOG.warn("Could not read embedded TTF for font {}",
getBaseFont(), e);
+ LOG.warn(() -> "Could not read embedded TTF for font " +
getBaseFont(), e);
fontIsDamaged = true;
IOUtils.closeQuietly(view);
}
