Author: fanningpj
Date: Thu Aug 25 18:52:27 2022
New Revision: 1903686
URL: http://svn.apache.org/viewvc?rev=1903686&view=rev
Log:
sonar issues
Modified:
poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/ss/formula/SettingExternalFunction.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xslf/TestXSLFSlideCopy.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbookWithNullAutoSizeTracker.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFBubbleChartData.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusBrush.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/dev/TypesLister.java
poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/DataSpaceMapUtils.java
poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java
poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java
Modified:
poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/ss/formula/SettingExternalFunction.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/ss/formula/SettingExternalFunction.java?rev=1903686&r1=1903685&r2=1903686&view=diff
==============================================================================
---
poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/ss/formula/SettingExternalFunction.java
(original)
+++
poi/trunk/poi-examples/src/main/java/org/apache/poi/examples/ss/formula/SettingExternalFunction.java
Thu Aug 25 18:52:27 2022
@@ -25,9 +25,7 @@ import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-import org.apache.poi.ss.formula.OperationEvaluationContext;
import org.apache.poi.ss.formula.eval.ErrorEval;
-import org.apache.poi.ss.formula.eval.ValueEval;
import org.apache.poi.ss.formula.functions.FreeRefFunction;
import org.apache.poi.ss.formula.udf.UDFFinder;
import org.apache.poi.ss.usermodel.Row;
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java?rev=1903686&r1=1903685&r2=1903686&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
Thu Aug 25 18:52:27 2022
@@ -4958,7 +4958,7 @@ public class XSSFSheet extends POIXMLDoc
if (totalsRowCount == 1) { // never seen more than one totals
row
XSSFRow totalsRow =
sheet.getRow(clonedTable.getEndCellReference().getRow());
if (clonedTable.getCTTable().getTableColumns() != null
- &&
clonedTable.getCTTable().getTableColumns().getTableColumnList().size() > 0) {
+ &&
!clonedTable.getCTTable().getTableColumns().getTableColumnList().isEmpty()) {
clonedTable.getCTTable().setTotalsRowCount(totalsRowCount);
for (int i = 0; i <
clonedTable.getCTTable().getTableColumns().getTableColumnList().size(); i++) {
CTTableColumn tableCol =
table.getCTTable().getTableColumns().getTableColumnList().get(i);
@@ -4983,7 +4983,7 @@ public class XSSFSheet extends POIXMLDoc
// clone calculated column formulas
if (clonedTable.getCTTable().getTableColumns() != null
- &&
clonedTable.getCTTable().getTableColumns().getTableColumnList().size() > 0) {
+ &&
!clonedTable.getCTTable().getTableColumns().getTableColumnList().isEmpty()) {
clonedTable.getCTTable().setTotalsRowCount(totalsRowCount);
for (int i = 0; i <
clonedTable.getCTTable().getTableColumns().getTableColumnList().size(); i++) {
CTTableColumn tableCol =
table.getCTTable().getTableColumns().getTableColumnList().get(i);
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xslf/TestXSLFSlideCopy.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xslf/TestXSLFSlideCopy.java?rev=1903686&r1=1903685&r2=1903686&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xslf/TestXSLFSlideCopy.java
(original)
+++
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xslf/TestXSLFSlideCopy.java
Thu Aug 25 18:52:27 2022
@@ -31,11 +31,11 @@ import java.util.Objects;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
-public class TestXSLFSlideCopy {
+class TestXSLFSlideCopy {
private static final POIDataSamples slTests =
POIDataSamples.getSlideShowInstance();
@Test
- public void testCopySlide() throws IOException {
+ void testCopySlide() throws IOException {
final String shapeName = "title";
try (
InputStream stream =
slTests.openResourceAsStream("copy-slide-demo.pptx");
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbookWithNullAutoSizeTracker.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbookWithNullAutoSizeTracker.java?rev=1903686&r1=1903685&r2=1903686&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbookWithNullAutoSizeTracker.java
(original)
+++
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbookWithNullAutoSizeTracker.java
Thu Aug 25 18:52:27 2022
@@ -49,9 +49,9 @@ import static org.apache.poi.POITestCase
import static org.apache.poi.POITestCase.assertStartsWith;
import static org.junit.jupiter.api.Assertions.*;
-public final class TestSXSSFWorkbookWithNullAutoSizeTracker extends
BaseTestXWorkbook {
+final class TestSXSSFWorkbookWithNullAutoSizeTracker extends BaseTestXWorkbook
{
- public TestSXSSFWorkbookWithNullAutoSizeTracker() {
+ TestSXSSFWorkbookWithNullAutoSizeTracker() {
super(SXSSFITestDataProviderWithNullAutoSizeTracker.instance);
}
@@ -672,7 +672,7 @@ public final class TestSXSSFWorkbookWith
}
@Test
- public void disableAutoSizeTracker() throws IOException {
+ void disableAutoSizeTracker() throws IOException {
try (Workbook workbook = _testDataProvider.createWorkbook(10)) {
assertThrows(IllegalStateException.class, () -> {
Sheet sheet = workbook.createSheet("testSheet");
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFBubbleChartData.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFBubbleChartData.java?rev=1903686&r1=1903685&r2=1903686&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFBubbleChartData.java
(original)
+++
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFBubbleChartData.java
Thu Aug 25 18:52:27 2022
@@ -39,7 +39,7 @@ import java.util.Calendar;
/**
* Tests for XSSFBubbleChartData.
*/
-public final class TestXSSFBubbleChartData {
+final class TestXSSFBubbleChartData {
@Test
void testExample() throws IOException {
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusBrush.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusBrush.java?rev=1903686&r1=1903685&r2=1903686&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusBrush.java
(original)
+++
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusBrush.java
Thu Aug 25 18:52:27 2022
@@ -355,7 +355,7 @@ public class HemfPlusBrush {
size += LittleEndianConsts.INT_SIZE;
}
- brushBytes = IOUtils.toByteArray(leis, (int)(dataSize-size),
MAX_OBJECT_SIZE);
+ brushBytes = IOUtils.toByteArray(leis,
Math.toIntExact(dataSize-size), MAX_OBJECT_SIZE);
return dataSize;
}
@@ -542,7 +542,7 @@ public class HemfPlusBrush {
// gradient is repeated.
wrapMode = EmfPlusWrapMode.valueOf(leis.readInt());
- int size = 2 * LittleEndianConsts.INT_SIZE;
+ long size = 2L * LittleEndianConsts.INT_SIZE;
size += readRectF(leis, rect);
// An EmfPlusARGB object that specifies the color at the
starting/ending boundary point of the linear gradient brush.
@@ -552,10 +552,11 @@ public class HemfPlusBrush {
// skip reserved1/2 fields
leis.skipFully(2 * LittleEndianConsts.INT_SIZE);
- size += 4 * LittleEndianConsts.INT_SIZE;
+ size += 4L * LittleEndianConsts.INT_SIZE;
if (TRANSFORM.isSet(dataFlags)) {
- size += readXForm(leis, (blendTransform = new
AffineTransform()));
+ blendTransform = new AffineTransform();
+ size += readXForm(leis, blendTransform);
}
if (isPreset() && (isBlendH() || isBlendV())) {
@@ -709,7 +710,7 @@ public class HemfPlusBrush {
// that appears at the center point of the brush. The color of the
brush changes gradually from the
// boundary color to the center color as it moves from the
boundary to the center point.
centerColor = readARGB(leis.readInt());
- long size = 3*LittleEndianConsts.INT_SIZE;
+ long size = 3L * LittleEndianConsts.INT_SIZE;
if (wrapMode == null) {
return size;
@@ -727,7 +728,7 @@ public class HemfPlusBrush {
for (int i = 0; i < colorCount; i++) {
surroundingColor[i] = readARGB(leis.readInt());
}
- size += (colorCount + 1) * LittleEndianConsts.INT_SIZE;
+ size += (colorCount + 1L) * LittleEndianConsts.INT_SIZE;
// The boundary of the path gradient brush, which is specified by
either a path or a closed cardinal spline.
// If the BrushDataPath flag is set in the BrushDataFlags field,
this field MUST contain an
@@ -785,7 +786,7 @@ public class HemfPlusBrush {
size += 3*LittleEndianConsts.INT_SIZE;
}
- return Math.toIntExact(size);
+ return size;
}
@Override
@@ -846,14 +847,16 @@ public class HemfPlusBrush {
// across a shape, when the image is smaller than the area being
filled.
wrapMode = EmfPlusWrapMode.valueOf(leis.readInt());
- long size = 2*LittleEndianConsts.INT_SIZE;
+ long size = 2L * LittleEndianConsts.INT_SIZE;
if (TRANSFORM.isSet(dataFlags)) {
- size += readXForm(leis, (brushTransform = new
AffineTransform()));
+ brushTransform = new AffineTransform();
+ size += readXForm(leis, brushTransform);
}
if (dataSize > size) {
- size += (image = new EmfPlusImage()).init(leis, dataSize-size,
EmfPlusObjectType.IMAGE, 0);
+ image = new EmfPlusImage();
+ size += image.init(leis, dataSize-size,
EmfPlusObjectType.IMAGE, 0);
}
return Math.toIntExact(size);
Modified:
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/dev/TypesLister.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/dev/TypesLister.java?rev=1903686&r1=1903685&r2=1903686&view=diff
==============================================================================
---
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/dev/TypesLister.java
(original)
+++
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/dev/TypesLister.java
Thu Aug 25 18:52:27 2022
@@ -19,7 +19,6 @@ package org.apache.poi.hsmf.dev;
import java.io.PrintStream;
import java.util.ArrayList;
-import java.util.Comparator;
import org.apache.poi.hsmf.datatypes.MAPIProperty;
import org.apache.poi.util.StringUtil;
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/DataSpaceMapUtils.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/DataSpaceMapUtils.java?rev=1903686&r1=1903685&r2=1903686&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/DataSpaceMapUtils.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/DataSpaceMapUtils.java
Thu Aug 25 18:52:27 2022
@@ -24,8 +24,6 @@ import org.apache.poi.EncryptedDocumentE
import org.apache.poi.poifs.crypt.standard.EncryptionRecord;
import org.apache.poi.poifs.filesystem.DirectoryEntry;
import org.apache.poi.poifs.filesystem.DocumentEntry;
-import org.apache.poi.poifs.filesystem.POIFSWriterEvent;
-import org.apache.poi.poifs.filesystem.POIFSWriterListener;
import org.apache.poi.util.IOUtils;
import org.apache.poi.util.LittleEndianByteArrayOutputStream;
import org.apache.poi.util.LittleEndianConsts;
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java?rev=1903686&r1=1903685&r2=1903686&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java
Thu Aug 25 18:52:27 2022
@@ -36,7 +36,6 @@ import org.apache.poi.poifs.crypt.Encryp
import org.apache.poi.poifs.crypt.HashAlgorithm;
import org.apache.poi.poifs.crypt.standard.EncryptionRecord;
import org.apache.poi.poifs.filesystem.DirectoryNode;
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
import org.apache.poi.util.RandomSingleton;
public class BinaryRC4Encryptor extends Encryptor {
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java?rev=1903686&r1=1903685&r2=1903686&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java
Thu Aug 25 18:52:27 2022
@@ -47,7 +47,6 @@ import org.apache.poi.poifs.filesystem.D
import org.apache.poi.poifs.filesystem.POIFSWriterEvent;
import org.apache.poi.poifs.filesystem.POIFSWriterListener;
import org.apache.poi.util.IOUtils;
-import org.apache.poi.util.LittleEndianByteArrayOutputStream;
import org.apache.poi.util.LittleEndianConsts;
import org.apache.poi.util.LittleEndianOutputStream;
import org.apache.poi.util.RandomSingleton;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
