Modified: poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java (original) +++ poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java Mon Feb 1 14:59:43 2021 @@ -23,17 +23,19 @@ import java.util.LinkedHashMap; import java.util.NoSuchElementException; import java.util.Objects; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.hwpf.model.types.LSTFAbstractType; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; import org.apache.poi.util.LittleEndianConsts; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; + +import static org.apache.logging.log4j.util.Unbox.box; @Internal public final class ListTables { - private static final POILogger log = POILogFactory.getLogger(ListTables.class); + private static final Logger LOGGER = LogManager.getLogger(ListTables.class); /** * Both PlfLst and the following LVLs @@ -141,13 +143,13 @@ public final class ListTables { ListData lst = _listMap.get(lsid); if (lst == null) { - log.log(POILogger.WARN, "ListData for ", lsid, " was null."); + LOGGER.atWarn().log("ListData for {} was null.", box(lsid)); return null; } if(level < lst.numLevels()) { return lst.getLevels()[level]; } - log.log(POILogger.WARN, "Requested level ", level, " which was greater than the maximum defined (", lst.numLevels(), ")"); + LOGGER.atWarn().log("Requested level {} which was greater than the maximum defined ({})", box(level),box(lst.numLevels())); return null; }
Modified: poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/NilPICFAndBinData.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/NilPICFAndBinData.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/NilPICFAndBinData.java (original) +++ poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/NilPICFAndBinData.java Mon Feb 1 14:59:43 2021 @@ -18,16 +18,18 @@ package org.apache.poi.hwpf.model; import java.util.Arrays; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.util.LittleEndian; import org.apache.poi.util.LittleEndianConsts; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; + +import static java.lang.Integer.toHexString; +import static org.apache.logging.log4j.util.Unbox.box; public class NilPICFAndBinData { - private static final POILogger log = POILogFactory - .getLogger( NilPICFAndBinData.class ); + private static final Logger LOGGER = LogManager.getLogger(NilPICFAndBinData.class); private byte[] _binData; @@ -44,9 +46,7 @@ public class NilPICFAndBinData if ( cbHeader != 0x44 ) { - log.log(POILogger.WARN, "NilPICFAndBinData at offset ", offset, - " cbHeader 0x", Integer.toHexString(cbHeader), " != 0x44" - ); + LOGGER.atWarn().log("NilPICFAndBinData at offset {} cbHeader 0x{} != 0x44", box(offset), toHexString(cbHeader)); } // skip the 62 ignored bytes Modified: poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/OldFfn.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/OldFfn.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/OldFfn.java (original) +++ poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/OldFfn.java Mon Feb 1 14:59:43 2021 @@ -19,20 +19,22 @@ package org.apache.poi.hwpf.model; import java.nio.charset.Charset; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.common.usermodel.fonts.FontCharset; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndianConsts; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; import org.apache.poi.util.StringUtil; +import static org.apache.logging.log4j.util.Unbox.box; + /** * Word 6.0 Font information */ @Internal public final class OldFfn { - private static final POILogger LOG = POILogFactory.getLogger(OldFfn.class); + private static final Logger LOG = LogManager.getLogger(OldFfn.class); private final byte _chs;// character set identifier @@ -59,7 +61,7 @@ public final class OldFfn { short fontDescriptionLength = buf[offset]; offset += 1; if (offset + fontDescriptionLength > fontTableEnd) { - LOG.log(POILogger.WARN, "Asked to read beyond font table end. Skipping font"); + LOG.atWarn().log("Asked to read beyond font table end. Skipping font"); return null; } @@ -69,7 +71,7 @@ public final class OldFfn { Charset charset = null; FontCharset wmfCharset = FontCharset.valueOf(chs & 0xff); if (wmfCharset == null) { - LOG.log(POILogger.WARN, "Couldn't find font for type: ", (chs & 0xff)); + LOG.atWarn().log("Couldn't find font for type: {}", box((chs & 0xff))); } else { charset = wmfCharset.getCharset(); } @@ -88,7 +90,7 @@ public final class OldFfn { } } if (fontNameLength == -1) { - LOG.log(POILogger.WARN, "Couldn't find the zero-byte delimited font name length"); + LOG.atWarn().log("Couldn't find the zero-byte delimited font name length"); return null; } String fontName = new String(buf, offset, fontNameLength, charset); Modified: poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/OldFontTable.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/OldFontTable.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/OldFontTable.java (original) +++ poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/OldFontTable.java Mon Feb 1 14:59:43 2021 @@ -21,18 +21,18 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; import org.apache.poi.util.LittleEndianConsts; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; /** * Font table for Word 6.0 */ @Internal public final class OldFontTable { - private static final POILogger LOG = POILogFactory.getLogger(OldFontTable.class); + private static final Logger LOG = LogManager.getLogger(OldFontTable.class); // added extra facilitator members // FFN structure containing strings of font names @@ -69,7 +69,7 @@ public final class OldFontTable { public String getMainFont(int chpFtc) { if (chpFtc >= _fontNames.length) { - LOG.log(POILogger.INFO, "Mismatch in chpFtc with stringCount"); + LOG.atInfo().log("Mismatch in chpFtc with stringCount"); return null; } Modified: poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java (original) +++ poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java Mon Feb 1 14:59:43 2021 @@ -26,14 +26,17 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.hwpf.sprm.SprmBuffer; import org.apache.poi.hwpf.sprm.SprmIterator; import org.apache.poi.hwpf.sprm.SprmOperation; import org.apache.poi.poifs.common.POIFSConstants; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; + +import static java.lang.System.currentTimeMillis; +import static org.apache.logging.log4j.util.Unbox.box; /** * This class represents the bin table of Word document but it also serves as a @@ -43,7 +46,7 @@ import org.apache.poi.util.POILogger; @Internal public class PAPBinTable { - private static final POILogger LOG = POILogFactory.getLogger( PAPBinTable.class ); + private static final Logger LOG = LogManager.getLogger(PAPBinTable.class); protected final ArrayList<PAPX> _paragraphs = new ArrayList<>(); @@ -55,7 +58,7 @@ public class PAPBinTable byte[] dataStream, int offset, int size, CharIndexTranslator charIndexTranslator ) { - long start = System.currentTimeMillis(); + long start = currentTimeMillis(); { PlexOfCps binTable = new PlexOfCps( tableStream, offset, size, 4 ); @@ -80,13 +83,11 @@ public class PAPBinTable } } - LOG.log( POILogger.DEBUG, "PAPX tables loaded in ", - Long.valueOf( System.currentTimeMillis() - start ), " ms (", - Integer.valueOf( _paragraphs.size() ), " elements)" ); + LOG.atDebug().log("PAPX tables loaded in {} ms ({} elements)", box(currentTimeMillis() - start),box(_paragraphs.size())); if ( _paragraphs.isEmpty() ) { - LOG.log( POILogger.WARN, "PAPX FKPs are empty" ); + LOG.atWarn().log("PAPX FKPs are empty"); _paragraphs.add( new PAPX( 0, 0, new SprmBuffer( 2 ) ) ); } } @@ -100,7 +101,7 @@ public class PAPBinTable static void rebuild( final StringBuilder docText, ComplexFileTable complexFileTable, List<PAPX> paragraphs ) { - long start = System.currentTimeMillis(); + long start = currentTimeMillis(); if ( complexFileTable != null ) { @@ -117,8 +118,7 @@ public class PAPBinTable if ( igrpprl < 0 || igrpprl >= sprmBuffers.length ) { - LOG.log( POILogger.WARN, textPiece - + "'s PRM references to unknown grpprl" ); + LOG.atWarn().log("{}'s PRM references to unknown grpprl", textPiece); continue; } @@ -146,20 +146,15 @@ public class PAPBinTable } } - LOG.log( POILogger.DEBUG, - "Merged (?) with PAPX from complex file table in ", - Long.valueOf( System.currentTimeMillis() - start ), - " ms (", Integer.valueOf( paragraphs.size() ), - " elements in total)" ); - start = System.currentTimeMillis(); + LOG.atDebug().log("Merged (?) with PAPX from complex file table in {} ms ({} elements in total)", box(currentTimeMillis() - start),box(paragraphs.size())); + start = currentTimeMillis(); } List<PAPX> oldPapxSortedByEndPos = new ArrayList<>(paragraphs); oldPapxSortedByEndPos.sort(PropertyNode.EndComparator); - LOG.log( POILogger.DEBUG, "PAPX sorted by end position in ", - Long.valueOf( System.currentTimeMillis() - start ), " ms" ); - start = System.currentTimeMillis(); + LOG.atDebug().log("PAPX sorted by end position in {} ms", box(currentTimeMillis() - start)); + start = currentTimeMillis(); final Map<PAPX, Integer> papxToFileOrder = new IdentityHashMap<>(); { @@ -179,9 +174,8 @@ public class PAPBinTable } }; - LOG.log( POILogger.DEBUG, "PAPX's order map created in ", - Long.valueOf( System.currentTimeMillis() - start ), " ms" ); - start = System.currentTimeMillis(); + LOG.atDebug().log("PAPX's order map created in {} ms", box(currentTimeMillis() - start)); + start = currentTimeMillis(); List<PAPX> newPapxs = new LinkedList<>(); int lastParStart = 0; @@ -223,10 +217,7 @@ public class PAPBinTable if ( papxs.size() == 0 ) { - LOG.log( POILogger.WARN, "Paragraph [", - Integer.valueOf( startInclusive ), "; ", - Integer.valueOf( endExclusive ), - ") has no PAPX. Creating new one." ); + LOG.atWarn().log("Paragraph [{}; {}) has no PAPX. Creating new one.", box(startInclusive),box(endExclusive)); // create it manually PAPX papx = new PAPX( startInclusive, endExclusive, new SprmBuffer( 2 ) ); @@ -273,9 +264,7 @@ public class PAPBinTable paragraphs.clear(); paragraphs.addAll( newPapxs ); - LOG.log( POILogger.DEBUG, "PAPX rebuilded from document text in ", - Long.valueOf( System.currentTimeMillis() - start ), " ms (", - Integer.valueOf( paragraphs.size() ), " elements)" ); + LOG.atDebug().log("PAPX rebuilded from document text in {} ms ({} elements)", box(currentTimeMillis() - start),box(paragraphs.size())); } public void insert(int listIndex, int cpStart, SprmBuffer buf) Modified: poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java (original) +++ poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java Mon Feb 1 14:59:43 2021 @@ -17,9 +17,12 @@ package org.apache.poi.hwpf.model; +import java.io.OutputStream; import java.util.ArrayList; import java.util.List; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.ddf.DefaultEscherRecordFactory; import org.apache.poi.ddf.EscherBSERecord; import org.apache.poi.ddf.EscherBlipRecord; @@ -31,8 +34,8 @@ import org.apache.poi.hwpf.usermodel.Pic import org.apache.poi.hwpf.usermodel.Range; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; + +import static org.apache.logging.log4j.util.Unbox.box; /** * Holds information about all pictures embedded in Word Document either via "Insert -> Picture -> From File" or via @@ -53,9 +56,9 @@ import org.apache.poi.util.POILogger; */ @Internal public final class PicturesTable { - private static final POILogger LOG = POILogFactory.getLogger( PicturesTable.class ); + private static final Logger LOG = LogManager.getLogger(PicturesTable.class); - static final int TYPE_IMAGE = 0x08; + static final int TYPE_IMAGE = 0x08; static final int TYPE_IMAGE_WORD2000 = 0x00; static final int TYPE_IMAGE_PASTED_FROM_CLIPBOARD = 0xA; static final int TYPE_IMAGE_PASTED_FROM_CLIPBOARD_WORD2000 = 0x2; @@ -151,9 +154,9 @@ public final class PicturesTable { * @param run * @param fillBytes if true, Picture will be returned with filled byte array that represent picture's contents. If you don't want * to have that byte array in memory but only write picture's contents to stream, pass false and then use Picture.writeImageContent - * @see Picture#writeImageContent(java.io.OutputStream) + * @see Picture#writeImageContent(OutputStream) * @return a Picture object if picture exists for specified CharacterRun, null otherwise. PicturesTable.hasPicture is used to determine this. - * @see #hasPicture(org.apache.poi.hwpf.usermodel.CharacterRun) + * @see #hasPicture(CharacterRun) */ public Picture extractPicture(CharacterRun run, boolean fillBytes) { if (hasPicture(run)) { @@ -198,10 +201,7 @@ public final class PicturesTable { } catch ( Exception exc ) { - LOG.log( - POILogger.WARN, - "Unable to load picture from BLIB record at offset #", - Integer.valueOf( bse.getOffset() ), exc ); + LOG.atWarn().withThrowable(exc).log("Unable to load picture from BLIP record at offset #{}", box(bse.getOffset())); } } } Modified: poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java (original) +++ poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java Mon Feb 1 14:59:43 2021 @@ -23,11 +23,13 @@ import java.io.IOException; import java.util.Arrays; import java.util.NoSuchElementException; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.hwpf.model.types.LFOAbstractType; import org.apache.poi.util.LittleEndian; import org.apache.poi.util.LittleEndianConsts; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; + +import static org.apache.logging.log4j.util.Unbox.box; /** * The PlfLfo structure contains the list format override data for the document. @@ -39,7 +41,7 @@ import org.apache.poi.util.POILogger; */ public class PlfLfo { - private static final POILogger log = POILogFactory.getLogger( PlfLfo.class ); + private static final Logger LOGGER = LogManager.getLogger(PlfLfo.class); /** * An unsigned integer that specifies the count of elements in both the @@ -107,11 +109,7 @@ public class PlfLfo if ( ( offset - fcPlfLfo ) != lcbPlfLfo ) { - if (log.check(POILogger.WARN)) { - log.log(POILogger.WARN, "Actual size of PlfLfo is " - + (offset - fcPlfLfo) + " bytes, but expected " - + lcbPlfLfo); - } + LOGGER.atWarn().log("Actual size of PlfLfo is {} bytes, but expected {}", box(offset - fcPlfLfo),box(lcbPlfLfo)); } } Modified: poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyNode.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyNode.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyNode.java (original) +++ poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyNode.java Mon Feb 1 14:59:43 2021 @@ -21,10 +21,12 @@ import java.util.Arrays; import java.util.Comparator; import java.util.Objects; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.common.Duplicatable; import org.apache.poi.util.Internal; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; + +import static org.apache.logging.log4j.util.Unbox.box; /** * Represents a lightweight node in the Trees used to store content @@ -40,7 +42,7 @@ public abstract class PropertyNode<T ext public static final Comparator<PropertyNode<?>> StartComparator = Comparator.comparingInt(PropertyNode::getStart); - private static final POILogger LOG = POILogFactory.getLogger(PropertyNode.class); + private static final Logger LOG = LogManager.getLogger(PropertyNode.class); protected Object _buf; @@ -72,13 +74,12 @@ public abstract class PropertyNode<T ext _buf = buf; if (_cpStart < 0) { - LOG.log(POILogger.WARN, "A property claimed to start before zero, at ", _cpStart, "! Resetting it to zero, and hoping for the best"); + LOG.atWarn().log("A property claimed to start before zero, at {}! Resetting it to zero, and hoping for the best", box(_cpStart)); _cpStart = 0; } if (_cpEnd < _cpStart) { - LOG.log(POILogger.WARN, "A property claimed to end (", _cpEnd, - ") before start! Resetting end to start, and hoping for the best"); + LOG.atWarn().log("A property claimed to end ({}) before start! Resetting end to start, and hoping for the best", box(_cpEnd)); _cpEnd = _cpStart; } } Modified: poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java (original) +++ poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java Mon Feb 1 14:59:43 2021 @@ -22,13 +22,13 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.hwpf.model.io.HWPFFileSystem; import org.apache.poi.util.IOUtils; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; import org.apache.poi.util.LittleEndianConsts; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; @Internal public class SectionTable @@ -37,7 +37,7 @@ public class SectionTable //arbitrarily selected; may need to increase private static final int MAX_RECORD_LENGTH = 100_000; - private static final POILogger LOG = POILogFactory.getLogger(SectionTable.class); + private static final Logger LOG = LogManager.getLogger(SectionTable.class); private static final int SED_SIZE = 12; protected List<SEPX> _sections = new ArrayList<>(); @@ -100,7 +100,7 @@ public class SectionTable } } if(! matchAt && matchHalf) { - LOG.log(POILogger.WARN, "Your document seemed to be mostly unicode, but the section definition was in bytes! Trying anyway, but things may well go wrong!"); + LOG.atWarn().log("Your document seemed to be mostly unicode, but the section definition was in bytes! Trying anyway, but things may well go wrong!"); for(int i=0; i<_sections.size(); i++) { SEPX s = _sections.get(i); GenericPropertyNode node = sedPlex.getProperty(i); Modified: poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/Sttb.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/Sttb.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/Sttb.java (original) +++ poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/Sttb.java Mon Feb 1 14:59:43 2021 @@ -18,10 +18,9 @@ package org.apache.poi.hwpf.model; import java.util.Arrays; +import org.apache.logging.log4j.LogManager; import org.apache.poi.util.LittleEndian; import org.apache.poi.util.LittleEndianConsts; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; import org.apache.poi.util.StringUtil; /** @@ -81,11 +80,11 @@ public class Sttb if ( ffff != (short) 0xffff ) { - POILogFactory.getLogger(Sttb.class).log( - POILogger.WARN, - "Non-extended character Pascal strings are not supported right now. ", - "Creating empty values in the RevisionMarkAuthorTable for now. ", - "Please, contact POI developers for update."); + LogManager.getLogger(Sttb.class).atWarn().log( + "Non-extended character Pascal strings are not supported right now. " + + "Creating empty values in the RevisionMarkAuthorTable for now. " + + "Please, contact POI developers for update." + ); //set data and extraData to empty values to avoid //downstream NPE in case someone calls getEntries on RevisionMarkAuthorTable _data = new String[0]; Modified: poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java (original) +++ poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java Mon Feb 1 14:59:43 2021 @@ -20,6 +20,8 @@ package org.apache.poi.hwpf.model; import java.util.Arrays; import java.util.Objects; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.hwpf.model.types.StdfBaseAbstractType; import org.apache.poi.hwpf.usermodel.CharacterProperties; import org.apache.poi.hwpf.usermodel.ParagraphProperties; @@ -27,10 +29,10 @@ import org.apache.poi.util.IOUtils; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; import org.apache.poi.util.LittleEndianConsts; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; import org.apache.poi.util.StringUtil; +import static org.apache.logging.log4j.util.Unbox.box; + /** * Comment me * @@ -39,7 +41,7 @@ import org.apache.poi.util.StringUtil; @Internal public final class StyleDescription { - private static final POILogger LOG = POILogFactory.getLogger(StyleDescription.class); + private static final Logger LOG = LogManager.getLogger(StyleDescription.class); //arbitrarily selected; may need to increase private static final int MAX_RECORD_LENGTH = 100_000; @@ -74,7 +76,7 @@ public final class StyleDescription { } else if (baseLength == 0x000A) { readStdfPost2000 = false; } else { - LOG.log(POILogger.WARN, "Style definition has non-standard size of ", baseLength); + LOG.atWarn().log("Style definition has non-standard size of {}", box(baseLength)); } _stdfBase = new StdfBase(std, offset); Modified: poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java (original) +++ poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java Mon Feb 1 14:59:43 2021 @@ -25,11 +25,14 @@ import java.util.Comparator; import java.util.LinkedList; import java.util.List; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.poifs.common.POIFSConstants; import org.apache.poi.util.IOUtils; import org.apache.poi.util.Internal; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; + +import static java.lang.System.currentTimeMillis; +import static org.apache.logging.log4j.util.Unbox.box; /** * The piece table for matching up character positions to bits of text. This @@ -40,7 +43,7 @@ import org.apache.poi.util.POILogger; */ @Internal public class TextPieceTable implements CharIndexTranslator { - private static final POILogger LOG = POILogFactory.getLogger(TextPieceTable.class); + private static final Logger LOG = LogManager.getLogger(TextPieceTable.class); //arbitrarily selected; may need to increase private static final int MAX_RECORD_LENGTH = 100_000_000; @@ -277,7 +280,7 @@ public class TextPieceTable implements C } public StringBuilder getText() { - final long start = System.currentTimeMillis(); + final long start = currentTimeMillis(); // rebuild document paragraphs structure StringBuilder docText = new StringBuilder(); @@ -286,23 +289,14 @@ public class TextPieceTable implements C int toAppendLength = toAppend.length(); if (toAppendLength != textPiece.getEnd() - textPiece.getStart()) { - LOG.log( - POILogger.WARN, - "Text piece has boundaries [", - textPiece.getStart(), - "; ", - textPiece.getEnd(), - ") but length ", - textPiece.getEnd() - textPiece.getStart()); + LOG.atWarn().log("Text piece has boundaries [{}; {}) but length {}", box(textPiece.getStart()),box(textPiece.getEnd()),box(textPiece.getEnd() - textPiece.getStart())); } docText.replace(textPiece.getStart(), textPiece.getStart() + toAppendLength, toAppend); } - LOG.log(POILogger.DEBUG, "Document text were rebuilded in ", - System.currentTimeMillis() - start, " ms (", - docText.length(), " chars)"); + LOG.atDebug().log("Document text were rebuilt in {} ms ({} chars)", box(currentTimeMillis() - start),box(docText.length())); return docText; } Modified: poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/Xstz.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/Xstz.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/Xstz.java (original) +++ poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/model/Xstz.java Mon Feb 1 14:59:43 2021 @@ -16,16 +16,18 @@ ==================================================================== */ package org.apache.poi.hwpf.model; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; import org.apache.poi.util.LittleEndianConsts; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; + +import static org.apache.logging.log4j.util.Unbox.box; @Internal public class Xstz { - private static final POILogger log = POILogFactory.getLogger( Xstz.class ); + private static final Logger LOGGER = LogManager.getLogger(Xstz.class); private final short _chTerm = 0; private Xst _xst; @@ -50,10 +52,7 @@ public class Xstz short term = LittleEndian.getShort( data, offset ); if ( term != 0 ) { - if (log.check(POILogger.WARN)) { - log.log(POILogger.WARN, "chTerm at the end of Xstz at offset ", - offset, " is not 0"); - } + LOGGER.atWarn().log("chTerm at the end of Xstz at offset {} is not 0", box(offset)); } } Modified: poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java (original) +++ poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java Mon Feb 1 14:59:43 2021 @@ -17,6 +17,8 @@ package org.apache.poi.hwpf.sprm; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.hwpf.usermodel.ShadingDescriptor80; import org.apache.poi.hwpf.model.Colorref; @@ -28,15 +30,13 @@ import org.apache.poi.hwpf.usermodel.Dat import org.apache.poi.hwpf.usermodel.ShadingDescriptor; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; @Internal public final class CharacterSprmUncompressor extends SprmUncompressor { - private static final POILogger LOG = POILogFactory.getLogger( CharacterSprmUncompressor.class ); + private static final Logger LOG = LogManager.getLogger(CharacterSprmUncompressor.class); - public CharacterSprmUncompressor() + public CharacterSprmUncompressor() { } @@ -77,8 +77,7 @@ public final class CharacterSprmUncompre } catch ( Exception exc ) { - LOG.log( POILogger.ERROR, "Unable to apply all style ", - style, " CHP SPRMs to CHP: ", exc, exc ); + LOG.atError().withThrowable(exc).log("Unable to apply all style {} CHP SPRMs to CHP", style); } } @@ -91,8 +90,7 @@ public final class CharacterSprmUncompre } catch ( Exception exc ) { - LOG.log( POILogger.ERROR, - "Unable to process all direct CHP SPRMs: ", exc, exc ); + LOG.atError().withThrowable(exc).log("Unable to process all direct CHP SPRMs"); } return newProperties; } @@ -111,8 +109,7 @@ public final class CharacterSprmUncompre { if ( warnAboutNonChpSprms ) { - LOG.log( POILogger.WARN, - "Non-CHP SPRM returned by SprmIterator: ", sprm ); + LOG.atWarn().log("Non-CHP SPRM returned by SprmIterator: {}", sprm); } continue; } @@ -140,8 +137,7 @@ public final class CharacterSprmUncompre } catch ( Exception exc ) { - LOG.log( POILogger.ERROR, - "Unable to extract istd from direct CHP SPRM: ", exc, exc ); + LOG.atError().withThrowable(exc).log("Unable to extract istd from direct CHP SPRM"); } return style; } @@ -705,7 +701,7 @@ public final class CharacterSprmUncompre oldCHP.isFNoProof())); break; default: - LOG.log( POILogger.DEBUG, "Unknown CHP sprm ignored: ", sprm ); + LOG.atDebug().log("Unknown CHP sprm ignored: {}", sprm); break; } } Modified: poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java (original) +++ poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java Mon Feb 1 14:59:43 2021 @@ -24,6 +24,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.hwpf.model.TabDescriptor; import org.apache.poi.hwpf.model.types.TBDAbstractType; import org.apache.poi.hwpf.usermodel.BorderCode; @@ -36,13 +38,13 @@ import org.apache.poi.hwpf.usermodel.Sha import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; import org.apache.poi.util.LittleEndianConsts; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; + +import static org.apache.logging.log4j.util.Unbox.box; @Internal public final class ParagraphSprmUncompressor extends SprmUncompressor { - private static final POILogger LOG = POILogFactory.getLogger( ParagraphSprmUncompressor.class ); + private static final Logger LOG = LogManager.getLogger(ParagraphSprmUncompressor.class); public ParagraphSprmUncompressor() { @@ -69,9 +71,7 @@ public final class ParagraphSprmUncompre } catch ( Exception exc ) { - LOG.log( - POILogger.ERROR, - "Unable to apply SPRM operation '", sprm.getOperation(), "': ", exc ); + LOG.atError().withThrowable(exc).log("Unable to apply SPRM operation '{}'", box(sprm.getOperation())); } } } @@ -411,7 +411,7 @@ public final class ParagraphSprmUncompre newPAP.setRsid( sprm.getOperand() ); break; default: - LOG.log( POILogger.DEBUG, "Unknown PAP sprm ignored: ", sprm ); + LOG.atDebug().log("Unknown PAP sprm ignored: {}", sprm); break; } } Modified: poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java (original) +++ poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java Mon Feb 1 14:59:43 2021 @@ -19,18 +19,20 @@ package org.apache.poi.hwpf.sprm; import java.util.Arrays; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.hwpf.usermodel.BorderCode; import org.apache.poi.hwpf.usermodel.SectionProperties; -import org.apache.poi.util.HexDump; import org.apache.poi.util.Internal; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; + +import static org.apache.logging.log4j.util.Unbox.box; +import static org.apache.poi.util.HexDump.byteToHex; @Internal public final class SectionSprmUncompressor extends SprmUncompressor { - private static final POILogger LOG = POILogFactory.getLogger(SectionSprmUncompressor.class); + private static final Logger LOG = LogManager.getLogger(SectionSprmUncompressor.class); public SectionSprmUncompressor() { @@ -241,7 +243,7 @@ public final class SectionSprmUncompress newSEP.setNfcEdnRef(sprm.getOperand()); break; default: - LOG.log(POILogger.INFO, "Unsupported Sprm operation: ", operation, " (", HexDump.byteToHex(operation), ")"); + LOG.atInfo().log("Unsupported Sprm operation: {} ({})", box(operation), byteToHex(operation)); break; } Modified: poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java (original) +++ poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java Mon Feb 1 14:59:43 2021 @@ -17,18 +17,18 @@ package org.apache.poi.hwpf.sprm; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.hwpf.usermodel.BorderCode; import org.apache.poi.hwpf.usermodel.TableCellDescriptor; import org.apache.poi.hwpf.usermodel.TableProperties; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; @Internal public final class TableSprmUncompressor extends SprmUncompressor { - private static final POILogger LOG = POILogFactory.getLogger( TableSprmUncompressor.class ); + private static final Logger LOG = LogManager.getLogger(TableSprmUncompressor.class); public TableSprmUncompressor() { @@ -48,8 +48,7 @@ public final class TableSprmUncompressor } else { - LOG.log( POILogger.WARN, - "Some table rows didn't specify number of columns in SPRMs" ); + LOG.atWarn().log("Some table rows didn't specify number of columns in SPRMs"); tableProperties = new TableProperties( (short) 1 ); } @@ -69,8 +68,7 @@ public final class TableSprmUncompressor } catch ( ArrayIndexOutOfBoundsException ex ) { - LOG.log( POILogger.ERROR, "Unable to apply ", sprm, - ": ", ex, ex ); + LOG.atError().withThrowable(ex).log("Unable to apply {}", sprm); } } } Modified: poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java (original) +++ poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java Mon Feb 1 14:59:43 2021 @@ -19,6 +19,8 @@ package org.apache.poi.hwpf.usermodel; import java.util.NoSuchElementException; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.common.Duplicatable; import org.apache.poi.hwpf.HWPFDocumentCore; import org.apache.poi.hwpf.model.LFO; @@ -30,11 +32,11 @@ import org.apache.poi.hwpf.sprm.Paragrap import org.apache.poi.hwpf.sprm.SprmBuffer; import org.apache.poi.hwpf.sprm.TableSprmCompressor; import org.apache.poi.util.Internal; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; + +import static org.apache.logging.log4j.util.Unbox.box; public class Paragraph extends Range implements Duplicatable { - private static final POILogger log = POILogFactory.getLogger( Paragraph.class ); + private static final Logger LOGGER = LogManager.getLogger(Paragraph.class); public static final short SPRM_JC = 0x2403; public static final short SPRM_FSIDEBYSIDE = 0x2404; @@ -118,8 +120,7 @@ public class Paragraph extends Range imp } catch ( NoSuchElementException exc ) { - log.log( POILogger.WARN, "Paragraph refers to LFO #", - properties.getIlfo(), " that does not exists" ); + LOGGER.atWarn().log("Paragraph refers to LFO #{} that does not exists", box(properties.getIlfo())); } if ( lfo != null ) { Modified: poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java (original) +++ poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java Mon Feb 1 14:59:43 2021 @@ -25,6 +25,8 @@ import java.util.Collections; import java.util.List; import java.util.zip.InflaterInputStream; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.ddf.EscherBSERecord; import org.apache.poi.ddf.EscherBlipRecord; import org.apache.poi.ddf.EscherComplexProperty; @@ -35,16 +37,13 @@ import org.apache.poi.ddf.EscherRecord; import org.apache.poi.hwpf.model.PICF; import org.apache.poi.hwpf.model.PICFAndOfficeArtData; import org.apache.poi.sl.image.ImageHeaderPNG; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; import org.apache.poi.util.StringUtil; /** * Represents embedded picture extracted from Word Document */ public final class Picture { - private static final POILogger log = POILogFactory - .getLogger( Picture.class ); + private static final Logger LOGGER = LogManager.getLogger(Picture.class); private static final byte[] COMPRESSED1 = { (byte) 0xFE, 0x78, (byte) 0xDA }; @@ -161,9 +160,7 @@ public final class Picture { * Problems reading from the actual ByteArrayInputStream should * never happen so this will only ever be a ZipException. */ - log.log( POILogger.INFO, - "Possibly corrupt compression or non-compressed data", - e ); + LOGGER.atInfo().withThrowable(e).log("Possibly corrupt compression or non-compressed data"); } } else Modified: poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java (original) +++ poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java Mon Feb 1 14:59:43 2021 @@ -18,9 +18,12 @@ package org.apache.poi.hwpf.usermodel; import static java.util.stream.Collectors.toList; +import static org.apache.logging.log4j.util.Unbox.box; import java.util.List; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.hwpf.HWPFDocument; import org.apache.poi.hwpf.HWPFDocumentCore; import org.apache.poi.hwpf.model.CHPX; @@ -37,8 +40,6 @@ import org.apache.poi.util.DocumentForma import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; import org.apache.poi.util.LittleEndianConsts; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; /** * This class is the central class of the HWPF object model. All properties that @@ -53,9 +54,9 @@ import org.apache.poi.util.POILogger; */ public class Range { - private static final POILogger LOG = POILogFactory.getLogger( Range.class ); + private static final Logger LOG = LogManager.getLogger(Range.class); - /** + /** * @deprecated POI 3.8 beta 5 */ @Deprecated @@ -824,10 +825,8 @@ public class Range { initAll(); if ( tableEndInclusive >= this._parEnd ) { - LOG.log( POILogger.WARN, "The table's bounds ", "[", - this._parStart, "; ", tableEndInclusive, ")", - " fall outside of this Range paragraphs numbers [", - this._parStart, "; ", this._parEnd, ")" ); + LOG.atWarn().log("The table's bounds [{}; {}) fall outside of this Range paragraphs numbers [{}; {})", + this._parStart, box(tableEndInclusive),box(this._parStart),box(this._parEnd)); } if ( tableEndInclusive < 0 ) Modified: poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableRow.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableRow.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableRow.java (original) +++ poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableRow.java Mon Feb 1 14:59:43 2021 @@ -20,14 +20,16 @@ package org.apache.poi.hwpf.usermodel; import java.util.ArrayList; import java.util.List; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.hwpf.sprm.SprmBuffer; import org.apache.poi.hwpf.sprm.TableSprmUncompressor; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; + +import static org.apache.logging.log4j.util.Unbox.box; public final class TableRow extends Range { - private static final POILogger LOG = POILogFactory.getLogger( TableRow.class ); + private static final Logger LOG = LogManager.getLogger(TableRow.class); private static final short SPRM_DXAGAPHALF = (short) 0x9602; private static final short SPRM_DYAROWHEIGHT = (short) 0x9407; @@ -187,11 +189,8 @@ public final class TableRow extends Rang if ( cells.size() != expectedCellsCount ) { - LOG.log( POILogger.WARN, - "Number of found table cells (", cells.size(), - ") for table row [", getStartOffset(), "c; ", - getEndOffset(), "c] not equals to stored property value ", - expectedCellsCount ); + LOG.atWarn().log("Number of found table cells ({}) for table row [{}c; {}c] not equals to stored property value {}", + cells.size(), box(getStartOffset()),box(getEndOffset()),box(expectedCellsCount)); _tprops.setItcMac( (short) cells.size() ); } Modified: poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java (original) +++ poi/branches/log4j/src/scratchpad/src/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java Mon Feb 1 14:59:43 2021 @@ -23,9 +23,10 @@ import java.nio.ByteBuffer; import java.nio.CharBuffer; import java.nio.charset.CharsetDecoder; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.message.SimpleMessage; import org.apache.poi.util.Internal; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; /** * Stream that converts CP950 (MSOffice's dialect of Big5), with @@ -34,7 +35,7 @@ import org.apache.poi.util.POILogger; @Internal public class LittleEndianCP950Reader extends Reader { - private static final POILogger LOGGER = POILogFactory.getLogger(LittleEndianCP950Reader.class); + private static final Logger LOGGER = LogManager.getLogger(LittleEndianCP950Reader.class); private static final char UNMAPPABLE = '?'; private final ByteBuffer doubleByteBuffer = ByteBuffer.allocate(2); @@ -107,9 +108,9 @@ public class LittleEndianCP950Reader ext charBuffer.flip(); if (charBuffer.length() == 0) { - LOGGER.log(POILogger.WARN, "couldn't create char for: " + LOGGER.atWarn().log(() -> new SimpleMessage("couldn't create char for: " + Integer.toString((leading & 0xff), 16) - + " " + Integer.toString((trailing & 0xff), 16)); + + " " + Integer.toString((trailing & 0xff), 16))); return UNMAPPABLE; } else { return Character.codePointAt(charBuffer, 0); @@ -475,8 +476,9 @@ public class LittleEndianCP950Reader ext case 0xfe: return 0x2593; default: - LOGGER.log(POILogger.WARN, "couldn't create char for: f9" - + " " + Integer.toString((trailing & 0xff), 16)); + LOGGER.atWarn().log(() -> + new SimpleMessage("couldn't create char for: f9 " + Integer.toString((trailing & 0xff), 16)) + ); return UNMAPPABLE; } } Modified: poi/branches/log4j/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java (original) +++ poi/branches/log4j/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java Mon Feb 1 14:59:43 2021 @@ -22,15 +22,17 @@ import java.io.IOException; import java.io.InputStream; import java.util.zip.ZipInputStream; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.POIDataSamples; import org.apache.poi.poifs.filesystem.POIFSFileSystem; import org.apache.poi.util.IOUtils; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; + +import static org.apache.logging.log4j.util.Unbox.box; public class HWPFTestDataSamples { - private static final POILogger LOG = POILogFactory.getLogger( HWPFTestDataSamples.class ); + private static final Logger LOG = LogManager.getLogger(HWPFTestDataSamples.class); public static HWPFDocument openSampleFile(String sampleFileName) { try { @@ -65,16 +67,13 @@ public class HWPFTestDataSamples { final long endUnzip = System.currentTimeMillis(); byte[] byteArray = baos.toByteArray(); - LOG.log(POILogger.DEBUG, "Unzipped in ", - Long.valueOf(endUnzip - start), " ms -- ", - Long.valueOf(byteArray.length), " byte(s)"); + LOG.atDebug().log("Unzipped in {} ms -- {} byte(s)", box(endUnzip - start),box(byteArray.length)); ByteArrayInputStream bais = new ByteArrayInputStream(byteArray); HWPFDocument doc = new HWPFDocument(bais); final long endParse = System.currentTimeMillis(); - LOG.log(POILogger.DEBUG, "Parsed in ", - Long.valueOf(endParse - start), " ms"); + LOG.atDebug().log("Parsed in {} ms", box(endParse - start)); return doc; } Modified: poi/branches/log4j/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java (original) +++ poi/branches/log4j/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java Mon Feb 1 14:59:43 2021 @@ -49,8 +49,6 @@ import org.apache.poi.hwpf.model.Picture import org.apache.poi.hwpf.model.SubdocumentType; import org.apache.poi.poifs.filesystem.POIFSFileSystem; import org.apache.poi.util.IOUtils; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; import org.apache.poi.util.XMLHelper; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; Modified: poi/branches/log4j/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java (original) +++ poi/branches/log4j/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java Mon Feb 1 14:59:43 2021 @@ -94,25 +94,25 @@ class TestWrite { "\"de_DE\"."; /* - private static String loggerBefore; + private static String loggingConfigurationBefore; @BeforeClass public static void setUpClass() { - loggerBefore = System.getProperty("org.apache.poi.util.POILogger"); + loggingConfigurationBefore = System.getProperty("log4j.configurationFile"); // this test may fails in newer JDKs because of disallowed access if // properties are missing, make this visible - System.setProperty("org.apache.poi.util.POILogger", CommonsLogger.class.getName()); + System.setProperty("log4j.configurationFile", "log4j2-console.xml"); VariantSupport.setLogUnsupportedTypes(false); } @AfterClass public static void tearDownClass() { - if(loggerBefore == null) { - System.clearProperty("org.apache.poi.util.POILogger"); + if(loggingConfigurationBefore == null) { + System.clearProperty("log4j.configurationFile"); } else { - System.setProperty("org.apache.poi.util.POILogger", loggerBefore); + System.setProperty("log4j.configurationFile", loggingConfigurationBefore); } } */ Modified: poi/branches/log4j/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java (original) +++ poi/branches/log4j/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java Mon Feb 1 14:59:43 2021 @@ -31,8 +31,6 @@ import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellStyle; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; import org.junit.jupiter.api.Test; /** Modified: poi/branches/log4j/src/testcases/org/apache/poi/hssf/usermodel/TestMatrixFormulasFromBinarySpreadsheet.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/testcases/org/apache/poi/hssf/usermodel/TestMatrixFormulasFromBinarySpreadsheet.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/testcases/org/apache/poi/hssf/usermodel/TestMatrixFormulasFromBinarySpreadsheet.java (original) +++ poi/branches/log4j/src/testcases/org/apache/poi/hssf/usermodel/TestMatrixFormulasFromBinarySpreadsheet.java Mon Feb 1 14:59:43 2021 @@ -17,6 +17,7 @@ package org.apache.poi.hssf.usermodel; +import static org.apache.logging.log4j.util.Unbox.box; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -27,6 +28,8 @@ import java.util.List; import java.util.Locale; import java.util.stream.Stream; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.hssf.HSSFTestDataSamples; import org.apache.poi.ss.formula.eval.ErrorEval; import org.apache.poi.ss.formula.functions.TestMathX; @@ -37,8 +40,6 @@ import org.apache.poi.ss.usermodel.Formu import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.util.LocaleUtil; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -46,7 +47,7 @@ import org.junit.jupiter.params.provider final class TestMatrixFormulasFromBinarySpreadsheet { - private static final POILogger LOG = POILogFactory.getLogger(TestMatrixFormulasFromBinarySpreadsheet.class); + private static final Logger LOG = LogManager.getLogger(TestMatrixFormulasFromBinarySpreadsheet.class); private static HSSFWorkbook workbook; @@ -204,14 +205,13 @@ final class TestMatrixFormulasFromBinary */ private static String getTargetFunctionName(Row r) { if(r == null) { - LOG.log(POILogger.WARN,"Warning - given null row, can't figure out function name"); + LOG.atWarn().log("Warning - given null row, can't figure out function name"); return null; } Cell cell = r.getCell(Navigator.START_OPERATORS_COL_INDEX); - LOG.log(POILogger.INFO, String.valueOf(Navigator.START_OPERATORS_COL_INDEX)); + LOG.atInfo().log("{}", box(Navigator.START_OPERATORS_COL_INDEX)); if(cell == null) { - LOG.log(POILogger.WARN, - "Warning - Row " + r.getRowNum() + " has no cell " + Navigator.START_OPERATORS_COL_INDEX + ", can't figure out function name"); + LOG.atWarn().log("Row {} has no cell " + Navigator.START_OPERATORS_COL_INDEX + ", can't figure out function name", box(r.getRowNum())); return null; } Modified: poi/branches/log4j/src/testcases/org/apache/poi/poifs/filesystem/TestEmptyDocument.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/testcases/org/apache/poi/poifs/filesystem/TestEmptyDocument.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/testcases/org/apache/poi/poifs/filesystem/TestEmptyDocument.java (original) +++ poi/branches/log4j/src/testcases/org/apache/poi/poifs/filesystem/TestEmptyDocument.java Mon Feb 1 14:59:43 2021 @@ -24,26 +24,20 @@ import static org.junit.jupiter.api.Asse import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.function.Consumer; import java.util.stream.Stream; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.util.IOUtils; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; -import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; final class TestEmptyDocument { - private static final POILogger LOG = POILogFactory.getLogger(TestEmptyDocument.class); + private static final Logger LOG = LogManager.getLogger(TestEmptyDocument.class); - private interface EmptyDoc { + private interface EmptyDoc { void handle(DirectoryEntry dir) throws IOException; } @@ -61,7 +55,7 @@ final class TestEmptyDocument { } private static void SingleEmptyDocumentEvent(DirectoryEntry dir) throws IOException { - dir.createDocument("Foo", 0, event -> LOG.log(POILogger.WARN, "written")); + dir.createDocument("Foo", 0, event -> LOG.atWarn().log("written")); } private static void EmptyDocumentWithFriend(DirectoryEntry dir) throws IOException { Modified: poi/branches/log4j/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java URL: http://svn.apache.org/viewvc/poi/branches/log4j/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java?rev=1886103&r1=1886102&r2=1886103&view=diff ============================================================================== --- poi/branches/log4j/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java (original) +++ poi/branches/log4j/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java Mon Feb 1 14:59:43 2021 @@ -17,6 +17,7 @@ package org.apache.poi.ss.usermodel; +import static org.apache.logging.log4j.util.Unbox.box; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -38,6 +39,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.ITestDataProvider; import org.apache.poi.ss.SpreadsheetVersion; @@ -47,8 +50,6 @@ import org.apache.poi.ss.util.CellRangeA import org.apache.poi.ss.util.CellRangeAddressList; import org.apache.poi.ss.util.PaneInformation; import org.apache.poi.ss.util.SheetUtil; -import org.apache.poi.util.POILogFactory; -import org.apache.poi.util.POILogger; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -56,7 +57,7 @@ import org.junit.jupiter.api.Test; * A base class for bugzilla issues that can be described in terms of common ss interfaces. */ public abstract class BaseTestBugzillaIssues { - private static final POILogger LOG = POILogFactory.getLogger(BaseTestBugzillaIssues.class); + private static final Logger LOG = LogManager.getLogger(BaseTestBugzillaIssues.class); private static final String TEST_32 = "Some text with 32 characters to "; private static final String TEST_255 = "Some very long text that is exactly 255 characters, which are allowed here, bla bla, bla bla, bla bla, bla bla, bla bla, bla bla, bla bla, bla bla, bla bla, bla bla, bla bla, bla bla, bla bla, bla bla, bla bla, bla bla, bla bla, bla bla, bla bla, bla....."; @@ -1387,7 +1388,7 @@ public abstract class BaseTestBugzillaIs // Create a workbook try (Workbook wb = _testDataProvider.createWorkbook(nrows+1)) { final Sheet sh = wb.createSheet(); - LOG.log(POILogger.DEBUG, wb.getClass().getName(), " column autosizing timing..."); + LOG.atDebug().log("{} column autosizing timing...", wb.getClass().getName()); final long t0 = time(); _testDataProvider.trackAllColumnsForAutosizing(sh); @@ -1400,28 +1401,24 @@ public abstract class BaseTestBugzillaIs } final double populateSheetTime = delta(t0); final double populateSheetTimePerCell_ns = (1000000 * populateSheetTime / (nrows * ncols)); - if (LOG.check(POILogger.DEBUG)) { - LOG.log(POILogger.DEBUG, "Populate sheet time: ", populateSheetTime, " ms (", populateSheetTimePerCell_ns, " ns/cell)"); + LOG.atDebug().log("Populate sheet time: {} ms ({} ns/cell)", populateSheetTime, populateSheetTimePerCell_ns); - LOG.log(POILogger.DEBUG, "Autosizing..."); - } + LOG.atDebug().log("Autosizing..."); final long t1 = time(); for (int c = 0; c < ncols; c++) { final long t2 = time(); sh.autoSizeColumn(c); - LOG.log(POILogger.DEBUG, "Column ", c, " took ", delta(t2), " ms"); + LOG.atDebug().log("Column {} took {} ms", box(c),delta(t2)); } final double autoSizeColumnsTime = delta(t1); final double autoSizeColumnsTimePerColumn = autoSizeColumnsTime / ncols; final double bestFitWidthTimePerCell_ns = 1000000 * autoSizeColumnsTime / (ncols * nrows); - if (LOG.check(POILogger.DEBUG)) { - LOG.log(POILogger.DEBUG, "Auto sizing columns took a total of ", autoSizeColumnsTime, " ms (", autoSizeColumnsTimePerColumn, " ms per column)"); - LOG.log(POILogger.DEBUG, "Best fit width time per cell: ", bestFitWidthTimePerCell_ns, " ns"); - } + LOG.atDebug().log("Auto sizing columns took a total of {} ms ({} ms per column)", autoSizeColumnsTime, autoSizeColumnsTimePerColumn); + LOG.atDebug().log("Best fit width time per cell: {} ns", bestFitWidthTimePerCell_ns); final double totalTime_s = (populateSheetTime + autoSizeColumnsTime) / 1000; - LOG.log(POILogger.DEBUG, "Total time: ", totalTime_s, " s"); + LOG.atDebug().log("Total time: {} s", totalTime_s); } //if (bestFitWidthTimePerCell_ns > 50000) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
