[commons-csv] 01/05: Use Stream.of() and rename new method to be like Collection#stream() instead of toStream().

[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 a0fcf9a5a595c63e7098debac25d9c0c9f01fb36
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Jul 3 09:11:25 2021 -0400

    Use Stream.of() and rename new method to be like Collection#stream()
    instead of toStream().
---
 .../java/org/apache/commons/csv/CSVRecord.java     | 22 +++++++++++-----------
 .../org/apache/commons/csv/CSVFileParserTest.java  |  5 +----
 .../java/org/apache/commons/csv/CSVRecordTest.java |  4 ++--
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/apache/commons/csv/CSVRecord.java 
b/src/main/java/org/apache/commons/csv/CSVRecord.java
index ced1a9a..64bb40b 100644
--- a/src/main/java/org/apache/commons/csv/CSVRecord.java
+++ b/src/main/java/org/apache/commons/csv/CSVRecord.java
@@ -24,8 +24,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.stream.Stream;
 import java.util.Objects;
+import java.util.stream.Stream;
 
 /**
  * A CSV record parsed from a CSV file.
@@ -290,6 +290,16 @@ public final class CSVRecord implements Serializable, 
Iterable<String> {
     }
 
     /**
+     * Returns a sequential ordered stream whose elements are the values.
+     *
+     * @return the new stream.
+     * @since 1.9.0
+     */
+    public Stream<String> stream() {
+        return Stream.of(values);
+    }
+
+    /**
      * Converts the values to a List.
      *
      * @return a new List
@@ -309,16 +319,6 @@ public final class CSVRecord implements Serializable, 
Iterable<String> {
     }
 
     /**
-     * Returns a sequential ordered stream whose elements are the values.
-     *
-     * @return the new stream.
-     * @since 1.9.0
-     */
-    public Stream<String> toStream() {
-        return Arrays.stream(values);
-    }
-
-    /**
      * Returns a string representation of the contents of this record. The 
result is constructed by comment, mapping,
      * recordNumber and by passing the internal values array to {@link 
Arrays#toString(Object[])}.
      *
diff --git a/src/test/java/org/apache/commons/csv/CSVFileParserTest.java 
b/src/test/java/org/apache/commons/csv/CSVFileParserTest.java
index 61a6ebd..2362aac 100644
--- a/src/test/java/org/apache/commons/csv/CSVFileParserTest.java
+++ b/src/test/java/org/apache/commons/csv/CSVFileParserTest.java
@@ -54,10 +54,7 @@ public class CSVFileParserTest {
     public static Stream<File> generateData() {
         final FilenameFilter fileNameFilter = (dir, name) -> 
name.startsWith("test") && name.endsWith(".txt");
         final File[] files = BASE.listFiles(fileNameFilter);
-        if (files != null) {
-            return Arrays.stream(files);
-        }
-        return Stream.empty();
+        return files != null ? Stream.of(files) : Stream.empty();
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/apache/commons/csv/CSVRecordTest.java 
b/src/test/java/org/apache/commons/csv/CSVRecordTest.java
index 4f655f2..75f5e50 100644
--- a/src/test/java/org/apache/commons/csv/CSVRecordTest.java
+++ b/src/test/java/org/apache/commons/csv/CSVRecordTest.java
@@ -298,9 +298,9 @@ public class CSVRecordTest {
     }
 
     @Test
-    public void testToStream() {
+    public void testStream() {
         final AtomicInteger i = new AtomicInteger();
-        record.toStream().forEach(value -> {
+        record.stream().forEach(value -> {
             assertEquals(values[i.get()], value);
             i.incrementAndGet();
         });