(commons-csv) branch master updated: Make private instance variable final

[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-csv.git


The following commit(s) were added to refs/heads/master by this push:
     new 03d23758 Make private instance variable final
03d23758 is described below

commit 03d23758e8328d21202907a9408a7b891a9eecbd
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Jan 3 15:06:11 2025 -0500

    Make private instance variable final
    
    - Use longer lines
---
 .../org/apache/commons/csv/ExtendedBufferedReader.java     | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/apache/commons/csv/ExtendedBufferedReader.java 
b/src/main/java/org/apache/commons/csv/ExtendedBufferedReader.java
index 3769ffa4..8c0a034a 100644
--- a/src/main/java/org/apache/commons/csv/ExtendedBufferedReader.java
+++ b/src/main/java/org/apache/commons/csv/ExtendedBufferedReader.java
@@ -60,13 +60,13 @@ final class ExtendedBufferedReader extends 
UnsynchronizedBufferedReader {
     private long bytesReadMark;
 
     /** Encoder for calculating the number of bytes for each character read. */
-    private CharsetEncoder encoder;
+    private final CharsetEncoder encoder;
 
     /**
      * Constructs a new instance using the default buffer size.
      */
     ExtendedBufferedReader(final Reader reader) {
-        super(reader);
+        this(reader, null, false);
     }
 
     /**
@@ -80,9 +80,7 @@ final class ExtendedBufferedReader extends 
UnsynchronizedBufferedReader {
      */
     ExtendedBufferedReader(final Reader reader, final Charset charset, final 
boolean trackBytes) {
         super(reader);
-        if (charset != null && trackBytes) {
-            encoder = charset.newEncoder();
-        }
+        encoder = charset != null && trackBytes ? charset.newEncoder() : null;
     }
 
     /**
@@ -137,15 +135,13 @@ final class ExtendedBufferedReader extends 
UnsynchronizedBufferedReader {
         final char cChar = (char) current;
         final char lChar = (char) lastChar;
         if (!Character.isSurrogate(cChar)) {
-            return encoder.encode(
-                CharBuffer.wrap(new char[] {cChar})).limit();
+            return encoder.encode(CharBuffer.wrap(new char[] { cChar 
})).limit();
         }
         if (Character.isHighSurrogate(cChar)) {
             // Move on to the next char (low surrogate)
             return 0;
         } else if (Character.isSurrogatePair(lChar, cChar)) {
-            return encoder.encode(
-                CharBuffer.wrap(new char[] {lChar, cChar})).limit();
+            return encoder.encode(CharBuffer.wrap(new char[] { lChar, cChar 
})).limit();
         } else {
             throw new CharacterCodingException();
         }