Author: tilman Date: Tue Jul 2 12:49:26 2024 New Revision: 1918836 URL: http://svn.apache.org/viewvc?rev=1918836&view=rev Log: PDFBOX-5660: fix logging exception parameter type
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationCollector.java pdfbox/trunk/io/src/main/java/org/apache/pdfbox/io/ScratchFile.java pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/XrefParser.java pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLineAppearanceHandler.java pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/GlyphCache.java pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Hex.java pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java?rev=1918836&r1=1918835&r2=1918836&view=diff ============================================================================== --- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java (original) +++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java Tue Jul 2 12:49:26 2024 @@ -183,7 +183,7 @@ public class TSAClient } catch (IOException ex) { - LOG.error("Exception when writing to {}", this.url, ex); + LOG.error(() -> "Exception when writing to " + this.url, ex); throw ex; } @@ -196,7 +196,7 @@ public class TSAClient } catch (IOException ex) { - LOG.error("Exception when reading from {}", this.url, ex); + LOG.error(() -> "Exception when reading from " + this.url, ex); throw ex; } Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationCollector.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationCollector.java?rev=1918836&r1=1918835&r2=1918836&view=diff ============================================================================== --- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationCollector.java (original) +++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationCollector.java Tue Jul 2 12:49:26 2024 @@ -303,7 +303,7 @@ public class CertInformationCollector } catch (IOException | URISyntaxException | CertificateException e) { - LOG.error("Error getting alternative issuer certificate from {}", certInfo.issuerUrl, + LOG.error(() -> "Error getting alternative issuer certificate from " + certInfo.issuerUrl, e); } } Modified: pdfbox/trunk/io/src/main/java/org/apache/pdfbox/io/ScratchFile.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/io/src/main/java/org/apache/pdfbox/io/ScratchFile.java?rev=1918836&r1=1918835&r2=1918836&view=diff ============================================================================== --- pdfbox/trunk/io/src/main/java/org/apache/pdfbox/io/ScratchFile.java (original) +++ pdfbox/trunk/io/src/main/java/org/apache/pdfbox/io/ScratchFile.java Tue Jul 2 12:49:26 2024 @@ -155,9 +155,9 @@ public class ScratchFile implements Rand catch (IOException ioe) { // cannot happen for main memory setup - LOG.error( - "Unexpected exception occurred creating main memory scratch file instance: {}", - ioe.getMessage(), ioe); + LOG.error(() -> + "Unexpected exception occurred creating main memory scratch file instance: " + + ioe.getMessage(), ioe); return null; } } @@ -180,9 +180,9 @@ public class ScratchFile implements Rand catch (IOException ioe) { // cannot happen for main memory setup - LOG.error( - "Unexpected exception occurred creating main memory scratch file instance: {}", - ioe.getMessage(), ioe); + LOG.error(() -> + "Unexpected exception occurred creating main memory scratch file instance: " + + ioe.getMessage(), ioe); return null; } } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java?rev=1918836&r1=1918835&r2=1918836&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java Tue Jul 2 12:49:26 2024 @@ -119,7 +119,7 @@ public class COSObject extends COSBase i } catch (IOException e) { - LOG.error("Can't dereference {}", this, e); + LOG.error(() -> "Can't dereference " + this, e); } finally { Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java?rev=1918836&r1=1918835&r2=1918836&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java Tue Jul 2 12:49:26 2024 @@ -645,7 +645,7 @@ public class COSParser extends BaseParse { if (isLenient) { - LOG.error("object stream {} could not be parsed due to an exception", + LOG.error(() -> "object stream {} could not be parsed due to an exception" + objstmObjNr, ex); } else Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/XrefParser.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/XrefParser.java?rev=1918836&r1=1918835&r2=1918836&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/XrefParser.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/XrefParser.java Tue Jul 2 12:49:26 2024 @@ -147,7 +147,7 @@ public class XrefParser } catch (IOException ex) { - LOG.error("Failed to parse /XRefStm at offset {}", streamOffset, ex); + LOG.error("Failed to parse /XRefStm at offset " + streamOffset, ex); } } else Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java?rev=1918836&r1=1918835&r2=1918836&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java Tue Jul 2 12:49:26 2024 @@ -99,7 +99,7 @@ public class PDCIDFontType0 extends PDCI } catch (IOException e) { - LOG.error("Can't read the embedded CFF font {}", fd.getFontName(), e); + LOG.error(() -> "Can't read the embedded CFF font " + fd.getFontName(), e); fontIsDamaged = true; } } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java?rev=1918836&r1=1918835&r2=1918836&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java Tue Jul 2 12:49:26 2024 @@ -165,7 +165,7 @@ public abstract class PDFont implements } catch (IOException ex) { - LOG.error("Could not read ToUnicode CMap in font {}", getName(), ex); + LOG.error(() -> "Could not read ToUnicode CMap in font " + getName(), ex); } return cmap; } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java?rev=1918836&r1=1918835&r2=1918836&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java Tue Jul 2 12:49:26 2024 @@ -110,7 +110,7 @@ public class PDType1CFont extends PDSimp } catch (IOException e) { - LOG.error("Can't read the embedded Type1C font {}", getName(), e); + LOG.error(() -> "Can't read the embedded Type1C font " + getName(), e); fontIsDamaged = true; } } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java?rev=1918836&r1=1918835&r2=1918836&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java Tue Jul 2 12:49:26 2024 @@ -246,12 +246,12 @@ public class PDType1Font extends PDSimpl } catch (DamagedFontException e) { - LOG.warn("Can't read damaged embedded Type1 font {}", fd.getFontName(), e); + LOG.warn(() -> "Can't read damaged embedded Type1 font " + fd.getFontName(), e); fontIsDamaged = true; } catch (IOException e) { - LOG.error("Can't read the embedded Type1 font {}", fd.getFontName(), e); + LOG.error(() -> "Can't read the embedded Type1 font " + fd.getFontName(), e); fontIsDamaged = true; } } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java?rev=1918836&r1=1918835&r2=1918836&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java Tue Jul 2 12:49:26 2024 @@ -111,7 +111,7 @@ public class AxialShadingContext extends } catch (NoninvertibleTransformException ex) { - LOG.error("{}, matrix: {}", ex.getMessage(), matrix, ex); + LOG.error(() -> ex.getMessage() + ", matrix: " + matrix, ex); rat = new AffineTransform(); } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java?rev=1918836&r1=1918835&r2=1918836&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java Tue Jul 2 12:49:26 2024 @@ -117,7 +117,7 @@ public class RadialShadingContext extend } catch (NoninvertibleTransformException ex) { - LOG.error("{}, matrix: {}", ex.getMessage(), matrix, ex); + LOG.error(() -> ex.getMessage() + ", matrix: " + matrix, ex); rat = new AffineTransform(); } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java?rev=1918836&r1=1918835&r2=1918836&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java Tue Jul 2 12:49:26 2024 @@ -76,7 +76,7 @@ class Type1ShadingContext extends Shadin } catch (NoninvertibleTransformException ex) { - LOG.error("{}, matrix: {}", ex.getMessage(), matrix, ex); + LOG.error(() -> ex.getMessage() + ", matrix: " + matrix, ex); rat = new AffineTransform(); } } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLineAppearanceHandler.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLineAppearanceHandler.java?rev=1918836&r1=1918835&r2=1918836&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLineAppearanceHandler.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLineAppearanceHandler.java Tue Jul 2 12:49:26 2024 @@ -178,7 +178,7 @@ public class PDLineAppearanceHandler ext catch (IllegalArgumentException ex) { // Adobe Reader displays placeholders instead - LOG.error("line text '{}' can't be shown", annotation.getContents(), ex); + LOG.error(() -> "line text '" + annotation.getContents() + "' can't be shown", ex); } float xOffset = (lineLength - contentLength) / 2; float yOffset; Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/GlyphCache.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/GlyphCache.java?rev=1918836&r1=1918835&r2=1918836&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/GlyphCache.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/GlyphCache.java Tue Jul 2 12:49:26 2024 @@ -91,7 +91,7 @@ final class GlyphCache { // todo: escalate this error? String fontName = ((PDFontLike) font).getName(); - LOG.error("Glyph rendering failed for code {} in font {}", code, fontName, e); + LOG.error(() -> "Glyph rendering failed for code " + code + " in font " + fontName, e); return new GeneralPath(); } } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Hex.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Hex.java?rev=1918836&r1=1918835&r2=1918836&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Hex.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Hex.java Tue Jul 2 12:49:26 2024 @@ -235,7 +235,7 @@ public final class Hex } catch (NumberFormatException ex) { - LOG.error("Can't parse {}, aborting decode", hexByte, ex); + LOG.error(() -> "Can't parse " + hexByte + ", aborting decode", ex); break; } i += 2; Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java?rev=1918836&r1=1918835&r2=1918836&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java (original) +++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java Tue Jul 2 12:49:26 2024 @@ -299,7 +299,7 @@ public class TestPDFToImage { new FileOutputStream(new File(outDir, file.getName() + ".cmperror")).close(); failed = true; - LOG.error("Error comparing file output for " + file.getName(), e); + LOG.error(() -> "Error comparing file output for " + file.getName(), e); } return !failed; Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java?rev=1918836&r1=1918835&r2=1918836&view=diff ============================================================================== --- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java (original) +++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java Tue Jul 2 12:49:26 2024 @@ -349,7 +349,7 @@ public final class ExtractText implemen { throw ex; } - LOG.error("Failed to process page {}", p, ex); + LOG.error("Failed to process page " + p, ex); } } }