diff --git a/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java b/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java index 4c37e510fbf..4b429a78512 100644 --- a/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java +++ b/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java @@ -183,7 +183,7 @@ private byte[] getTSAResponse(byte[] request) throws IOException } 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 @@ private byte[] getTSAResponse(byte[] request) throws IOException } catch (IOException ex) { - LOG.error("Exception when reading from {}", this.url, ex); + LOG.error(() -> "Exception when reading from " + this.url, ex); throw ex; } diff --git a/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationCollector.java b/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationCollector.java index eb6b3e52c62..112f202353f 100644 --- a/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationCollector.java +++ b/examples/src/main/java/org/apache/pdfbox/examples/signature/validation/CertInformationCollector.java @@ -303,7 +303,7 @@ private void getAlternativeIssuerCertificate(CertSignatureInformation certInfo, } 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); } } diff --git a/io/src/main/java/org/apache/pdfbox/io/ScratchFile.java b/io/src/main/java/org/apache/pdfbox/io/ScratchFile.java index 4540e9f2a3c..b4beaaf52ad 100644 --- a/io/src/main/java/org/apache/pdfbox/io/ScratchFile.java +++ b/io/src/main/java/org/apache/pdfbox/io/ScratchFile.java @@ -155,9 +155,9 @@ public static ScratchFile getMainMemoryOnlyInstance() 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 static ScratchFile getMainMemoryOnlyInstance(long maxMainMemoryBytes) 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; } } diff --git a/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java b/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java index b8fa6b60a45..bb640ae5cd7 100644 --- a/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java +++ b/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java @@ -119,7 +119,7 @@ public COSBase getObject() } catch (IOException e) { - LOG.error("Can't dereference {}", this, e); + LOG.error(() -> "Can't dereference " + this, e); } finally { diff --git a/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java b/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java index 01d976b4d6f..b4be7ed7be7 100644 --- a/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java +++ b/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java @@ -645,7 +645,7 @@ protected COSBase parseObjectStreamObject(long objstmObjNr, COSObjectKey key) th { 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 diff --git a/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/XrefParser.java b/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/XrefParser.java index 18cc85578d0..df1481b7bf8 100644 --- a/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/XrefParser.java +++ b/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/XrefParser.java @@ -147,7 +147,7 @@ public COSDictionary parseXref(COSDocument document, long startXRefOffset) throw } catch (IOException ex) { - LOG.error("Failed to parse /XRefStm at offset {}", streamOffset, ex); + LOG.error("Failed to parse /XRefStm at offset " + streamOffset, ex); } } else diff --git a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java index fde33675da9..e33593e0e67 100644 --- a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java +++ b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java @@ -99,7 +99,7 @@ public PDCIDFontType0(COSDictionary fontDictionary, PDType0Font parent) throws I } 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; } } diff --git a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java index 55cf368d3ca..226a5e6e0fe 100644 --- a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java +++ b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java @@ -165,7 +165,7 @@ private CMap loadUnicodeCmap() } 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; } diff --git a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java index a97de750f09..966752e53cb 100644 --- a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java +++ b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java @@ -110,7 +110,7 @@ public PDType1CFont(COSDictionary fontDictionary) throws IOException } 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; } } diff --git a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java index 5126ac8c665..4d6493073ce 100644 --- a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java +++ b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java @@ -246,12 +246,12 @@ public PDType1Font(COSDictionary fontDictionary) throws IOException } 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; } } diff --git a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java index 085c8a0ab65..640688a0fcc 100644 --- a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java +++ b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java @@ -111,7 +111,7 @@ public AxialShadingContext(PDShadingType2 shading, ColorModel colorModel, Affine } catch (NoninvertibleTransformException ex) { - LOG.error("{}, matrix: {}", ex.getMessage(), matrix, ex); + LOG.error(() -> ex.getMessage() + ", matrix: " + matrix, ex); rat = new AffineTransform(); } diff --git a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java index fa79230fc7f..b9cca714be0 100644 --- a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java +++ b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java @@ -117,7 +117,7 @@ public RadialShadingContext(PDShadingType3 shading, ColorModel colorModel, } catch (NoninvertibleTransformException ex) { - LOG.error("{}, matrix: {}", ex.getMessage(), matrix, ex); + LOG.error(() -> ex.getMessage() + ", matrix: " + matrix, ex); rat = new AffineTransform(); } diff --git a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java index c8aae800898..685ba9b3911 100644 --- a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java +++ b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java @@ -76,7 +76,7 @@ class Type1ShadingContext extends ShadingContext } catch (NoninvertibleTransformException ex) { - LOG.error("{}, matrix: {}", ex.getMessage(), matrix, ex); + LOG.error(() -> ex.getMessage() + ", matrix: " + matrix, ex); rat = new AffineTransform(); } } diff --git a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLineAppearanceHandler.java b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLineAppearanceHandler.java index 153bc457a28..ec422b14622 100644 --- a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLineAppearanceHandler.java +++ b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLineAppearanceHandler.java @@ -178,7 +178,7 @@ public void generateNormalAppearance() 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; diff --git a/pdfbox/src/main/java/org/apache/pdfbox/rendering/GlyphCache.java b/pdfbox/src/main/java/org/apache/pdfbox/rendering/GlyphCache.java index b89b9553643..171b0fe85e0 100644 --- a/pdfbox/src/main/java/org/apache/pdfbox/rendering/GlyphCache.java +++ b/pdfbox/src/main/java/org/apache/pdfbox/rendering/GlyphCache.java @@ -91,7 +91,7 @@ else if (font instanceof PDSimpleFont) { // 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(); } } diff --git a/pdfbox/src/main/java/org/apache/pdfbox/util/Hex.java b/pdfbox/src/main/java/org/apache/pdfbox/util/Hex.java index 6bc8ba25dad..40ff4ba35f2 100644 --- a/pdfbox/src/main/java/org/apache/pdfbox/util/Hex.java +++ b/pdfbox/src/main/java/org/apache/pdfbox/util/Hex.java @@ -235,7 +235,7 @@ public static byte[] decodeHex(String s) } catch (NumberFormatException ex) { - LOG.error("Can't parse {}, aborting decode", hexByte, ex); + LOG.error(() -> "Can't parse " + hexByte + ", aborting decode", ex); break; } i += 2; diff --git a/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java b/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java index 39ed27731fd..4aca93c29a3 100644 --- a/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java +++ b/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java @@ -299,7 +299,7 @@ else if (!filesAreIdentical(outFile, inFile)) { 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; diff --git a/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java b/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java index 4778100d326..da94c3b9d92 100644 --- a/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java +++ b/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java @@ -349,7 +349,7 @@ private void extractPages(int startPage, int endPage, { throw ex; } - LOG.error("Failed to process page {}", p, ex); + LOG.error("Failed to process page " + p, ex); } } }