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
commit f0b55d0a79c0d9f3f2562bcc659033389e7848cc
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat May 20 12:24:36 2023 -0400
Remove unused API
---
.../commons/imaging/common/bytesource/ByteSource.java | 2 --
.../imaging/common/bytesource/ByteSourceArray.java | 6 ------
.../imaging/common/bytesource/ByteSourceFile.java | 8 --------
.../common/bytesource/ByteSourceInputStream.java | 17 ++---------------
.../imaging/common/bytesource/ByteSourceDataTest.java | 6 ------
5 files changed, 2 insertions(+), 37 deletions(-)
diff --git
a/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSource.java
b/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSource.java
index d25e5b28..598668cf 100644
--- a/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSource.java
+++ b/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSource.java
@@ -28,8 +28,6 @@ public abstract class ByteSource {
this.fileName = fileName;
}
- public abstract byte[] getAll() throws IOException;
-
public byte[] getBlock(final int start, final int length) throws
IOException {
return getBlock(0xFFFFffffL & start, length);
}
diff --git
a/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceArray.java
b/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceArray.java
index cf246dc3..19140002 100644
---
a/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceArray.java
+++
b/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceArray.java
@@ -17,7 +17,6 @@
package org.apache.commons.imaging.common.bytesource;
import java.io.ByteArrayInputStream;
-import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
@@ -35,11 +34,6 @@ public class ByteSourceArray extends ByteSource {
this.bytes = bytes;
}
- @Override
- public byte[] getAll() throws IOException {
- return bytes;
- }
-
@Override
public byte[] getBlock(final long startLong, final int length) throws
ImagingException {
final int start = (int) startLong;
diff --git
a/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceFile.java
b/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceFile.java
index e3f2fd75..b0d0aaf5 100644
---
a/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceFile.java
+++
b/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceFile.java
@@ -25,7 +25,6 @@ import java.io.RandomAccessFile;
import org.apache.commons.imaging.ImagingException;
import org.apache.commons.imaging.common.BinaryFunctions;
-import org.apache.commons.io.IOUtils;
public class ByteSourceFile extends ByteSource {
private final File file;
@@ -35,13 +34,6 @@ public class ByteSourceFile extends ByteSource {
this.file = file;
}
- @Override
- public byte[] getAll() throws IOException {
- try (InputStream is = getInputStream()) {
- return IOUtils.toByteArray(is);
- }
- }
-
@Override
public byte[] getBlock(final long start, final int length) throws
IOException {
try (RandomAccessFile raf = new RandomAccessFile(file, "r")) {
diff --git
a/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceInputStream.java
b/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceInputStream.java
index e785a63f..a1468061 100644
---
a/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceInputStream.java
+++
b/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceInputStream.java
@@ -17,7 +17,6 @@
package org.apache.commons.imaging.common.bytesource;
import java.io.BufferedInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
@@ -29,6 +28,7 @@ import org.apache.commons.imaging.common.BinaryFunctions;
import org.apache.commons.io.IOUtils;
public class ByteSourceInputStream extends ByteSource {
+
private class CacheBlock {
public final byte[] bytes;
private CacheBlock next;
@@ -167,12 +167,11 @@ public class ByteSourceInputStream extends ByteSource {
}
}
+
private static final int BLOCK_SIZE = 1024;
private final InputStream is;
private CacheBlock cacheHead;
-
private byte[] readBuffer;
-
private long streamLength = -1;
public ByteSourceInputStream(final InputStream is, final String fileName) {
@@ -180,18 +179,6 @@ public class ByteSourceInputStream extends ByteSource {
this.is = new BufferedInputStream(is);
}
- @Override
- public byte[] getAll() throws IOException {
- final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
- CacheBlock block = getFirstBlock();
- while (block != null) {
- baos.write(block.bytes);
- block = block.getNext();
- }
- return baos.toByteArray();
- }
-
@Override
public byte[] getBlock(final long blockStart, final int blockLength)
throws IOException {
// We include a separate check for int overflow.
diff --git
a/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.java
b/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.java
index 394a40be..5040dd19 100644
---
a/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.java
+++
b/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.java
@@ -121,12 +121,6 @@ public class ByteSourceDataTest extends ByteSourceTest {
}
}
- {
- // test getAll() method.
- final byte[] all = byteSource.getAll();
- assertArrayEquals(src, all);
- }
-
if (src.length > 2) {
// test optional start param to getInputStream()
