(commons-csv) 03/03: Use 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

commit c75601d2a3426adf1671572766cc65906812fa73
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Thu Jan 2 15:14:43 2025 -0500

    Use final
---
 .../apache/commons/csv/ExtendedBufferedReader.java  | 21 ++++++++++-----------
 .../java/org/apache/commons/csv/JiraCsv196Test.java |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/apache/commons/csv/ExtendedBufferedReader.java 
b/src/main/java/org/apache/commons/csv/ExtendedBufferedReader.java
index 31890db8..957c78bb 100644
--- a/src/main/java/org/apache/commons/csv/ExtendedBufferedReader.java
+++ b/src/main/java/org/apache/commons/csv/ExtendedBufferedReader.java
@@ -78,7 +78,7 @@ final class ExtendedBufferedReader extends 
UnsynchronizedBufferedReader {
      * @param charset the character set for encoding, or {@code null} if not 
applicable.
      * @param enableByteTracking {@code true} to enable byte tracking; {@code 
false} to disable it.
      */
-    ExtendedBufferedReader(final Reader reader, Charset charset, boolean 
enableByteTracking) {
+    ExtendedBufferedReader(final Reader reader, final Charset charset, final 
boolean enableByteTracking) {
         super(reader);
         if (charset != null && enableByteTracking) {
             encoder = charset.newEncoder();
@@ -133,22 +133,21 @@ final class ExtendedBufferedReader extends 
UnsynchronizedBufferedReader {
      * @return the byte length of the character.
      * @throws CharacterCodingException if the character cannot be encoded.
      */
-    private int getEncodedCharLength(int current) throws 
CharacterCodingException {
+    private int getEncodedCharLength(final int current) throws 
CharacterCodingException {
         final char cChar = (char) current;
         final char lChar = (char) lastChar;
         if (!Character.isSurrogate(cChar)) {
             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();
         } else {
-            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();
-            } else {
-                throw new CharacterCodingException();
-            }
+            throw new CharacterCodingException();
         }
     }
 
diff --git a/src/test/java/org/apache/commons/csv/JiraCsv196Test.java 
b/src/test/java/org/apache/commons/csv/JiraCsv196Test.java
index 3a4b09ca..54d28256 100644
--- a/src/test/java/org/apache/commons/csv/JiraCsv196Test.java
+++ b/src/test/java/org/apache/commons/csv/JiraCsv196Test.java
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
 
 public class JiraCsv196Test {
 
-    private Reader getTestInput(String path) {
+    private Reader getTestInput(final String path) {
         return new 
InputStreamReader(ClassLoader.getSystemClassLoader().getResourceAsStream(path));
     }