From b573615cd04ec3f0e6f5443876a591b286cdb8b8 Mon Sep 17 00:00:00 2001 From: Dominik Stadler Date: Fri, 30 Dec 2016 13:09:28 +0000 Subject: [PATCH] bug 60526: Make loggers final and make throttled log actually work git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1776555 13f79535-47bb-0310-9956-ffa450edef68 --- .../eventusermodel/FormatTrackingHSSFListener.java | 2 +- .../openxml4j/opc/PackageRelationshipCollection.java | 2 +- .../openxml4j/opc/internal/ZipContentTypeManager.java | 2 +- .../opc/internal/marshallers/ZipPartMarshaller.java | 2 +- .../org/apache/poi/openxml4j/util/ZipSecureFile.java | 2 +- src/ooxml/java/org/apache/poi/util/SAXHelper.java | 3 ++- .../org/apache/poi/xslf/usermodel/XMLSlideShow.java | 2 +- .../java/org/apache/poi/xslf/usermodel/XSLFColor.java | 2 +- .../org/apache/poi/xslf/usermodel/XSLFGroupShape.java | 2 +- .../apache/poi/xssf/extractor/XSSFImportFromXML.java | 2 +- .../poi/xssf/streaming/SXSSFFormulaEvaluator.java | 2 +- .../src/org/apache/poi/hdgf/streams/ChunkStream.java | 2 +- .../apache/poi/hmef/attribute/MAPIDateAttribute.java | 2 +- .../apache/poi/hmef/attribute/MAPIStringAttribute.java | 2 +- .../apache/poi/hmef/attribute/TNEFDateAttribute.java | 2 +- .../apache/poi/hmef/attribute/TNEFStringAttribute.java | 2 +- .../org/apache/poi/hslf/record/CurrentUserAtom.java | 2 +- .../org/apache/poi/hsmf/parsers/POIFSChunkParser.java | 2 +- .../src/org/apache/poi/hwmf/record/HwmfBitmapDib.java | 2 +- .../src/org/apache/poi/hwpf/model/FIBFieldHandler.java | 2 +- .../src/org/apache/poi/hwpf/model/ListTables.java | 2 +- .../src/org/apache/poi/hwpf/model/PlfLfo.java | 2 +- .../src/org/apache/poi/hwpf/usermodel/HWPFList.java | 10 ++-------- .../src/org/apache/poi/hwpf/usermodel/Paragraph.java | 2 +- 24 files changed, 26 insertions(+), 31 deletions(-) diff --git a/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java b/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java index 4a786962c9..de9814e3a2 100644 --- a/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java +++ b/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java @@ -41,7 +41,7 @@ import org.apache.poi.util.POILogger; * ids. */ public class FormatTrackingHSSFListener implements HSSFListener { - private static POILogger logger = POILogFactory.getLogger(FormatTrackingHSSFListener.class); + private final static POILogger logger = POILogFactory.getLogger(FormatTrackingHSSFListener.class); private final HSSFListener _childListener; private final HSSFDataFormatter _formatter; private final NumberFormat _defaultFormat; diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java index 665c51f6c4..232b38b382 100644 --- a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java +++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java @@ -43,7 +43,7 @@ import org.w3c.dom.NodeList; public final class PackageRelationshipCollection implements Iterable { - private static POILogger logger = POILogFactory.getLogger(PackageRelationshipCollection.class); + private final static POILogger logger = POILogFactory.getLogger(PackageRelationshipCollection.class); /** * Package relationships ordered by ID. diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java index 1e00d93081..70bdb39e12 100644 --- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java +++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java @@ -38,7 +38,7 @@ import org.w3c.dom.Document; * @see ContentTypeManager */ public class ZipContentTypeManager extends ContentTypeManager { - private static POILogger logger = POILogFactory.getLogger(ZipContentTypeManager.class); + private final static POILogger logger = POILogFactory.getLogger(ZipContentTypeManager.class); /** * Delegate constructor to the super constructor. diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java index 8860ae37e5..37abb44293 100644 --- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java +++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java @@ -48,7 +48,7 @@ import org.w3c.dom.Element; * @author Julien Chable */ public final class ZipPartMarshaller implements PartMarshaller { - private static POILogger logger = POILogFactory.getLogger(ZipPartMarshaller.class); + private final static POILogger logger = POILogFactory.getLogger(ZipPartMarshaller.class); /** * Save the specified part. diff --git a/src/ooxml/java/org/apache/poi/openxml4j/util/ZipSecureFile.java b/src/ooxml/java/org/apache/poi/openxml4j/util/ZipSecureFile.java index 9000656e57..d1fc0cb1df 100644 --- a/src/ooxml/java/org/apache/poi/openxml4j/util/ZipSecureFile.java +++ b/src/ooxml/java/org/apache/poi/openxml4j/util/ZipSecureFile.java @@ -45,7 +45,7 @@ import org.apache.poi.util.SuppressForbidden; * and {@link #setMinInflateRatio(double)}. */ public class ZipSecureFile extends ZipFile { - private static POILogger logger = POILogFactory.getLogger(ZipSecureFile.class); + private final static POILogger logger = POILogFactory.getLogger(ZipSecureFile.class); private static double MIN_INFLATE_RATIO = 0.01d; private static long MAX_ENTRY_SIZE = 0xFFFFFFFFL; diff --git a/src/ooxml/java/org/apache/poi/util/SAXHelper.java b/src/ooxml/java/org/apache/poi/util/SAXHelper.java index d83b814328..3ff70a5be3 100644 --- a/src/ooxml/java/org/apache/poi/util/SAXHelper.java +++ b/src/ooxml/java/org/apache/poi/util/SAXHelper.java @@ -36,7 +36,7 @@ import org.xml.sax.XMLReader; * Provides handy methods for working with SAX parsers and readers */ public final class SAXHelper { - private static POILogger logger = POILogFactory.getLogger(SAXHelper.class); + private static final POILogger logger = POILogFactory.getLogger(SAXHelper.class); private static long lastLog = 0; private SAXHelper() {} @@ -94,6 +94,7 @@ public final class SAXHelper { // throttle the log somewhat as it can spam the log otherwise if(System.currentTimeMillis() > lastLog + TimeUnit.MINUTES.toMillis(5)) { logger.log(POILogger.WARN, "SAX Security Manager could not be setup [log suppressed for 5 minutes]", e); + lastLog = System.currentTimeMillis(); } } } diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java index 14b656b53e..cee2d0eb04 100644 --- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java +++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java @@ -72,7 +72,7 @@ import org.openxmlformats.schemas.presentationml.x2006.main.PresentationDocument @Beta public class XMLSlideShow extends POIXMLDocument implements SlideShow { - private static POILogger _logger = POILogFactory.getLogger(XMLSlideShow.class); + private final static POILogger _logger = POILogFactory.getLogger(XMLSlideShow.class); private CTPresentation _presentation; private List _slides; diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFColor.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFColor.java index f519f7ec20..bff6e0140a 100644 --- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFColor.java +++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFColor.java @@ -46,7 +46,7 @@ import org.w3c.dom.Node; @Beta @Internal public class XSLFColor { - private static POILogger LOGGER = POILogFactory.getLogger(XSLFColor.class); + private final static POILogger LOGGER = POILogFactory.getLogger(XSLFColor.class); private XmlObject _xmlObject; private Color _color; diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java index 08022e976c..bb904be56a 100644 --- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java +++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java @@ -55,7 +55,7 @@ import org.openxmlformats.schemas.presentationml.x2006.main.CTShape; @Beta public class XSLFGroupShape extends XSLFShape implements XSLFShapeContainer, GroupShape { - private static POILogger _logger = POILogFactory.getLogger(XSLFGroupShape.class); + private final static POILogger _logger = POILogFactory.getLogger(XSLFGroupShape.class); private final List _shapes; private final CTGroupShapeProperties _grpSpPr; diff --git a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java b/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java index 0ffbd0b88c..478ed54172 100644 --- a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java +++ b/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java @@ -71,7 +71,7 @@ public class XSSFImportFromXML { private final XSSFMap _map; - private static POILogger logger = POILogFactory.getLogger(XSSFImportFromXML.class); + private final static POILogger logger = POILogFactory.getLogger(XSSFImportFromXML.class); public XSSFImportFromXML(XSSFMap map) { _map = map; diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java b/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java index 0ac776ffca..d6e258e9c6 100644 --- a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java +++ b/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java @@ -34,7 +34,7 @@ import org.apache.poi.xssf.usermodel.BaseXSSFFormulaEvaluator; * lookup cells within the current Window. */ public final class SXSSFFormulaEvaluator extends BaseXSSFFormulaEvaluator { - private static POILogger logger = POILogFactory.getLogger(SXSSFFormulaEvaluator.class); + private final static POILogger logger = POILogFactory.getLogger(SXSSFFormulaEvaluator.class); private SXSSFWorkbook wb; diff --git a/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java b/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java index 9f15e40b9f..f58a4c8510 100644 --- a/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java +++ b/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java @@ -27,7 +27,7 @@ import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; public final class ChunkStream extends Stream { - private static POILogger logger = POILogFactory.getLogger(ChunkStream.class); + private final static POILogger logger = POILogFactory.getLogger(ChunkStream.class); private ChunkFactory chunkFactory; /** All the Chunks we contain */ diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java b/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java index 53eb575e6f..0669723de5 100644 --- a/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java +++ b/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java @@ -42,7 +42,7 @@ import org.apache.poi.util.POILogger; * @see [MS-OXPROPS]: Exchange Server Protocols Master Property List */ public final class MAPIDateAttribute extends MAPIAttribute { - private static POILogger logger = POILogFactory.getLogger(MAPIDateAttribute.class); + private final static POILogger logger = POILogFactory.getLogger(MAPIDateAttribute.class); private Date data; /** diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java b/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java index 5307e71c74..ef4e16b6e7 100644 --- a/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java +++ b/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java @@ -32,7 +32,7 @@ import org.apache.poi.util.StringUtil; * to a {@link HMEFMessage} or one of its {@link Attachment}s. */ public final class MAPIStringAttribute extends MAPIAttribute { - private static POILogger logger = POILogFactory.getLogger(MAPIStringAttribute.class); + private final static POILogger logger = POILogFactory.getLogger(MAPIStringAttribute.class); private static final String CODEPAGE = "CP1252"; private final String data; diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java b/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java index 1df0d96916..faedc4c7cc 100644 --- a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java +++ b/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java @@ -39,7 +39,7 @@ import org.apache.poi.util.POILogger; * or one of its {@link Attachment}s. */ public final class TNEFDateAttribute extends TNEFAttribute { - private static POILogger logger = POILogFactory.getLogger(TNEFDateAttribute.class); + private final static POILogger logger = POILogFactory.getLogger(TNEFDateAttribute.class); private Date data; /** diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java b/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java index 34e1ef3691..a63b0d12b6 100644 --- a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java +++ b/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java @@ -31,7 +31,7 @@ import org.apache.poi.util.StringUtil; * or one of its {@link Attachment}s. */ public final class TNEFStringAttribute extends TNEFAttribute { - private static POILogger logger = POILogFactory.getLogger(TNEFStringAttribute.class); + private final static POILogger logger = POILogFactory.getLogger(TNEFStringAttribute.class); private String data; /** diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/CurrentUserAtom.java b/src/scratchpad/src/org/apache/poi/hslf/record/CurrentUserAtom.java index 2d688603a0..d05c5b2d14 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/record/CurrentUserAtom.java +++ b/src/scratchpad/src/org/apache/poi/hslf/record/CurrentUserAtom.java @@ -43,7 +43,7 @@ import org.apache.poi.util.StringUtil; */ public class CurrentUserAtom { - private static POILogger logger = POILogFactory.getLogger(CurrentUserAtom.class); + private final static POILogger logger = POILogFactory.getLogger(CurrentUserAtom.class); /** Standard Atom header */ public static final byte[] atomHeader = new byte[] { 0, 0, -10, 15 }; diff --git a/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java b/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java index c44f4947f3..ffe44ad936 100644 --- a/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java +++ b/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java @@ -50,7 +50,7 @@ import org.apache.poi.util.POILogger; * data and so on. */ public final class POIFSChunkParser { - private static POILogger logger = POILogFactory.getLogger(POIFSChunkParser.class); + private final static POILogger logger = POILogFactory.getLogger(POIFSChunkParser.class); public static ChunkGroup[] parse(NPOIFSFileSystem fs) throws IOException { return parse(fs.getRoot()); diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java index ba935f39f1..da49d2ebd4 100644 --- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java +++ b/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java @@ -189,7 +189,7 @@ public class HwmfBitmapDib { } } - private static POILogger logger = POILogFactory.getLogger(HwmfBitmapDib.class); + private final static POILogger logger = POILogFactory.getLogger(HwmfBitmapDib.class); private static final int BMP_HEADER_SIZE = 14; private int headerSize; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java b/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java index ec422d9ffd..ae830f62cd 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java @@ -144,7 +144,7 @@ public final class FIBFieldHandler public static final int STTBLISTNAMES = 91; public static final int STTBFUSSR = 92; - private static POILogger log = POILogFactory.getLogger(FIBFieldHandler.class); + private final static POILogger log = POILogFactory.getLogger(FIBFieldHandler.class); private static final int FIELD_SIZE = LittleEndian.INT_SIZE * 2; diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java b/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java index 5ec02537f5..01b9577421 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java @@ -34,7 +34,7 @@ import org.apache.poi.util.POILogger; @Internal public final class ListTables { - private static POILogger log = POILogFactory.getLogger(ListTables.class); + private final static POILogger log = POILogFactory.getLogger(ListTables.class); /** * Both PlfLst and the following LVLs diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java b/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java index 90618da743..b387e8f315 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java @@ -37,7 +37,7 @@ import org.apache.poi.util.POILogger; */ public class PlfLfo { - private static POILogger log = POILogFactory.getLogger( PlfLfo.class ); + private final static POILogger log = POILogFactory.getLogger( PlfLfo.class ); /** * An unsigned integer that specifies the count of elements in both the diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HWPFList.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HWPFList.java index 6f69f71726..3364aecb08 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HWPFList.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HWPFList.java @@ -48,14 +48,11 @@ import org.apache.poi.hwpf.sprm.ParagraphSprmCompressor; */ public final class HWPFList { - //private static POILogger log = POILogFactory.getLogger( HWPFList.class ); - private boolean _ignoreLogicalLeftIdentation = false; private LFO _lfo; private LFOData _lfoData; private ListData _listData; private ListTables _listTables; - private boolean _registered; private StyleSheet _styleSheet; /** @@ -80,7 +77,6 @@ public final class HWPFList { _listTables = listTables; _styleSheet = styleSheet; - _registered = true; /* See documentation for sprmPIlfo (0x460B) */ if ( ilfo == 0 || ilfo == 0xF801 ) @@ -214,8 +210,7 @@ public final class HWPFList int styleIndex = _listData.getLevelStyle( level ); CharacterProperties base = _styleSheet.getCharacterStyle( styleIndex ); - byte[] grpprl = CharacterSprmCompressor.compressCharacterProperty( chp, - base ); + byte[] grpprl = CharacterSprmCompressor.compressCharacterProperty( chp, base ); listLevel.setNumberProperties( grpprl ); } @@ -233,8 +228,7 @@ public final class HWPFList int styleIndex = _listData.getLevelStyle( level ); ParagraphProperties base = _styleSheet.getParagraphStyle( styleIndex ); - byte[] grpprl = ParagraphSprmCompressor.compressParagraphProperty( pap, - base ); + byte[] grpprl = ParagraphSprmCompressor.compressParagraphProperty( pap, base ); listLevel.setLevelProperties( grpprl ); } diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java index 6e5f688160..9da19fd3b9 100644 --- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java +++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java @@ -33,7 +33,7 @@ import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; public class Paragraph extends Range implements Cloneable { - private static POILogger log = POILogFactory.getLogger( Paragraph.class ); + private final static POILogger log = POILogFactory.getLogger( Paragraph.class ); public final static short SPRM_JC = 0x2403; public final static short SPRM_FSIDEBYSIDE = 0x2404; -- 2.39.5