Author: lehmi
Date: Fri Oct 27 06:05:21 2023
New Revision: 1913377
URL: http://svn.apache.org/viewvc?rev=1913377&view=rev
Log:
PDFBOX-5695: switch to log4j as suggested by Axel Howind
Modified:
pdfbox/trunk/pdfbox/pom.xml
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/DrawObject.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ClosePath.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveTo.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateInitialPoint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/DrawObject.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/LineTo.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/DrawObject.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetGraphicsStateParameters.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetLineDashPattern.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/text/MoveText.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/text/SetFontAndSize.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObject.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSString.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCIIHexFilter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/DCTFilter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/Filter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/FlateFilter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/JBIG2Filter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/JPXFilter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/LZWFilter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/LayerUtility.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFCloneUtility.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PageExtractor.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/Splitter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BaseParser.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BruteForceParser.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFParser.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/XrefTrailerResolver.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDAbstractContentStream.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocumentCatalog.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPage.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageContentStream.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageTree.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNameTreeNode.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNumberTreeNode.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDStream.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/function/PDFunctionType0.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDObjectReference.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureTreeRoot.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/taggedpdf/StandardStructureTypes.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/SecurityHandler.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/StandardSecurityHandler.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationFreeText.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationInk.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationLink.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolygon.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolyline.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/fixup/processor/AcroFormGenerateAppearancesProcessor.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fixup/processor/AcroFormOrphanWidgetsProcessor.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapperImpl.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.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/PDCIDFontType2.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2Embedder.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/PDFontFactory.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.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/font/PDType3CharProc.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3Font.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/GlyphList.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendComposite.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColor.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceNAttributes.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceNProcess.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactory.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PNGConverter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/SampledImageReader.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/AxialShadingPaint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/IntPoint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDMeshBasedShadingType.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType4.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDTriangleBasedShadingType.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/RadialShadingPaint.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/graphics/shading/Type1ShadingPaint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingPaint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingPaint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type6ShadingPaint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type7ShadingPaint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDSoftMask.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotation.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationPopup.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDCaretAppearanceHandler.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDCircleAppearanceHandler.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDFileAttachmentAppearanceHandler.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDFreeTextAppearanceHandler.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDHighlightAppearanceHandler.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDInkAppearanceHandler.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/pdmodel/interactive/annotation/handlers/PDLinkAppearanceHandler.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDPolygonAppearanceHandler.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDPolylineAppearanceHandler.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDSquareAppearanceHandler.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDSquigglyAppearanceHandler.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDStrikeoutAppearanceHandler.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDTextAppearanceHandler.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDUnderlineAppearanceHandler.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDFTemplateCreator.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDVisibleSigBuilder.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroForm.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTree.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDNonTerminalField.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDSignatureField.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/GlyphCache.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/SoftMask.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/TilingPaint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/TilingPaintFactory.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/LegacyPDFStreamEngine.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/TextPosition.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/DateConverter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Hex.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Version.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/text/BidiTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/text/TestTextStripper.java
Modified: pdfbox/trunk/pdfbox/pom.xml
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/pom.xml?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/pom.xml (original)
+++ pdfbox/trunk/pdfbox/pom.xml Fri Oct 27 06:05:21 2023
@@ -103,6 +103,11 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j2.version}</version>
<scope>test</scope>
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java
Fri Oct 27 06:05:21 2023
@@ -29,8 +29,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.contentstream.operator.MissingOperandException;
import
org.apache.pdfbox.contentstream.operator.state.EmptyGraphicsStackException;
import org.apache.pdfbox.cos.COSArray;
@@ -74,7 +74,7 @@ import org.apache.pdfbox.pdmodel.graphic
*/
public abstract class PDFStreamEngine
{
- private static final Log LOG = LogFactory.getLog(PDFStreamEngine.class);
+ private static final Logger LOG =
LogManager.getLogger(PDFStreamEngine.class);
private final Map<String, OperatorProcessor> operators = new HashMap<>(80);
@@ -671,12 +671,12 @@ public abstract class PDFStreamEngine
}
else if (obj instanceof COSArray)
{
- LOG.error("Nested arrays are not allowed in an array for TJ
operation: " + obj);
+ LOG.error("Nested arrays are not allowed in an array for TJ
operation: {}", obj);
}
else
{
- LOG.error("Unknown type " + obj.getClass().getSimpleName() +
- " in array for TJ operation: " + obj);
+ LOG.error("Unknown type {} in array for TJ operation: {}",
+ obj.getClass().getSimpleName(), obj);
}
}
}
@@ -1045,7 +1045,7 @@ public abstract class PDFStreamEngine
{
if (phase < 0)
{
- LOG.warn("Dash phase has negative value " + phase + ", set to 0");
+ LOG.warn("Dash phase has negative value {}, set to 0", phase);
phase = 0;
}
PDLineDashPattern lineDash = new PDLineDashPattern(array, phase);
@@ -1141,7 +1141,7 @@ public abstract class PDFStreamEngine
--level;
if (level < 0)
{
- LOG.error("level is " + level);
+ LOG.error("level is {}", level);
}
}
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/DrawObject.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/DrawObject.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/DrawObject.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/DrawObject.java
Fri Oct 27 06:05:21 2023
@@ -18,8 +18,8 @@ package org.apache.pdfbox.contentstream.
import java.io.IOException;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.contentstream.PDFStreamEngine;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
@@ -35,7 +35,7 @@ import org.apache.pdfbox.pdmodel.graphic
*/
public class DrawObject extends OperatorProcessor
{
- private static final Log LOG = LogFactory.getLog(DrawObject.class);
+ private static final Logger LOG = LogManager.getLogger(DrawObject.class);
public DrawObject(PDFStreamEngine context)
{
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ClosePath.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ClosePath.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ClosePath.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/ClosePath.java
Fri Oct 27 06:05:21 2023
@@ -19,8 +19,8 @@ package org.apache.pdfbox.contentstream.
import java.io.IOException;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
import org.apache.pdfbox.contentstream.operator.Operator;
@@ -33,7 +33,7 @@ import org.apache.pdfbox.contentstream.o
*/
public final class ClosePath extends GraphicsOperatorProcessor
{
- private static final Log LOG = LogFactory.getLog(ClosePath.class);
+ private static final Logger LOG = LogManager.getLogger(ClosePath.class);
public ClosePath(PDFGraphicsStreamEngine context)
{
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveTo.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveTo.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveTo.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveTo.java
Fri Oct 27 06:05:21 2023
@@ -19,8 +19,8 @@ package org.apache.pdfbox.contentstream.
import java.io.IOException;
import java.util.List;
import java.awt.geom.Point2D;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
import org.apache.pdfbox.contentstream.operator.MissingOperandException;
@@ -36,7 +36,7 @@ import org.apache.pdfbox.contentstream.o
*/
public class CurveTo extends GraphicsOperatorProcessor
{
- private static final Log LOG = LogFactory.getLog(CurveTo.class);
+ private static final Logger LOG = LogManager.getLogger(CurveTo.class);
public CurveTo(PDFGraphicsStreamEngine context)
{
@@ -68,7 +68,7 @@ public class CurveTo extends GraphicsOpe
if (context.getCurrentPoint() == null)
{
- LOG.warn("curveTo (" + point3.x + "," + point3.y + ") without
initial MoveTo");
+ LOG.warn("curveTo ({},{}) without initial MoveTo", point3.x,
point3.y);
context.moveTo(point3.x, point3.y);
}
else
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateInitialPoint.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateInitialPoint.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateInitialPoint.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateInitialPoint.java
Fri Oct 27 06:05:21 2023
@@ -20,8 +20,8 @@ import java.awt.geom.Point2D;
import java.io.IOException;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
import org.apache.pdfbox.contentstream.operator.MissingOperandException;
import org.apache.pdfbox.cos.COSBase;
@@ -36,7 +36,7 @@ import org.apache.pdfbox.contentstream.o
*/
public class CurveToReplicateInitialPoint extends GraphicsOperatorProcessor
{
- private static final Log LOG =
LogFactory.getLog(CurveToReplicateInitialPoint.class);
+ private static final Logger LOG =
LogManager.getLogger(CurveToReplicateInitialPoint.class);
public CurveToReplicateInitialPoint(PDFGraphicsStreamEngine context)
{
@@ -67,7 +67,7 @@ public class CurveToReplicateInitialPoin
if (currentPoint == null)
{
- LOG.warn("curveTo (" + point3.x + "," + point3.y + ") without
initial MoveTo");
+ LOG.warn("curveTo ({},{}) without initial MoveTo", point3.x,
point3.y);
context.moveTo(point3.x, point3.y);
}
else
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/DrawObject.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/DrawObject.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/DrawObject.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/DrawObject.java
Fri Oct 27 06:05:21 2023
@@ -19,8 +19,8 @@ package org.apache.pdfbox.contentstream.
import java.io.IOException;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
import org.apache.pdfbox.contentstream.operator.MissingOperandException;
import org.apache.pdfbox.cos.COSBase;
@@ -41,7 +41,7 @@ import org.apache.pdfbox.contentstream.o
*/
public final class DrawObject extends GraphicsOperatorProcessor
{
- private static final Log LOG = LogFactory.getLog(DrawObject.class);
+ private static final Logger LOG = LogManager.getLogger(DrawObject.class);
public DrawObject(PDFGraphicsStreamEngine context)
{
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/LineTo.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/LineTo.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/LineTo.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/LineTo.java
Fri Oct 27 06:05:21 2023
@@ -20,8 +20,8 @@ import java.io.IOException;
import java.util.List;
import java.awt.geom.Point2D;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.contentstream.PDFGraphicsStreamEngine;
import org.apache.pdfbox.contentstream.operator.MissingOperandException;
import org.apache.pdfbox.cos.COSBase;
@@ -36,7 +36,7 @@ import org.apache.pdfbox.contentstream.o
*/
public class LineTo extends GraphicsOperatorProcessor
{
- private static final Log LOG = LogFactory.getLog(LineTo.class);
+ private static final Logger LOG = LogManager.getLogger(LineTo.class);
public LineTo(PDFGraphicsStreamEngine context)
{
@@ -69,7 +69,7 @@ public class LineTo extends GraphicsOper
if (context.getCurrentPoint() == null)
{
- LOG.warn("LineTo (" + pos.x + "," + pos.y + ") without initial
MoveTo");
+ LOG.warn("LineTo ({},{}) without initial MoveTo", pos.x, pos.y);
context.moveTo(pos.x, pos.y);
}
else
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/DrawObject.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/DrawObject.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/DrawObject.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/DrawObject.java
Fri Oct 27 06:05:21 2023
@@ -19,8 +19,8 @@ package org.apache.pdfbox.contentstream.
import java.io.IOException;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.contentstream.PDFStreamEngine;
import org.apache.pdfbox.contentstream.operator.MissingOperandException;
import org.apache.pdfbox.contentstream.operator.Operator;
@@ -41,7 +41,7 @@ import org.apache.pdfbox.text.PDFMarkedC
*/
public class DrawObject extends OperatorProcessor
{
- private static final Log LOG = LogFactory.getLog(DrawObject.class);
+ private static final Logger LOG = LogManager.getLogger(DrawObject.class);
public DrawObject(PDFStreamEngine context)
{
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetGraphicsStateParameters.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetGraphicsStateParameters.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetGraphicsStateParameters.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetGraphicsStateParameters.java
Fri Oct 27 06:05:21 2023
@@ -19,8 +19,8 @@ package org.apache.pdfbox.contentstream.
import java.io.IOException;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.graphics.state.PDExtendedGraphicsState;
@@ -37,7 +37,7 @@ import org.apache.pdfbox.contentstream.o
*/
public class SetGraphicsStateParameters extends OperatorProcessor
{
- private static final Log LOG =
LogFactory.getLog(SetGraphicsStateParameters.class);
+ private static final Logger LOG =
LogManager.getLogger(SetGraphicsStateParameters.class);
public SetGraphicsStateParameters(PDFStreamEngine context)
{
@@ -63,7 +63,7 @@ public class SetGraphicsStateParameters
PDExtendedGraphicsState gs =
context.getResources().getExtGState(graphicsName);
if (gs == null)
{
- LOG.error("name for 'gs' operator not found in resources: /" +
graphicsName.getName());
+ LOG.error("name for 'gs' operator not found in resources: /{}",
graphicsName.getName());
return;
}
gs.copyIntoGraphicsState( context.getGraphicsState() );
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetLineDashPattern.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetLineDashPattern.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetLineDashPattern.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetLineDashPattern.java
Fri Oct 27 06:05:21 2023
@@ -18,8 +18,8 @@ package org.apache.pdfbox.contentstream.
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.contentstream.PDFStreamEngine;
import org.apache.pdfbox.contentstream.operator.MissingOperandException;
import org.apache.pdfbox.contentstream.operator.Operator;
@@ -36,7 +36,7 @@ import org.apache.pdfbox.cos.COSNumber;
*/
public class SetLineDashPattern extends OperatorProcessor
{
- private static final Log LOG = LogFactory.getLog(SetLineDashPattern.class);
+ private static final Logger LOG =
LogManager.getLogger(SetLineDashPattern.class);
public SetLineDashPattern(PDFStreamEngine context)
{
@@ -75,7 +75,7 @@ public class SetLineDashPattern extends
}
else
{
- LOG.warn("dash array has non number element " + base + ",
ignored");
+ LOG.warn("dash array has non number element {}, ignored",
base);
dashArray = new COSArray();
break;
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/text/MoveText.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/text/MoveText.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/text/MoveText.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/text/MoveText.java
Fri Oct 27 06:05:21 2023
@@ -18,8 +18,8 @@ package org.apache.pdfbox.contentstream.
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.contentstream.PDFStreamEngine;
import org.apache.pdfbox.contentstream.operator.MissingOperandException;
import org.apache.pdfbox.contentstream.operator.Operator;
@@ -36,7 +36,7 @@ import org.apache.pdfbox.util.Matrix;
*/
public class MoveText extends OperatorProcessor
{
- private static final Log LOG = LogFactory.getLog(MoveText.class);
+ private static final Logger LOG = LogManager.getLogger(MoveText.class);
public MoveText(PDFStreamEngine context)
{
@@ -54,7 +54,7 @@ public class MoveText extends OperatorPr
Matrix textLineMatrix = context.getTextLineMatrix();
if (textLineMatrix == null)
{
- LOG.warn("TextLineMatrix is null, " + getName() + " operator will
be ignored");
+ LOG.warn("TextLineMatrix is null, {} operator will be ignored",
getName());
return;
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/text/SetFontAndSize.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/text/SetFontAndSize.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/text/SetFontAndSize.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/text/SetFontAndSize.java
Fri Oct 27 06:05:21 2023
@@ -21,8 +21,8 @@ import java.io.IOException;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.contentstream.PDFStreamEngine;
import org.apache.pdfbox.contentstream.operator.MissingOperandException;
import org.apache.pdfbox.contentstream.operator.Operator;
@@ -40,7 +40,7 @@ import org.apache.pdfbox.pdmodel.font.PD
*/
public class SetFontAndSize extends OperatorProcessor
{
- private static final Log LOG = LogFactory.getLog(SetFontAndSize.class);
+ private static final Logger LOG =
LogManager.getLogger(SetFontAndSize.class);
public SetFontAndSize(PDFStreamEngine context)
{
@@ -72,7 +72,7 @@ public class SetFontAndSize extends Oper
PDFont font = context.getResources().getFont(fontName);
if (font == null)
{
- LOG.warn("font '" + fontName.getName() + "' not found in
resources");
+ LOG.warn("font '{}' not found in resources", fontName.getName());
}
context.getGraphicsState().getTextState().setFont(font);
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java
Fri Oct 27 06:05:21 2023
@@ -29,8 +29,8 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.function.BiConsumer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.pdmodel.common.COSObjectable;
import org.apache.pdfbox.util.DateConverter;
@@ -48,7 +48,7 @@ public class COSDictionary extends COSBa
/**
* Log instance.
*/
- private static final Log LOG = LogFactory.getLog(COSDictionary.class);
+ private static final Logger LOG =
LogManager.getLogger(COSDictionary.class);
private static final String PATH_SEPARATOR = "/";
private static final int MAP_THRESHOLD = 1000;
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDocument.java
Fri Oct 27 06:05:21 2023
@@ -25,8 +25,8 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.stream.Collectors;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.io.IOUtils;
import org.apache.pdfbox.io.RandomAccessStreamCache;
import org.apache.pdfbox.io.RandomAccessStreamCache.StreamCacheCreateFunction;
@@ -44,7 +44,7 @@ public class COSDocument extends COSBase
/**
* Log instance.
*/
- private static final Log LOG = LogFactory.getLog(COSDocument.class);
+ private static final Logger LOG = LogManager.getLogger(COSDocument.class);
private float version = 1.4f;
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=1913377&r1=1913376&r2=1913377&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 Fri
Oct 27 06:05:21 2023
@@ -18,8 +18,8 @@ package org.apache.pdfbox.cos;
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
/**
* This class represents a PDF object.
@@ -36,7 +36,7 @@ public class COSObject extends COSBase i
private boolean isDereferenced = false;
private final COSUpdateState updateState;
- private static final Log LOG = LogFactory.getLog(COSObject.class);
+ private static final Logger LOG = LogManager.getLogger(COSObject.class);
/**
* Constructor.
@@ -123,7 +123,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/cos/COSStream.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSStream.java Fri
Oct 27 06:05:21 2023
@@ -24,8 +24,8 @@ import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.filter.DecodeOptions;
import org.apache.pdfbox.filter.Filter;
import org.apache.pdfbox.filter.FilterFactory;
@@ -56,7 +56,7 @@ public class COSStream extends COSDictio
// random access view to be read from
private RandomAccessReadView randomAccessReadView;
- private static final Log LOG = LogFactory.getLog(COSStream.class);
+ private static final Logger LOG = LogManager.getLogger(COSStream.class);
/**
* Creates a new stream with an empty dictionary.
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSString.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSString.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSString.java
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSString.java Fri
Oct 27 06:05:21 2023
@@ -21,8 +21,8 @@ import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.util.Hex;
/**
@@ -45,7 +45,7 @@ import org.apache.pdfbox.util.Hex;
*/
public final class COSString extends COSBase
{
- private static final Log LOG = LogFactory.getLog(COSString.class);
+ private static final Logger LOG = LogManager.getLogger(COSString.class);
private byte[] bytes;
private boolean forceHexForm;
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCIIHexFilter.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCIIHexFilter.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCIIHexFilter.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCIIHexFilter.java
Fri Oct 27 06:05:21 2023
@@ -20,8 +20,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.util.Hex;
@@ -32,7 +32,7 @@ import org.apache.pdfbox.util.Hex;
*/
final class ASCIIHexFilter extends Filter
{
- private static final Log LOG = LogFactory.getLog(ASCIIHexFilter.class);
+ private static final Logger LOG =
LogManager.getLogger(ASCIIHexFilter.class);
private static final int[] REVERSE_HEX = {
/* 0 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -82,7 +82,7 @@ final class ASCIIHexFilter extends Filte
if (REVERSE_HEX[firstByte] == -1)
{
- LOG.error("Invalid hex, int: " + firstByte + " char: " +
(char)firstByte);
+ LOG.error("Invalid hex, int: {} char: {}", firstByte, (char)
firstByte);
}
value = REVERSE_HEX[firstByte] * 16;
secondByte = encoded.read();
@@ -95,7 +95,7 @@ final class ASCIIHexFilter extends Filte
}
if (REVERSE_HEX[secondByte] == -1)
{
- LOG.error("Invalid hex, int: " + secondByte + " char: " +
(char) secondByte);
+ LOG.error("Invalid hex, int: {} char: {}", secondByte, (char)
secondByte);
}
value += REVERSE_HEX[secondByte];
decoded.write(value);
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/DCTFilter.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/DCTFilter.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/DCTFilter.java
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/DCTFilter.java
Fri Oct 27 06:05:21 2023
@@ -35,8 +35,8 @@ import javax.xml.xpath.XPathExpression;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.cos.COSDictionary;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -49,7 +49,7 @@ import org.w3c.dom.NodeList;
*/
final class DCTFilter extends Filter
{
- private static final Log LOG = LogFactory.getLog(DCTFilter.class);
+ private static final Logger LOG = LogManager.getLogger(DCTFilter.class);
private static final int POS_TRANSFORM = 11;
private static final String ADOBE = "Adobe";
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/Filter.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/Filter.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/Filter.java
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/Filter.java Fri
Oct 27 06:05:21 2023
@@ -28,8 +28,8 @@ import java.util.zip.Deflater;
import javax.imageio.ImageIO;
import javax.imageio.ImageReader;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
@@ -49,7 +49,7 @@ import org.apache.pdfbox.io.RandomAccess
*/
public abstract class Filter
{
- private static final Log LOG = LogFactory.getLog(Filter.class);
+ private static final Logger LOG = LogManager.getLogger(Filter.class);
/**
* Compression Level System Property. Set this to a value from 0 to 9 to
change the zlib deflate
@@ -141,8 +141,8 @@ public abstract class Filter
}
else if (obj != null && !(filter instanceof COSArray || obj instanceof
COSArray))
{
- LOG.error("Expected DecodeParams to be an Array or Dictionary but
found " +
- obj.getClass().getName());
+ LOG.error("Expected DecodeParams to be an Array or Dictionary but
found {}",
+ obj.getClass().getName());
}
return new COSDictionary();
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/FlateFilter.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/FlateFilter.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/FlateFilter.java
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/FlateFilter.java
Fri Oct 27 06:05:21 2023
@@ -23,8 +23,8 @@ import java.util.zip.DataFormatException
import java.util.zip.Deflater;
import java.util.zip.DeflaterOutputStream;
import java.util.zip.Inflater;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.cos.COSDictionary;
/**
@@ -36,7 +36,7 @@ import org.apache.pdfbox.cos.COSDictiona
*/
final class FlateFilter extends Filter
{
- private static final Log LOG = LogFactory.getLog(FlateFilter.class);
+ private static final Logger LOG = LogManager.getLogger(FlateFilter.class);
@Override
public DecodeResult decode(InputStream encoded, OutputStream decoded,
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/JBIG2Filter.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/JBIG2Filter.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/JBIG2Filter.java
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/JBIG2Filter.java
Fri Oct 27 06:05:21 2023
@@ -28,8 +28,8 @@ import javax.imageio.ImageIO;
import javax.imageio.ImageReadParam;
import javax.imageio.ImageReader;
import javax.imageio.stream.ImageInputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSStream;
@@ -45,7 +45,7 @@ import org.apache.pdfbox.cos.COSStream;
*/
final class JBIG2Filter extends Filter
{
- private static final Log LOG = LogFactory.getLog(JBIG2Filter.class);
+ private static final Logger LOG = LogManager.getLogger(JBIG2Filter.class);
private static boolean levigoLogged = false;
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/JPXFilter.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/JPXFilter.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/JPXFilter.java
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/JPXFilter.java
Fri Oct 27 06:05:21 2023
@@ -34,8 +34,8 @@ import javax.imageio.ImageReader;
import javax.imageio.stream.ImageInputStream;
import javax.imageio.stream.MemoryCacheImageInputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
@@ -58,7 +58,7 @@ import org.apache.pdfbox.pdmodel.graphic
*/
public final class JPXFilter extends Filter
{
- private static final Log LOG = LogFactory.getLog(JPXFilter.class);
+ private static final Logger LOG = LogManager.getLogger(JPXFilter.class);
/**
* {@inheritDoc}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/LZWFilter.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/LZWFilter.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/LZWFilter.java
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/LZWFilter.java
Fri Oct 27 06:05:21 2023
@@ -26,8 +26,8 @@ import java.util.List;
import javax.imageio.stream.MemoryCacheImageInputStream;
import javax.imageio.stream.MemoryCacheImageOutputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
@@ -43,7 +43,7 @@ public class LZWFilter extends Filter
/**
* Log instance.
*/
- private static final Log LOG = LogFactory.getLog(LZWFilter.class);
+ private static final Logger LOG = LogManager.getLogger(LZWFilter.class);
/**
* The LZW clear table code.
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/LayerUtility.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/LayerUtility.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/LayerUtility.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/LayerUtility.java
Fri Oct 27 06:05:21 2023
@@ -24,8 +24,8 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.fontbox.util.BoundingBox;
import org.apache.pdfbox.cos.COSArray;
@@ -53,7 +53,7 @@ import org.apache.pdfbox.util.Matrix;
*/
public class LayerUtility
{
- private static final Log LOG = LogFactory.getLog(LayerUtility.class);
+ private static final Logger LOG = LogManager.getLogger(LayerUtility.class);
private static final boolean DEBUG = true;
@@ -264,8 +264,8 @@ public class LayerUtility
if ((cropBox.getLowerLeftX() < 0 || cropBox.getLowerLeftY() < 0) &&
transform.isIdentity())
{
// PDFBOX-4044
- LOG.warn("Negative cropBox " + cropBox +
- " and identity transform may make your form invisible");
+ LOG.warn("Negative cropBox {} and identity transform may make your
form invisible",
+ cropBox);
}
PDOptionalContentGroup layer = new PDOptionalContentGroup(layerName);
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFCloneUtility.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFCloneUtility.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFCloneUtility.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFCloneUtility.java
Fri Oct 27 06:05:21 2023
@@ -23,8 +23,8 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
@@ -40,7 +40,7 @@ import org.apache.pdfbox.pdmodel.common.
*/
public class PDFCloneUtility
{
- private static final Log LOG = LogFactory.getLog(PDFCloneUtility.class);
+ private static final Logger LOG =
LogManager.getLogger(PDFCloneUtility.class);
private final PDDocument destination;
private final Map<COSBase, COSBase> clonedVersion = new HashMap<>();
@@ -249,8 +249,9 @@ public class PDFCloneUtility
if (actual == parent)
{
COSObject cosObj = ((COSObject) value);
- LOG.warn(parent.getClass().getSimpleName() + " object has a
reference to itself: "
- + cosObj.getObjectNumber() + " " +
cosObj.getGenerationNumber() + " R");
+ LOG.warn("{} object has a reference to itself: {} {} R",
+ parent.getClass().getSimpleName(),
cosObj.getObjectNumber(),
+ cosObj.getGenerationNumber());
return true;
}
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
Fri Oct 27 06:05:21 2023
@@ -30,8 +30,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.Loader;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
@@ -87,7 +87,7 @@ public class PDFMergerUtility
/**
* Log instance.
*/
- private static final Log LOG = LogFactory.getLog(PDFMergerUtility.class);
+ private static final Logger LOG =
LogManager.getLogger(PDFMergerUtility.class);
private final List<Object> sources;
private String destinationFileName;
@@ -697,7 +697,8 @@ public class PDFMergerUtility
COSBase base = srcNums.getObject(i);
if (!(base instanceof COSNumber))
{
- LOG.error("page labels ignored, index " + i + " should
be a number, but is " + base);
+ LOG.error("page labels ignored, index {} should be a
number, but is {}", i,
+ base);
// remove what we added
while (destNums.size() > startSize)
{
@@ -1105,7 +1106,7 @@ public class PDFMergerUtility
{
if (destNames.containsKey(entry.getKey()))
{
- LOG.warn("key " + entry.getKey() + " already exists in
destination IDTree");
+ LOG.warn("key {} already exists in destination IDTree",
entry.getKey());
}
else
{
@@ -1197,7 +1198,7 @@ public class PDFMergerUtility
}
if (destDict.containsKey(entry.getKey()))
{
- LOG.warn("key " + entry.getKey() + " already exists in
destination RoleMap");
+ LOG.warn("key {} already exists in destination RoleMap",
entry.getKey());
}
else
{
@@ -1436,18 +1437,20 @@ public class PDFMergerUtility
COSBase item = parentTreeEntry.getItem(COSName.OBJ);
if (item instanceof COSObject)
{
- LOG.debug("clone potential orphan object in structure
tree: " + item +
- ", Type: " + objDict.getNameAsString(COSName.TYPE)
+
- ", Subtype: " +
objDict.getNameAsString(COSName.SUBTYPE) +
- ", T: " + objDict.getNameAsString(COSName.T));
+ LOG.debug(
+ "clone potential orphan object in structure tree:
{}, Type: {}, Subtype: {}, T: {}",
+ item, objDict.getNameAsString(COSName.TYPE),
+ objDict.getNameAsString(COSName.SUBTYPE),
+ objDict.getNameAsString(COSName.T));
}
else
{
// don't display in full because of stack overflow
- LOG.debug("clone potential orphan object in structure
tree" +
- ", Type: " + objDict.getNameAsString(COSName.TYPE)
+
- ", Subtype: " +
objDict.getNameAsString(COSName.SUBTYPE) +
- ", T: " + objDict.getNameAsString(COSName.T));
+ LOG.debug(
+ "clone potential orphan object in structure tree,
Type: {}, Subtype: {}, T: {}",
+ objDict.getNameAsString(COSName.TYPE),
+ objDict.getNameAsString(COSName.SUBTYPE),
+ objDict.getNameAsString(COSName.T));
}
parentTreeEntry.setItem(COSName.OBJ,
cloner.cloneForNewDocument(objDict));
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PageExtractor.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PageExtractor.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PageExtractor.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PageExtractor.java
Fri Oct 27 06:05:21 2023
@@ -19,8 +19,8 @@ package org.apache.pdfbox.multipdf;
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
@@ -31,7 +31,7 @@ import org.apache.pdfbox.pdmodel.PDPage;
*/
public class PageExtractor
{
- private static final Log LOG = LogFactory.getLog(PageExtractor.class);
+ private static final Logger LOG =
LogManager.getLogger(PageExtractor.class);
private final PDDocument sourceDocument;
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/Splitter.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/Splitter.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/Splitter.java
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/Splitter.java
Fri Oct 27 06:05:21 2023
@@ -20,8 +20,8 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
@@ -44,7 +44,7 @@ import org.apache.pdfbox.pdmodel.interac
*/
public class Splitter
{
- private static final Log LOG = LogFactory.getLog(Splitter.class);
+ private static final Logger LOG = LogManager.getLogger(Splitter.class);
private PDDocument sourceDocument;
private PDDocument currentDestinationDocument;
@@ -231,8 +231,8 @@ public class Splitter
COSBase value =
sourceDocumentInformationDictionary.getDictionaryObject(key);
if (value instanceof COSDictionary)
{
- LOG.warn("Nested entry for key '" + key.getName()
- + "' skipped in document information dictionary");
+ LOG.warn("Nested entry for key '{}' skipped in document
information dictionary",
+ key.getName());
if (sourceDocument.getDocumentCatalog().getCOSObject() ==
sourceDocument.getDocumentInformation().getCOSObject())
{
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=1913377&r1=1913376&r2=1913377&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
Fri Oct 27 06:05:21 2023
@@ -26,8 +26,8 @@ import java.nio.charset.StandardCharsets
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSBoolean;
@@ -62,7 +62,7 @@ public abstract class BaseParser
/**
* Log instance.
*/
- private static final Log LOG = LogFactory.getLog(BaseParser.class);
+ private static final Logger LOG = LogManager.getLogger(BaseParser.class);
protected static final int E = 'e';
protected static final int N = 'n';
@@ -198,24 +198,24 @@ public abstract class BaseParser
readExpectedChar('R');
if (!(value instanceof COSInteger))
{
- LOG.error("expected number, actual=" + value + " at offset " +
numOffset);
+ LOG.error("expected number, actual={} at offset {}", value,
numOffset);
return COSNull.NULL;
}
if (!(generationNumber instanceof COSInteger))
{
- LOG.error("expected number, actual=" + generationNumber + " at
offset " + genOffset);
+ LOG.error("expected number, actual={} at offset {}",
generationNumber, genOffset);
return COSNull.NULL;
}
long objNumber = ((COSInteger) value).longValue();
if (objNumber <= 0)
{
- LOG.warn("invalid object number value =" + objNumber + " at offset
" + numOffset);
+ LOG.warn("invalid object number value ={} at offset {}",
objNumber, numOffset);
return COSNull.NULL;
}
int genNumber = ((COSInteger) generationNumber).intValue();
if (genNumber < 0)
{
- LOG.error("invalid generation number value =" + genNumber + " at
offset " + numOffset);
+ LOG.error("invalid generation number value ={} at offset {}",
genNumber, numOffset);
return COSNull.NULL;
}
// dereference the object
@@ -268,8 +268,8 @@ public abstract class BaseParser
else
{
// invalid dictionary, we were expecting a /Name, read until
the end or until we can recover
- LOG.warn("Invalid dictionary, found: '" + c + "' but expected:
'/' at offset "
- + source.getPosition());
+ LOG.warn("Invalid dictionary, found: '{}' but expected: '/' at
offset {}", c,
+ source.getPosition());
if (readUntilEndOfCOSDictionary())
{
// we couldn't recover
@@ -284,8 +284,8 @@ public abstract class BaseParser
}
catch (IOException exception)
{
- LOG.warn("Invalid dictionary, can't find end of dictionary at
offset "
- + source.getPosition());
+ LOG.warn("Invalid dictionary, can't find end of dictionary at
offset {}",
+ source.getPosition());
}
return obj;
}
@@ -342,18 +342,18 @@ public abstract class BaseParser
COSName key = parseCOSName();
if (key == null || key.getName().isEmpty())
{
- LOG.warn("Empty COSName at offset " + source.getPosition());
+ LOG.warn("Empty COSName at offset {}", source.getPosition());
}
COSBase value = parseCOSDictionaryValue();
skipSpaces();
if (value == null)
{
- LOG.warn("Bad dictionary declaration at offset " +
source.getPosition());
+ LOG.warn("Bad dictionary declaration at offset {}",
source.getPosition());
return false;
}
else if (value instanceof COSInteger && !((COSInteger)
value).isValid())
{
- LOG.warn("Skipped out of range number value at offset " +
source.getPosition());
+ LOG.warn("Skipped out of range number value at offset {}",
source.getPosition());
}
else
{
@@ -711,8 +711,8 @@ public abstract class BaseParser
}
else
{
- LOG.warn("Invalid value(s) for an object key " +
number.longValue()
- + " " + genNumber.intValue());
+ LOG.warn("Invalid value(s) for an object key {}
{}", number.longValue(),
+ genNumber.intValue());
}
}
}
@@ -721,8 +721,8 @@ public abstract class BaseParser
if (pbo == null)
{
//it could be a bad object in the array which is just skipped
- LOG.warn("Corrupt array element at offset " +
source.getPosition()
- + ", start offset: " + startPosition);
+ LOG.warn("Corrupt array element at offset {}, start offset:
{}",
+ source.getPosition(), startPosition);
String isThisTheEnd = readString();
// return immediately if a corrupt element is followed by
another array
// to avoid a possible infinite recursion as most likely the
whole array is corrupted
@@ -929,8 +929,8 @@ public abstract class BaseParser
}
else
{
- LOG.warn("Skipped unexpected dir object = '" + badString + "'
at offset "
- + source.getPosition() + " (start offset: " +
startOffset + ")");
+ LOG.warn("Skipped unexpected dir object = '{}' at offset {}
(start offset: {})",
+ badString, source.getPosition(), startOffset);
return this instanceof PDFStreamParser ? null : COSNull.NULL;
}
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BruteForceParser.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BruteForceParser.java?rev=1913377&r1=1913376&r2=1913377&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BruteForceParser.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/BruteForceParser.java
Fri Oct 27 06:05:21 2023
@@ -24,8 +24,8 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.stream.Collectors;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
@@ -68,7 +68,7 @@ public class BruteForceParser extends CO
*/
private static final char[] OBJ_STREAM = { '/', 'O', 'b', 'j', 'S', 't',
'm' };
- private static final Log LOG = LogFactory.getLog(BruteForceParser.class);
+ private static final Logger LOG =
LogManager.getLogger(BruteForceParser.class);
/**
* Contains all found objects of a brute force search.
@@ -308,8 +308,8 @@ public class BruteForceParser extends CO
// log warning about skipped stream
bfSearchForObjStreamOffsets.entrySet().stream() //
.filter(o -> bfCOSObjectOffsets.get(o.getValue()) == null) //
- .forEach(o -> LOG.warn(
- "Skipped incomplete object stream:" + o.getValue() + "
at " + o.getKey()));
+ .forEach(o -> LOG.warn("Skipped incomplete object stream:{} at
{}", o.getValue(),
+ o.getKey()));
// collect all stream offsets
List<Long> objStreamOffsets =
bfSearchForObjStreamOffsets.entrySet().stream() //
@@ -355,7 +355,7 @@ public class BruteForceParser extends CO
}
catch (IOException exception)
{
- LOG.debug("Skipped corrupt stream: (" + stmObjNumber + " 0 at
offset " + offset,
+ LOG.debug("Skipped corrupt stream: ({} 0 at offset {}",
stmObjNumber, offset,
exception);
}
finally
@@ -614,7 +614,7 @@ public class BruteForceParser extends CO
}
}
}
- LOG.debug("Dictionary start for object stream -> "
+ newOffset);
+ LOG.debug("Dictionary start for object stream ->
{}", newOffset);
objFound = true;
break;
}
@@ -711,8 +711,8 @@ public class BruteForceParser extends CO
}
}
}
- LOG.debug("Fixed reference for xref stream " +
xrefOffset + " -> "
- + newOffset);
+ LOG.debug("Fixed reference for xref stream {} ->
{}", xrefOffset,
+ newOffset);
objFound = true;
break;
}
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=1913377&r1=1913376&r2=1913377&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
Fri Oct 27 06:05:21 2023
@@ -29,8 +29,8 @@ import java.util.Optional;
import java.util.Map.Entry;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
@@ -143,7 +143,7 @@ public class COSParser extends BaseParse
*/
private int readTrailBytes = DEFAULT_TRAIL_BYTECOUNT;
- private static final Log LOG = LogFactory.getLog(COSParser.class);
+ private static final Logger LOG = LogManager.getLogger(COSParser.class);
/**
* Collects all Xref/trailer objects and resolves them into single
@@ -212,8 +212,9 @@ public class COSParser extends BaseParse
}
catch (NumberFormatException nfe)
{
- LOG.warn("System property " + SYSPROP_EOFLOOKUPRANGE
- + " does not contain an integer value, but: '" +
eofLookupRangeStr + "'");
+ LOG.warn(
+ "System property " + SYSPROP_EOFLOOKUPRANGE + " does
not contain an integer value, but: '{}'",
+ eofLookupRangeStr);
}
}
document = new COSDocument(streamCacheCreateFunction, this);
@@ -374,7 +375,8 @@ public class COSParser extends BaseParse
fixedOffset = checkXRefOffset(streamOffset);
if (fixedOffset > -1 && fixedOffset != streamOffset)
{
- LOG.warn("/XRefStm offset " + streamOffset + " is
incorrect, corrected to " + fixedOffset);
+ LOG.warn("/XRefStm offset {} is incorrect, corrected
to {}", streamOffset,
+ fixedOffset);
streamOffset = (int)fixedOffset;
trailer.setInt(COSName.XREF_STM, streamOffset);
}
@@ -391,7 +393,8 @@ public class COSParser extends BaseParse
{
if (isLenient)
{
- LOG.error("Failed to parse /XRefStm at offset
" + streamOffset, ex);
+ LOG.error("Failed to parse /XRefStm at offset
{}", streamOffset,
+ ex);
}
else
{
@@ -403,7 +406,8 @@ public class COSParser extends BaseParse
{
if(isLenient)
{
- LOG.error("Skipped XRef stream due to a corrupt
offset:"+streamOffset);
+ LOG.error("Skipped XRef stream due to a corrupt
offset:{}",
+ streamOffset);
}
else
{
@@ -531,7 +535,7 @@ public class COSParser extends BaseParse
{
// in lenient mode the '%%EOF' isn't needed
bufOff = buf.length;
- LOG.debug("Missing end of file marker '" + new
String(EOF_MARKER) + "'");
+ LOG.debug("Missing end of file marker '{}'", new
String(EOF_MARKER));
}
else
{
@@ -696,7 +700,7 @@ public class COSParser extends BaseParse
offsetOrObjstmObNr =
getBruteForceParser().getBFCOSObjectOffsets().get(objKey);
if (offsetOrObjstmObNr != null)
{
- LOG.debug("Set missing offset " + offsetOrObjstmObNr + " for
object " + objKey);
+ LOG.debug("Set missing offset {} for object {}",
offsetOrObjstmObNr, objKey);
document.getXrefTable().put(objKey, offsetOrObjstmObNr);
}
}
@@ -784,9 +788,8 @@ public class COSParser extends BaseParse
{
if (isLenient)
{
- LOG.warn("Object (" + readObjNr + ":" + readObjGen + ") at
offset "
- + objOffset + " does not end with 'endobj' but with '"
- + endObjectKey + "'");
+ LOG.warn("Object ({}:{}) at offset {} does not end with
'endobj' but with '{}'",
+ readObjNr, readObjGen, objOffset, endObjectKey);
}
else
{
@@ -833,8 +836,8 @@ public class COSParser extends BaseParse
{
if (isLenient)
{
- LOG.error("object stream " + objstmObjNr
- + " could not be parsed due to an exception", ex);
+ LOG.error("object stream {} could not be parsed due to an
exception",
+ objstmObjNr, ex);
}
else
{
@@ -870,8 +873,8 @@ public class COSParser extends BaseParse
}
if (COSNull.NULL == length)
{
- LOG.warn("Length object (" + lengthObj.getObjectNumber() + " "
- + lengthObj.getGenerationNumber() + ") not found");
+ LOG.warn("Length object ({} {}) not found",
lengthObj.getObjectNumber(),
+ lengthObj.getGenerationNumber());
return null;
}
if (length instanceof COSNumber)
@@ -914,8 +917,9 @@ public class COSParser extends BaseParse
{
if (isLenient)
{
- LOG.warn("The stream doesn't provide any stream length, using
fallback readUntilEnd, at offset "
- + source.getPosition());
+ LOG.warn(
+ "The stream doesn't provide any stream length, using
fallback readUntilEnd, at offset {}",
+ source.getPosition());
}
else
{
@@ -939,15 +943,15 @@ public class COSParser extends BaseParse
String endStream = readString();
if (endStream.equals("endobj") && isLenient)
{
- LOG.warn("stream ends with 'endobj' instead of 'endstream' at
offset "
- + source.getPosition());
+ LOG.warn("stream ends with 'endobj' instead of 'endstream' at
offset {}",
+ source.getPosition());
// avoid follow-up warning about missing endobj
source.rewind(ENDOBJ.length);
}
else if (endStream.length() > 9 && isLenient &&
endStream.startsWith(ENDSTREAM_STRING))
{
- LOG.warn("stream ends with '" + endStream + "' instead of
'endstream' at offset "
- + source.getPosition());
+ LOG.warn("stream ends with '{}' instead of 'endstream' at offset
{}", endStream,
+ source.getPosition());
// unread the "extra" bytes
source.rewind(endStream.substring(9).getBytes(StandardCharsets.ISO_8859_1).length);
}
@@ -1076,9 +1080,9 @@ public class COSParser extends BaseParse
if (expectedEndOfStream > fileLen)
{
streamLengthIsValid = false;
- LOG.warn("The end of the stream is out of range, using workaround
to read the stream, "
- + "stream start position: " + originOffset + ", length: "
+ streamLength
- + ", expected end position: " + expectedEndOfStream);
+ LOG.warn(
+ "The end of the stream is out of range, using workaround
to read the stream, stream start position: {}, length: {}, expected end
position: {}",
+ originOffset, streamLength, expectedEndOfStream);
}
else
{
@@ -1087,9 +1091,9 @@ public class COSParser extends BaseParse
if (!isString(ENDSTREAM))
{
streamLengthIsValid = false;
- LOG.warn("The end of the stream doesn't point to the correct
offset, using workaround to read the stream, "
- + "stream start position: " + originOffset + ",
length: " + streamLength
- + ", expected end position: " + expectedEndOfStream);
+ LOG.warn(
+ "The end of the stream doesn't point to the correct
offset, using workaround to read the stream, stream start position: {}, length:
{}, expected end position: {}",
+ originOffset, streamLength, expectedEndOfStream);
}
source.seek(originOffset);
}
@@ -1171,7 +1175,7 @@ public class COSParser extends BaseParse
catch (IOException exception)
{
// there wasn't an object of a xref stream
- LOG.debug("No Xref stream at given location " +
startXRefOffset, exception);
+ LOG.debug("No Xref stream at given location {}",
startXRefOffset, exception);
source.seek(startXRefOffset);
}
}
@@ -1191,17 +1195,18 @@ public class COSParser extends BaseParse
{
if (objectOffset < 0)
{
- LOG.error("Invalid object offset " + objectOffset + " when
searching for a xref table/stream");
+ LOG.error("Invalid object offset {} when searching for a xref
table/stream",
+ objectOffset);
return 0;
}
// search for the offset of the given xref table/stream among those
found by a brute force search.
long newOffset = getBruteForceParser().bfSearchForXRef(objectOffset);
if (newOffset > -1)
{
- LOG.debug("Fixed reference for xref table/stream " + objectOffset
+ " -> " + newOffset);
+ LOG.debug("Fixed reference for xref table/stream {} -> {}",
objectOffset, newOffset);
return newOffset;
}
- LOG.error("Can't find the object xref table/stream at offset " +
objectOffset);
+ LOG.error("Can't find the object xref table/stream at offset {}",
objectOffset);
return 0;
}
@@ -1224,8 +1229,9 @@ public class COSParser extends BaseParse
COSObjectKey foundObjectKey = findObjectKey(objectKey,
objectOffset, xrefOffset);
if (foundObjectKey == null)
{
- LOG.debug("Stop checking xref offsets as at least one (" +
objectKey
- + ") couldn't be dereferenced");
+ LOG.debug(
+ "Stop checking xref offsets as at least one ({})
couldn't be dereferenced",
+ objectKey);
return false;
}
else if (foundObjectKey != objectKey)
@@ -1325,9 +1331,8 @@ public class COSParser extends BaseParse
if (existingOffset != null && existingOffset > 0
&& Math.abs(offset - existingOffset) < 10)
{
- LOG.debug("Found the object " + newObjKey + "
instead of " //
- + objectKey + " at offset " + offset //
- + " - ignoring");
+ LOG.debug("Found the object {} instead of {} at
offset {} - ignoring",
+ newObjKey, objectKey, offset);
return null;
}
// something seems to be wrong but it's hard to
determine what exactly -> simply continue
@@ -1339,7 +1344,8 @@ public class COSParser extends BaseParse
long foundObjectNumber = readObjectNumber();
if (objectKey.getNumber() != foundObjectNumber)
{
- LOG.warn("found wrong object number. expected [" +
objectKey.getNumber() + "] found [" + foundObjectNumber + "]");
+ LOG.warn("found wrong object number. expected [{}] found [{}]",
+ objectKey.getNumber(), foundObjectNumber);
if (!isLenient)
{
return null;
@@ -1365,7 +1371,7 @@ public class COSParser extends BaseParse
catch (IOException exception)
{
// Swallow the exception, obviously there isn't any valid object
number
- LOG.debug("No valid object at given location " + offset + " -
ignoring", exception);
+ LOG.debug("No valid object at given location {} - ignoring",
offset, exception);
}
return null;
}
@@ -1422,7 +1428,7 @@ public class COSParser extends BaseParse
// object wasn't dereferenced -> remove it
if (kidBaseobject == null ||
kidBaseobject.equals(COSNull.NULL))
{
- LOG.warn("Removed null object " + kid + " from pages
dictionary");
+ LOG.warn("Removed null object {} from pages dictionary",
kid);
kidsArray.remove(kid);
}
else if (kidBaseobject instanceof COSDictionary)
@@ -1532,8 +1538,7 @@ public class COSParser extends BaseParse
if (source.getPosition() == trailerOffset)
{
// warn only the first time
- LOG.warn("Expected trailer object at offset " +
trailerOffset
- + ", keep trying");
+ LOG.warn("Expected trailer object at offset {}, keep
trying", trailerOffset);
}
readLine();
nextCharacter = source.peek();
@@ -1643,7 +1648,7 @@ public class COSParser extends BaseParse
{
// No version number at all, set to 1.4 as default
header = headerMarker + defaultVersion;
- LOG.debug("No version found, set to " + defaultVersion + " as
default.");
+ LOG.debug("No version found, set to {} as default.",
defaultVersion);
}
else
{
@@ -1722,7 +1727,7 @@ public class COSParser extends BaseParse
String[] splitString = currentLine.split("\\s");
if (splitString.length != 2)
{
- LOG.warn("Unexpected XRefTable Entry: " + currentLine);
+ LOG.warn("Unexpected XRefTable Entry: {}", currentLine);
return false;
}
// first obj id
@@ -1733,7 +1738,7 @@ public class COSParser extends BaseParse
}
catch (NumberFormatException exception)
{
- LOG.warn("XRefTable: invalid ID for the first object: " +
currentLine);
+ LOG.warn("XRefTable: invalid ID for the first object: {}",
currentLine);
return false;
}
@@ -1745,7 +1750,7 @@ public class COSParser extends BaseParse
}
catch (NumberFormatException exception)
{
- LOG.warn("XRefTable: invalid number of objects: " +
currentLine);
+ LOG.warn("XRefTable: invalid number of objects: {}",
currentLine);
return false;
}
@@ -1765,7 +1770,7 @@ public class COSParser extends BaseParse
splitString = currentLine.split("\\s");
if (splitString.length < 3)
{
- LOG.warn("invalid xref line: " + currentLine);
+ LOG.warn("invalid xref line: {}", currentLine);
break;
}
/* This supports the corrupt table as reported in
