You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ki...@apache.org on 2021/07/14 13:05:39 UTC

[commons-imaging] 02/04: Filter exclude the EI_EXPOSE_REP and EI_EXPOSE_REP2 spotbugs errors that are related to objects, and fix the ones for arrays

This is an automated email from the ASF dual-hosted git repository.

kinow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git

commit 12afae20544ee8f433f4afe1150642e565f7bbf3
Author: Bruno P. Kinoshita <ki...@apache.org>
AuthorDate: Thu Jul 15 01:03:15 2021 +1200

    Filter exclude the EI_EXPOSE_REP and EI_EXPOSE_REP2 spotbugs errors that are related to objects, and fix the ones for arrays
---
 src/conf/spotbugs-exclude-filter.xml               | 55 ++++++++++++++++++++++
 .../java/org/apache/commons/imaging/ImageInfo.java |  3 +-
 .../imaging/formats/gif/GifImageMetadata.java      |  2 +-
 .../formats/jpeg/iptc/PhotoshopApp13Data.java      |  5 +-
 .../commons/imaging/palette/QuantizedPalette.java  |  5 +-
 5 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/src/conf/spotbugs-exclude-filter.xml b/src/conf/spotbugs-exclude-filter.xml
index 9d95baf..2f99342 100644
--- a/src/conf/spotbugs-exclude-filter.xml
+++ b/src/conf/spotbugs-exclude-filter.xml
@@ -105,6 +105,61 @@
     <Class name="org.apache.commons.imaging.palette.SimplePalette" />
     <Bug pattern="EI_EXPOSE_REP2" />
   </Match>
+  <Match>
+    <Class name="org.apache.commons.imaging.formats.tiff.write.TiffOutputDirectory" />
+    <Method name="setNextDirectory" />
+    <Bug pattern="EI_EXPOSE_REP2" />
+  </Match>
+  <Match>
+    <Class name="org.apache.commons.imaging.formats.tiff.TiffImageMetadata$Directory" />
+    <Method name="&lt;init&gt;" />
+    <Bug pattern="EI_EXPOSE_REP2" />
+  </Match>
+  <Match>
+    <Class name="org.apache.commons.imaging.formats.tiff.TiffField" />
+    <Method name="getFieldType" />
+    <Bug pattern="EI_EXPOSE_REP" />
+  </Match>
+  <Match>
+    <Class name="org.apache.commons.imaging.formats.jpeg.decoder.JpegDecoder" />
+    <Method name="decode" />
+    <Bug pattern="EI_EXPOSE_REP" />
+  </Match>
+  <Match>
+    <Class name="org.apache.commons.imaging.formats.jpeg.JpegImageMetadata" />
+    <Method name="getExif" />
+    <Bug pattern="EI_EXPOSE_REP" />
+  </Match>
+  <Match>
+    <Class name="org.apache.commons.imaging.formats.jpeg.JpegImageMetadata" />
+    <Method name="getPhotoshop" />
+    <Bug pattern="EI_EXPOSE_REP" />
+  </Match>
+  <Match>
+    <Class name="org.apache.commons.imaging.formats.jpeg.JpegImageMetadata" />
+    <Method name="&lt;init&gt;" />
+    <Bug pattern="EI_EXPOSE_REP2" />
+  </Match>
+  <Match>
+    <Class name="org.apache.commons.imaging.common.mylzw.MyLzwCompressor" />
+    <Method name="&lt;init&gt;" />
+    <Bug pattern="EI_EXPOSE_REP2" />
+  </Match>
+  <Match>
+    <Class name="org.apache.commons.imaging.common.mylzw.MyBitOutputStream" />
+    <Method name="&lt;init&gt;" />
+    <Bug pattern="EI_EXPOSE_REP2" />
+  </Match>
+  <Match>
+    <Class name="org.apache.commons.imaging.common.mylzw.BitsToByteInputStream" />
+    <Method name="&lt;init&gt;" />
+    <Bug pattern="EI_EXPOSE_REP2" />
+  </Match>
+  <Match>
+    <Class name="org.apache.commons.imaging.common.BinaryOutputStream" />
+    <Method name="&lt;init&gt;" />
+    <Bug pattern="EI_EXPOSE_REP2" />
+  </Match>
   <!-- Reason: For code clarity, we could use a simple 'else', but instead keep a complete expression -->
   <Match>
     <Class name="org.apache.commons.imaging.formats.pnm.PnmImageParser" />
