You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2021/01/16 19:34:28 UTC
[commons-imaging] branch master updated: Define and reuse constants.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git
The following commit(s) were added to refs/heads/master by this push:
new 5baa783 Define and reuse constants.
5baa783 is described below
commit 5baa783211ff2aa3b3493e24183f2106f2b38f95
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jan 16 14:34:23 2021 -0500
Define and reuse constants.
---
src/main/java/org/apache/commons/imaging/ImagingConstants.java | 5 +++++
.../org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java | 2 +-
.../apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java | 3 ++-
.../java/org/apache/commons/imaging/formats/tiff/TiffImageData.java | 5 +++--
.../org/apache/commons/imaging/common/bytesource/ByteSourceTest.java | 5 ++---
.../commons/imaging/formats/jpeg/segments/AppnSegmentTest.java | 3 ++-
.../apache/commons/imaging/formats/png/chunks/PngChunkIccpTest.java | 3 ++-
.../apache/commons/imaging/formats/png/chunks/PngChunkTextTest.java | 3 ++-
.../png/transparencyfilters/TransparencyFilterIndexedColorTest.java | 3 ++-
9 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/apache/commons/imaging/ImagingConstants.java b/src/main/java/org/apache/commons/imaging/ImagingConstants.java
index a31e3cd..47a3413 100644
--- a/src/main/java/org/apache/commons/imaging/ImagingConstants.java
+++ b/src/main/java/org/apache/commons/imaging/ImagingConstants.java
@@ -117,6 +117,11 @@ public final class ImagingConstants {
*/
public static final String PARAM_KEY_PIXEL_DENSITY = "PIXEL_DENSITY";
+ /**
+ * Empty byte array.
+ */
+ public static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
+
private ImagingConstants() {
}
}
diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
index abe4132..8814075 100644
--- a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
+++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
@@ -311,7 +311,7 @@ public class IptcParser extends BinaryFileParser {
byte[] blockNameBytes;
if (blockNameLength == 0) {
readByte("Block name bytes", bis, "Image Resource Block has invalid name");
- blockNameBytes = new byte[0];
+ blockNameBytes = ImagingConstants.EMPTY_BYTE_ARRAY;
} else {
try {
blockNameBytes = readBytes("", bis, blockNameLength,
diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java
index 19ade1b..0d87860 100644
--- a/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java
+++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java
@@ -28,6 +28,7 @@ import java.util.Map;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.ImageWriteException;
+import org.apache.commons.imaging.ImagingConstants;
import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.common.bytesource.ByteSourceArray;
import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
@@ -354,7 +355,7 @@ public class JpegIptcRewriter extends JpegRewriter {
final byte[] newBlockBytes = new IptcParser().writeIPTCBlock(newData.getRecords());
final int blockType = IptcConstants.IMAGE_RESOURCE_BLOCK_IPTC_DATA;
- final byte[] blockNameBytes = new byte[0];
+ final byte[] blockNameBytes = ImagingConstants.EMPTY_BYTE_ARRAY;
final IptcBlock newBlock = new IptcBlock(blockType, blockNameBytes, newBlockBytes);
newBlocks.add(newBlock);
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java
index 973561d..27f4341 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.nio.ByteOrder;
import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.ImagingConstants;
import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
import org.apache.commons.imaging.formats.tiff.constants.TiffPlanarConfiguration;
import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants;
@@ -165,7 +166,7 @@ public abstract class TiffImageData {
ByteSourceFile byteSourceFile;
public ByteSourceData(final long offset, final int length, final ByteSourceFile byteSource) {
- super(offset, length, new byte[0]);
+ super(offset, length, ImagingConstants.EMPTY_BYTE_ARRAY);
byteSourceFile = byteSource;
}
@@ -179,7 +180,7 @@ public abstract class TiffImageData {
try {
return byteSourceFile.getBlock(offset, length);
} catch (final IOException ioex) {
- return new byte[0];
+ return ImagingConstants.EMPTY_BYTE_ARRAY;
}
}
}
diff --git a/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java b/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java
index 35f3e20..84c906a 100644
--- a/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java
+++ b/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java
@@ -25,6 +25,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
+import org.apache.commons.imaging.ImagingConstants;
import org.apache.commons.imaging.ImagingTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -46,8 +47,6 @@ public abstract class ByteSourceTest extends ImagingTest {
}
protected static byte[][] getTestByteArrays() {
- final byte emptyArray[] = (new byte[0]);
-
final byte single[] = new byte[1];
for (int i = 0; i < single.length; i++) {
single[i] = (byte) i;
@@ -67,7 +66,7 @@ public abstract class ByteSourceTest extends ImagingTest {
}
final byte longArray[] = (baos.toByteArray());
- return new byte[][]{emptyArray, single, simple, zeroes, longArray,};
+ return new byte[][]{ImagingConstants.EMPTY_BYTE_ARRAY, single, simple, zeroes, longArray,};
}
@Test
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/segments/AppnSegmentTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/segments/AppnSegmentTest.java
index b144e2d..0a6fd36 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/segments/AppnSegmentTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/segments/AppnSegmentTest.java
@@ -22,13 +22,14 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import org.apache.commons.imaging.ImagingConstants;
import org.junit.jupiter.api.Test;
public class AppnSegmentTest{
@Test
public void testCreatesAppnSegment() throws IOException {
- final InputStream inputStream = new ByteArrayInputStream(new byte[0]);
+ final InputStream inputStream = new ByteArrayInputStream(ImagingConstants.EMPTY_BYTE_ARRAY);
final AppnSegment appnSegment = new AppnSegment(0, 0, inputStream);
assertEquals("[Segment: APPN (APP-65504) (Unknown)]", appnSegment.toString());
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIccpTest.java b/src/test/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIccpTest.java
index db0fb78..09c748b 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIccpTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIccpTest.java
@@ -28,6 +28,7 @@ import java.util.zip.Deflater;
import java.util.zip.DeflaterOutputStream;
import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.ImagingConstants;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -40,7 +41,7 @@ public class PngChunkIccpTest {
@Test
public void testErrorOnNoProfileName() {
- final byte[] data = new byte[0];
+ final byte[] data = ImagingConstants.EMPTY_BYTE_ARRAY;
Assertions.assertThrows(ImageReadException.class, () -> {
new PngChunkIccp(0, chunkType, 0, data);
});
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/chunks/PngChunkTextTest.java b/src/test/java/org/apache/commons/imaging/formats/png/chunks/PngChunkTextTest.java
index fc6e089..2f7dfff 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/chunks/PngChunkTextTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/chunks/PngChunkTextTest.java
@@ -19,13 +19,14 @@ package org.apache.commons.imaging.formats.png.chunks;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
+import org.apache.commons.imaging.ImagingConstants;
import org.junit.jupiter.api.Test;
public class PngChunkTextTest{
@Test
public void testCreatesPngChunkText() {
- final byte[] byteArray = new byte[0];
+ final byte[] byteArray = ImagingConstants.EMPTY_BYTE_ARRAY;
try {
new PngChunkText(1214, 1214, 0, byteArray);
fail("Expecting exception: Exception");
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterIndexedColorTest.java b/src/test/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterIndexedColorTest.java
index 722697c..15bb535 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterIndexedColorTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/transparencyfilters/TransparencyFilterIndexedColorTest.java
@@ -19,13 +19,14 @@ package org.apache.commons.imaging.formats.png.transparencyfilters;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
+import org.apache.commons.imaging.ImagingConstants;
import org.junit.jupiter.api.Test;
public class TransparencyFilterIndexedColorTest{
@Test
public void testFilterWithNegativeAndNegative() {
- final byte[] byteArray = new byte[0];
+ final byte[] byteArray = ImagingConstants.EMPTY_BYTE_ARRAY;
final TransparencyFilterIndexedColor transparencyFilterIndexedColor = new TransparencyFilterIndexedColor(byteArray);
try {