refactor: simplify BOM handling in CsvReader #149

Author: osiegmar

lib/src/main/java/de/siegmar/fastcsv/reader/BomUtil.java

@@ -1,9 +1,6 @@
 package de.siegmar.fastcsv.reader;
 
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
@@ -90,26 +87,4 @@ static Optional<BomHeader> detectCharset(final Path file)
  }
  }
 
- /// Opens a Reader for the given file, skipping a BOM header if present.
- /// If no BOM header is present, the `defaultCharset` is used.
- ///
- /// @param file the file to open a Reader for
- /// @param defaultCharset the default charset to use if no BOM header is present
- /// @return a Reader for the given file
- /// @throws IOException if an I/O error occurs opening the file
- static Reader openReader(final Path file, final Charset defaultCharset) throws IOException {
- final var bomHeader = detectCharset(file);
- final var in = Files.newInputStream(file);
-
- // No BOM header found
- if (bomHeader.isEmpty()) {
- return new InputStreamReader(in, defaultCharset);
- }
-
- // Return reader with skipped BOM header
- final int bomLength = bomHeader.get().getLength();
- in.skipNBytes(bomLength);
- return new InputStreamReader(in, bomHeader.get().getCharset());
- }
-
 }

lib/src/main/java/de/siegmar/fastcsv/reader/CsvReader.java

@@ -970,7 +970,7 @@ public <T> CsvReader<T> build(final CsvCallbackHandler<T> callbackHandler,
  Objects.requireNonNull(charset, "charset must not be null");
 
  final Reader reader = detectBomHeader
- ? BomUtil.openReader(file, charset)
+ ? new BomInputStreamReader(Files.newInputStream(file), charset)
  : new InputStreamReader(Files.newInputStream(file), charset);
 
  return build(callbackHandler, reader);