diff --git a/src/main/java/org/apache/commons/imaging/ImageInfo.java b/src/main/java/org/apache/commons/imaging/ImageInfo.java
index b3915bc..c6ed5c7 100644
--- a/src/main/java/org/apache/commons/imaging/ImageInfo.java
+++ b/src/main/java/org/apache/commons/imaging/ImageInfo.java
@@ -19,6 +19,7 @@ package org.apache.commons.imaging;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.logging.Logger;
 
@@ -114,7 +115,7 @@ public class ImageInfo {
         this.formatDetails = formatDetails;
 
         this.bitsPerPixel = bitsPerPixel;
-        this.comments = comments;
+        this.comments = comments == null ? Collections.emptyList() : Collections.unmodifiableList(comments);
 
         this.format = format;
         this.formatName = formatName;
diff --git a/src/main/java/org/apache/commons/imaging/formats/gif/GifImageMetadata.java b/src/main/java/org/apache/commons/imaging/formats/gif/GifImageMetadata.java
index 2726ad4..f6e5d08 100644
--- a/src/main/java/org/apache/commons/imaging/formats/gif/GifImageMetadata.java
+++ b/src/main/java/org/apache/commons/imaging/formats/gif/GifImageMetadata.java
@@ -60,6 +60,6 @@ public class GifImageMetadata implements ImageMetadata {
 
     @Override
     public List<GifImageMetadataItem> getItems() {
-        return items;
+        return Collections.unmodifiableList(items);
     }
 }
diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/PhotoshopApp13Data.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/PhotoshopApp13Data.java
index 6d83564..cd13889 100644
--- a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/PhotoshopApp13Data.java
+++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/PhotoshopApp13Data.java
@@ -18,6 +18,7 @@
 package org.apache.commons.imaging.formats.jpeg.iptc;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class PhotoshopApp13Data {
@@ -26,8 +27,8 @@ public class PhotoshopApp13Data {
 
     public PhotoshopApp13Data(final List<IptcRecord> records,
             final List<IptcBlock> rawBlocks) {
-        this.rawBlocks = rawBlocks;
-        this.records = records;
+        this.rawBlocks = rawBlocks == null ? Collections.emptyList() : Collections.unmodifiableList(rawBlocks);
+        this.records = records == null ? Collections.emptyList() : Collections.unmodifiableList(records);
     }
 
     public List<IptcRecord> getRecords() {
diff --git a/src/main/java/org/apache/commons/imaging/palette/QuantizedPalette.java b/src/main/java/org/apache/commons/imaging/palette/QuantizedPalette.java
index 0951f75..29b3ac5 100644
--- a/src/main/java/org/apache/commons/imaging/palette/QuantizedPalette.java
+++ b/src/main/java/org/apache/commons/imaging/palette/QuantizedPalette.java
@@ -16,6 +16,7 @@
  */
 package org.apache.commons.imaging.palette;
 
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.commons.imaging.ImageWriteException;
@@ -26,12 +27,12 @@ public class QuantizedPalette implements Palette {
     private final ColorSpaceSubset[] straight;
 
     public QuantizedPalette(final List<ColorSpaceSubset> subsets, final int precision) {
-        this.subsets = subsets;
+        this.subsets = subsets == null ? Collections.emptyList() : Collections.unmodifiableList(subsets);
         this.precision = precision;
 
         straight = new ColorSpaceSubset[1 << (precision * 3)];
 
-        for (int i = 0; i < subsets.size(); i++) {
+        for (int i = 0; i < this.subsets.size(); i++) {
             final ColorSpaceSubset subset = subsets.get(i);
             subset.setIndex(i);