You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2021/12/05 15:33:40 UTC
svn commit: r1895596 - in /poi/trunk: poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/ poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/ poi-ooxml/src/test/java/org/apache/poi/xwpf/ po...
Author: centic
Date: Sun Dec 5 15:33:39 2021
New Revision: 1895596
URL: http://svn.apache.org/viewvc?rev=1895596&view=rev
Log:
Apply IDE suggestions, adjust tests, ...
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveFakeEntry.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/EncryptedTempData.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/TestXWPFBugs.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCPLCBit.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocument.java
poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTextRun.java
poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/SupBookRecord.java
poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/chart/ChartFRTInfoRecord.java
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveFakeEntry.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveFakeEntry.java?rev=1895596&r1=1895595&r2=1895596&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveFakeEntry.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveFakeEntry.java Sun Dec 5 15:33:39 2021
@@ -55,7 +55,7 @@ import org.apache.poi.util.TempFile;
} else {
tempFile = TempFile.createTempFile("poi-zip-entry", ".tmp");
LOG.atInfo().log("created for temp file {} for zip entry {} of size {} bytes",
- () -> tempFile.getAbsolutePath(), () -> entry.getName(), () -> entrySize);
+ () -> tempFile.getAbsolutePath(), entry::getName, () -> entrySize);
IOUtils.copy(inp, tempFile);
}
} else {
@@ -97,7 +97,7 @@ import org.apache.poi.util.TempFile;
/**
* Deletes any temp files and releases any byte arrays.
- * @throws IOException
+ * @throws IOException If closing the entry fails.
* @since POI 5.1.0
*/
@Override
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/EncryptedTempData.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/EncryptedTempData.java?rev=1895596&r1=1895595&r2=1895596&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/EncryptedTempData.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/EncryptedTempData.java Sun Dec 5 15:33:39 2021
@@ -100,7 +100,7 @@ public class EncryptedTempData {
*/
public void dispose() {
if (!tempFile.delete()) {
- LOG.atWarn().log("{} can't be removed (or was already removed).", () -> tempFile.getAbsolutePath());
+ LOG.atWarn().log("{} can't be removed (or was already removed).", tempFile::getAbsolutePath);
}
}
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java?rev=1895596&r1=1895595&r2=1895596&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java Sun Dec 5 15:33:39 2021
@@ -82,7 +82,6 @@ public class XmlVisioDocument extends PO
@Override
protected void onDocumentRead() {
-
// by the time this gets called, all other document parts should
// have been loaded, so it's safe to build the document structure
@@ -90,17 +89,17 @@ public class XmlVisioDocument extends PO
// loaded yet, so it's not quite safe
for (POIXMLDocumentPart part : getRelations()) {
-
// organize the document pieces
- if (part instanceof XDGFPages)
+ if (part instanceof XDGFPages) {
_pages = (XDGFPages) part;
-
- else if (part instanceof XDGFMasters)
+ } else if (part instanceof XDGFMasters) {
_masters = (XDGFMasters) part;
+ }
}
- if (_masters != null)
+ if (_masters != null) {
_masters.onDocumentRead();
+ }
_pages.onDocumentRead();
}
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/TestXWPFBugs.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/TestXWPFBugs.java?rev=1895596&r1=1895595&r2=1895596&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/TestXWPFBugs.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/TestXWPFBugs.java Sun Dec 5 15:33:39 2021
@@ -52,6 +52,7 @@ class TestXWPFBugs {
assertThrows(IOException.class, () -> {
try (InputStream fis = samples.openResourceAsStream("truncated62886.docx");
OPCPackage opc = OPCPackage.open(fis)) {
+ assertNotNull(opc);
//XWPFWordExtractor ext = new XWPFWordExtractor(opc)) {
//assertNotNull(ext.getText());
}
@@ -59,7 +60,7 @@ class TestXWPFBugs {
}
/**
- * A word document that's encrypted with non-standard
+ * A Word document that's encrypted with non-standard
* Encryption options, and no cspname section. See bug 53475
*/
@Test
@@ -77,7 +78,7 @@ class TestXWPFBugs {
Decryptor d = Decryptor.getInstance(info);
assertTrue(d.verifyPassword("solrcell"), "Unable to process: document is encrypted");
- // Check we can read the word document in that
+ // Check we can read the Word document in that
InputStream dataStream = d.getDataStream(filesystem);
OPCPackage opc = OPCPackage.open(dataStream);
XWPFDocument doc = new XWPFDocument(opc);
@@ -91,7 +92,7 @@ class TestXWPFBugs {
}
/**
- * A word document with aes-256, i.e. aes is always 128 bit (= 128 bit block size),
+ * A Word document with aes-256, i.e. aes is always 128 bit (= 128 bit block size),
* but the key can be 128/192/256 bits
*/
@Test
@@ -113,7 +114,7 @@ class TestXWPFBugs {
Decryptor d = Decryptor.getInstance(info);
assertTrue(d.verifyPassword("pass"), "Unable to process: document is encrypted");
- // Check we can read the word document in that
+ // Check we can read the Word document in that
InputStream dataStream = d.getDataStream(filesystem);
OPCPackage opc = OPCPackage.open(dataStream);
XWPFDocument doc = new XWPFDocument(opc);
@@ -158,4 +159,4 @@ class TestXWPFBugs {
assertEquals(731, document.getParagraphs().size());
}
}
-}
\ No newline at end of file
+}
Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCPLCBit.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCPLCBit.java?rev=1895596&r1=1895595&r2=1895596&view=diff
==============================================================================
--- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCPLCBit.java (original)
+++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCPLCBit.java Sun Dec 5 15:33:39 2021
@@ -207,7 +207,7 @@ public abstract class QCPLCBit extends Q
* of the text area that this applies to.
*/
public static class Type12 extends QCPLCBit {
- private String[] hyperlinks;
+ private final String[] hyperlinks;
private static final int oneStartsAt = 0x4c;
private static final int twoStartsAt = 0x68;
Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocument.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocument.java?rev=1895596&r1=1895595&r2=1895596&view=diff
==============================================================================
--- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocument.java (original)
+++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocument.java Sun Dec 5 15:33:39 2021
@@ -214,6 +214,7 @@ public final class HWPFDocument extends
* @param istream The InputStream that contains the Word document.
* @throws IOException If there is an unexpected IOException from the passed
* in InputStream.
+ * @throws org.apache.poi.EmptyFileException If the given stream is empty
*/
public HWPFDocument(InputStream istream) throws IOException {
//do Ole stuff
Modified: poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTextRun.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTextRun.java?rev=1895596&r1=1895595&r2=1895596&view=diff
==============================================================================
--- poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTextRun.java (original)
+++ poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTextRun.java Sun Dec 5 15:33:39 2021
@@ -46,6 +46,7 @@ import org.apache.poi.sl.usermodel.BaseT
import org.apache.poi.sl.usermodel.PlaceholderDetails;
import org.apache.poi.util.LocaleUtil;
import org.junit.jupiter.api.Test;
+import org.opentest4j.AssertionFailedError;
/**
* Tests for TextRuns
@@ -603,16 +604,21 @@ public final class TestTextRun {
.mapToInt(r -> ((DateTimeMCAtom)r).getIndex()).toArray();
assertArrayEquals(expFormatId, actFormatId);
- List<HSLFShapePlaceholderDetails> phs = shapes.stream().map(HSLFSimpleShape::getPlaceholderDetails).collect(Collectors.toList());
+ List<HSLFShapePlaceholderDetails> phs =
+ shapes.stream().map(HSLFSimpleShape::getPlaceholderDetails).collect(Collectors.toList());
for (Map.Entry<Locale,String[]> me : formats.entrySet()) {
LocaleUtil.setUserLocale(me.getKey());
- // refresh internal members
- phs.forEach(PlaceholderDetails::getPlaceholder);
-
- String[] actDate = phs.stream().map(PlaceholderDetails::getDateFormat).map(ldt::format).toArray(String[]::new);
- assertArrayEquals(me.getValue(), actDate);
+ try {
+ // refresh internal members
+ phs.forEach(PlaceholderDetails::getPlaceholder);
+
+ String[] actDate = phs.stream().map(PlaceholderDetails::getDateFormat).map(ldt::format).toArray(String[]::new);
+ assertArrayEquals(me.getValue(), actDate);
+ } catch (AssertionFailedError e) {
+ throw new AssertionFailedError("While handling local " + me.getKey());
+ }
}
} finally {
LocaleUtil.resetUserLocale();
Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/SupBookRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/SupBookRecord.java?rev=1895596&r1=1895595&r2=1895596&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/SupBookRecord.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/SupBookRecord.java Sun Dec 5 15:33:39 2021
@@ -242,7 +242,7 @@ public final class SupBookRecord extends
public void setURL(String pUrl) {
//Keep the first marker character!
- field_2_encoded_url = field_2_encoded_url.substring(0, 1) + pUrl;
+ field_2_encoded_url = field_2_encoded_url.charAt(0) + pUrl;
}
@Override
Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/chart/ChartFRTInfoRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/chart/ChartFRTInfoRecord.java?rev=1895596&r1=1895595&r2=1895596&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/chart/ChartFRTInfoRecord.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/chart/ChartFRTInfoRecord.java Sun Dec 5 15:33:39 2021
@@ -34,16 +34,16 @@ import org.apache.poi.util.LittleEndianO
public final class ChartFRTInfoRecord extends StandardRecord {
public static final short sid = 0x850;
- private short rt;
- private short grbitFrt;
- private byte verOriginator;
- private byte verWriter;
+ private final short rt;
+ private final short grbitFrt;
+ private final byte verOriginator;
+ private final byte verWriter;
private CFRTID[] rgCFRTID;
private static final class CFRTID {
public static final int ENCODED_SIZE = 4;
- private int rtFirst;
- private int rtLast;
+ private final int rtFirst;
+ private final int rtLast;
public CFRTID(CFRTID other) {
rtFirst = other.rtFirst;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org