[commons-csv] branch master updated: Use streams. Remove unused imports.

[gg...@apache.org]

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 589f822  Use streams. Remove unused imports.
589f822 is described below

commit 589f8224456b718b20aa758fe53b21173dd55b2c
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jul 6 09:35:44 2021 -0400

    Use streams.
    Remove unused imports.
---
 src/main/java/org/apache/commons/csv/CSVPrinter.java | 6 ++----
 src/main/java/org/apache/commons/csv/CSVRecord.java  | 5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/apache/commons/csv/CSVPrinter.java b/src/main/java/org/apache/commons/csv/CSVPrinter.java
index 161f452..a7b3014 100644
--- a/src/main/java/org/apache/commons/csv/CSVPrinter.java
+++ b/src/main/java/org/apache/commons/csv/CSVPrinter.java
@@ -102,9 +102,7 @@ public final class CSVPrinter implements Flushable, Closeable {
         // It seems a pain to have to track whether the header has already been printed or not.
         if (format.getHeaderComments() != null) {
             for (final String line : format.getHeaderComments()) {
-                if (line != null) {
-                    this.printComment(line);
-                }
+                this.printComment(line);
             }
         }
         if (format.getHeader() != null && !format.getSkipHeaderRecord()) {
@@ -195,7 +193,7 @@ public final class CSVPrinter implements Flushable, Closeable {
      *             If an I/O error occurs
      */
     public void printComment(final String comment) throws IOException {
-        if (!format.isCommentMarkerSet()) {
+        if (comment == null || !format.isCommentMarkerSet()) {
             return;
         }
         if (!newRecord) {
diff --git a/src/main/java/org/apache/commons/csv/CSVRecord.java b/src/main/java/org/apache/commons/csv/CSVRecord.java
index 635cb02..a8aa082 100644
--- a/src/main/java/org/apache/commons/csv/CSVRecord.java
+++ b/src/main/java/org/apache/commons/csv/CSVRecord.java
@@ -23,7 +23,6 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.stream.Stream;
 
@@ -271,12 +270,12 @@ public final class CSVRecord implements Serializable, Iterable<String> {
         if (getHeaderMapRaw() == null) {
             return map;
         }
-        for (final Entry<String, Integer> entry : getHeaderMapRaw().entrySet()) {
+        getHeaderMapRaw().entrySet().forEach(entry -> {
             final int col = entry.getValue().intValue();
             if (col < values.length) {
                 map.put(entry.getKey(), values[col]);
             }
-        }
+        });
         return map;
     }