use zero size arg to toArray(), use Collection.addAll() (#63805, second patch)

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1869919 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 7 insertions, 15 deletions

diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java
index fefae87a89..7cee2a0187 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java
+++ b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java
@@ -125,9 +125,7 @@ public class RelationshipTransformService extends TransformService {
             throw new InvalidAlgorithmParameterException();
         }
         RelationshipTransformParameterSpec relParams = (RelationshipTransformParameterSpec) params;
-        for (String sourceId : relParams.sourceIds) {
-            this.sourceIds.add(sourceId);
-        }
+        this.sourceIds.addAll(relParams.sourceIds);
     }
 
     @Override
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFTextRun.java b/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFTextRun.java
index 7903c9c570..ebab4c5f23 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFTextRun.java
+++ b/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFTextRun.java
@@ -365,7 +365,7 @@ public class XDDFTextRun {
             .map(font -> new XDDFFont(FontGroup.SYMBOL, font))
             .ifPresent(font -> list.add(font));
 
-        return list.toArray(new XDDFFont[list.size()]);
+        return list.toArray(new XDDFFont[0]);
     }
 
     /**
diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBSheetHandler.java b/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBSheetHandler.java
index 726c2eeb89..b726545daf 100644
--- a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBSheetHandler.java
+++ b/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBSheetHandler.java
@@ -312,9 +312,7 @@ public class XSSFBSheetHandler extends XSSFBParser {
         b0 &= ~(1<<1);
 
         rkBuffer[4] = b0;
-        for (int i = 1; i < 4; i++) {
-            rkBuffer[i+4] = data[offset+i];
-        }
+        System.arraycopy(data, offset + 1, rkBuffer, 5, 3);
         double d = 0.0;
         if (floatingPoint) {
             d = LittleEndian.getDouble(rkBuffer);
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java
index 671e781c82..eff8e375b4 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java
@@ -61,7 +61,7 @@ public class XSSFConditionalFormatting implements ConditionalFormatting {
                 lst.add(CellRangeAddress.valueOf(region));
             }
         }
-        return lst.toArray(new CellRangeAddress[lst.size()]);
+        return lst.toArray(new CellRangeAddress[0]);
     }
 
     @Override
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
index 884cc8ef11..994deb6daf 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
+++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
@@ -445,7 +445,7 @@ public class XWPFDocument extends POIXMLDocument implements Document, IBody {
     }
 
     public XWPFHyperlink[] getHyperlinks() {
-        return hyperlinks.toArray(new XWPFHyperlink[hyperlinks.size()]);
+        return hyperlinks.toArray(new XWPFHyperlink[0]);
     }
 
     public XWPFComment getCommentByID(String id) {
@@ -459,7 +459,7 @@ public class XWPFDocument extends POIXMLDocument implements Document, IBody {
     }
 
     public XWPFComment[] getComments() {
-        return comments.toArray(new XWPFComment[comments.size()]);
+        return comments.toArray(new XWPFComment[0]);
     }
 
     /**
@@ -1423,11 +1423,7 @@ public class XWPFDocument extends POIXMLDocument implements Document, IBody {
     }
 
     void registerPackagePictureData(XWPFPictureData picData) {
-        List<XWPFPictureData> list = packagePictures.get(picData.getChecksum());
-        if (list == null) {
-            list = new ArrayList<>(1);
-            packagePictures.put(picData.getChecksum(), list);
-        }
+        List<XWPFPictureData> list = packagePictures.computeIfAbsent(picData.getChecksum(), k -> new ArrayList<>(1));
         if (!list.contains(picData)) {
             list.add(picData);
         }