(commons-imaging) 02/02: Internal refactoring

[ggregory]

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 653697896a7959f4c9d52d93b82e7a204fc76887
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Feb 22 14:34:46 2025 -0500

    Internal refactoring
    
    Code style tweak
---
 .../imaging/bytesource/InputStreamByteSource.java  | 36 ++++++++++++----------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/imaging/bytesource/InputStreamByteSource.java
 
b/src/main/java/org/apache/commons/imaging/bytesource/InputStreamByteSource.java
index b58b3e37..9be030d6 100644
--- 
a/src/main/java/org/apache/commons/imaging/bytesource/InputStreamByteSource.java
+++ 
b/src/main/java/org/apache/commons/imaging/bytesource/InputStreamByteSource.java
@@ -41,11 +41,11 @@ final class InputStreamByteSource extends ByteSource {
         private boolean triedNext;
 
         Block(final byte[] bytes) {
-            this.bytes = bytes;
+            this.bytes = Objects.requireNonNull(bytes);
         }
 
         Block getNext() throws IOException {
-            if (null != next) {
+            if (next != null) {
                 return next;
             }
             if (triedNext) {
@@ -55,6 +55,10 @@ final class InputStreamByteSource extends ByteSource {
             next = readBlock();
             return next;
         }
+
+        int length() {
+            return bytes.length;
+        }
     }
 
     private final class BlockInputStream extends InputStream {
@@ -65,21 +69,21 @@ final class InputStreamByteSource extends ByteSource {
 
         @Override
         public int read() throws IOException {
-            if (null == block) {
+            if (block == null) {
                 if (readFirst) {
                     return -1;
                 }
                 block = getFirstBlock();
                 readFirst = true;
             }
-            if (block != null && blockIndex >= block.bytes.length) {
+            if (block != null && blockIndex >= block.length()) {
                 block = block.getNext();
                 blockIndex = 0;
             }
-            if (null == block) {
+            if (block == null) {
                 return -1;
             }
-            if (blockIndex >= block.bytes.length) {
+            if (blockIndex >= block.length()) {
                 return -1;
             }
             return 0xff & block.bytes[blockIndex++];
@@ -95,24 +99,24 @@ final class InputStreamByteSource extends ByteSource {
                 return 0;
             }
             // optimized block read
-            if (null == block) {
+            if (block == null) {
                 if (readFirst) {
                     return -1;
                 }
                 block = getFirstBlock();
                 readFirst = true;
             }
-            if (block != null && blockIndex >= block.bytes.length) {
+            if (block != null && blockIndex >= block.length()) {
                 block = block.getNext();
                 blockIndex = 0;
             }
-            if (null == block) {
+            if (block == null) {
                 return -1;
             }
-            if (blockIndex >= block.bytes.length) {
+            if (blockIndex >= block.length()) {
                 return -1;
             }
-            final int readSize = Math.min(len, block.bytes.length - 
blockIndex);
+            final int readSize = Math.min(len, block.length() - blockIndex);
             System.arraycopy(block.bytes, blockIndex, array, off, readSize);
             blockIndex += readSize;
             return readSize;
@@ -126,7 +130,7 @@ final class InputStreamByteSource extends ByteSource {
             }
             while (remaining > 0) {
                 // read the first block
-                if (null == block) {
+                if (block == null) {
                     if (readFirst) {
                         return -1;
                     }
@@ -134,17 +138,17 @@ final class InputStreamByteSource extends ByteSource {
                     readFirst = true;
                 }
                 // get next block
-                if (block != null && blockIndex >= block.bytes.length) {
+                if (block != null && blockIndex >= block.length()) {
                     block = block.getNext();
                     blockIndex = 0;
                 }
-                if (null == block) {
+                if (block == null) {
                     break;
                 }
-                if (blockIndex >= block.bytes.length) {
+                if (blockIndex >= block.length()) {
                     break;
                 }
-                final int readSize = Math.min((int) Math.min(BLOCK_SIZE, 
remaining), block.bytes.length - blockIndex);
+                final int readSize = Math.min((int) Math.min(BLOCK_SIZE, 
remaining), block.length() - blockIndex);
                 blockIndex += readSize;
                 remaining -= readSize;
             }