[commons-csv] branch master updated: Refactor and reuse constant.

[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 0b01ea8  Refactor and reuse constant.
0b01ea8 is described below

commit 0b01ea82111daf48779159746b76ef27d0d7eac7
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Feb 22 20:32:34 2021 -0500

    Refactor and reuse constant.
---
 src/main/java/org/apache/commons/csv/CSVParser.java | 4 ++--
 src/main/java/org/apache/commons/csv/CSVRecord.java | 4 +---
 src/main/java/org/apache/commons/csv/Constants.java | 2 ++
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/apache/commons/csv/CSVParser.java 
b/src/main/java/org/apache/commons/csv/CSVParser.java
index bf6eb6d..286901a 100644
--- a/src/main/java/org/apache/commons/csv/CSVParser.java
+++ b/src/main/java/org/apache/commons/csv/CSVParser.java
@@ -706,8 +706,8 @@ public final class CSVParser implements 
Iterable<CSVRecord>, Closeable {
         if (!this.recordList.isEmpty()) {
             this.recordNumber++;
             final String comment = sb == null ? null : sb.toString();
-            result = new CSVRecord(this, this.recordList.toArray(new 
String[this.recordList.size()]),
-                comment, this.recordNumber, startCharPosition);
+            result = new CSVRecord(this, 
this.recordList.toArray(Constants.EMPTY_STRING_ARRAY), comment,
+                this.recordNumber, startCharPosition);
         }
         return result;
     }
diff --git a/src/main/java/org/apache/commons/csv/CSVRecord.java 
b/src/main/java/org/apache/commons/csv/CSVRecord.java
index f3b023f..96582e5 100644
--- a/src/main/java/org/apache/commons/csv/CSVRecord.java
+++ b/src/main/java/org/apache/commons/csv/CSVRecord.java
@@ -40,8 +40,6 @@ import java.util.Objects;
  */
 public final class CSVRecord implements Serializable, Iterable<String> {
 
-    private static final String[] EMPTY_STRING_ARRAY = new String[0];
-
     private static final long serialVersionUID = 1L;
 
     private final long characterPosition;
@@ -61,7 +59,7 @@ public final class CSVRecord implements Serializable, 
Iterable<String> {
     CSVRecord(final CSVParser parser, final String[] values, final String 
comment, final long recordNumber,
             final long characterPosition) {
         this.recordNumber = recordNumber;
-        this.values = values != null ? values : EMPTY_STRING_ARRAY;
+        this.values = values != null ? values : Constants.EMPTY_STRING_ARRAY;
         this.parser = parser;
         this.comment = comment;
         this.characterPosition = characterPosition;
diff --git a/src/main/java/org/apache/commons/csv/Constants.java 
b/src/main/java/org/apache/commons/csv/Constants.java
index b7dc770..10c2006 100644
--- a/src/main/java/org/apache/commons/csv/Constants.java
+++ b/src/main/java/org/apache/commons/csv/Constants.java
@@ -79,4 +79,6 @@ final class Constants {
     /** ASCII unit separator */
     static final char US = 31;
 
+    static final String[] EMPTY_STRING_ARRAY = new String[0];
+
 }