refactor(io): rename StudentCsvReader package

2026-08-31 23:08:50 +04:00
parent f1c6aa1443
commit fa75549c84
2 changed files with 83 additions and 89 deletions
@@ -1,89 +0,0 @@
-package ru.project.datasource;
-
-import ru.project.student.Student;
-import ru.project.student.StudentBuilder;
-
-import org.apache.commons.csv.CSVFormat;
-import org.apache.commons.csv.CSVParser;
-import org.apache.commons.csv.CSVRecord;
-
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.NoSuchElementException;
-
-public class StudentCsvReader implements Iterator<Student> {
-    private static final String GROUP_NUMBER = "groupNumber";
-    private static final String AVERAGE_GRADE = "averageGrade";
-    private static final String RECORD_BOOK_NUMBER = "recordBookNumber";
-
-    private final CSVParser parser;
-    private final Iterator<CSVRecord> records;
-
-    private int lineOfFile;
-
-    public StudentCsvReader(String absoluteFilePath) {
-        lineOfFile = 0;
-        Path path = Paths.get(absoluteFilePath);
-        if (!path.isAbsolute()) {
-            throw new IllegalArgumentException("File path must be absolute");
-        }
-
-        try {
-            CSVFormat format = CSVFormat.DEFAULT.builder()
-                    .setHeader()
-                    .setSkipHeaderRecord(true)
-                    .build();
-            this.parser = CSVParser.parse(path, StandardCharsets.UTF_8, format);
-            validateHeader(parser.getHeaderMap());
-            this.records = parser.iterator();
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
-    }
-
-    @Override
-    public boolean hasNext() {
-        return records.hasNext();
-    }
-
-    @Override
-    public Student next() {
-        lineOfFile++;
-        if (!records.hasNext()) {
-            throw new NoSuchElementException("Problem at line " + lineOfFile + ".");
-        }
-
-        CSVRecord record = records.next();
-        if (record.size() != 3) {
-            throw new IllegalArgumentException(
-                    "Problem at line " + lineOfFile + ".Expected 3 columns, but got " + record.size());
-        }
-        try {
-            double averageGrade = Double.parseDouble(record.get(AVERAGE_GRADE));
-            int recordBookNumber = Integer.parseInt(record.get(RECORD_BOOK_NUMBER));
-            return new StudentBuilder()
-                    .setGroupNumber(record.get(GROUP_NUMBER))
-                    .setAverageGrade(averageGrade)
-                    .setRecordBookNumber(recordBookNumber)
-                    .build();
-        }
-        catch (NumberFormatException e){
-            throw new IllegalArgumentException(
-                    "Problem at line " + lineOfFile + ". Unacceptable type convertation");
-        }
-    }
-
-    private static void validateHeader(Map<String, Integer> headerMap) {
-        String[] expected = {GROUP_NUMBER, AVERAGE_GRADE, RECORD_BOOK_NUMBER};
-        if (headerMap.size() != expected.length
-                || !headerMap.keySet().containsAll(Arrays.asList(expected))) {
-            throw new IllegalArgumentException("Invalid CSV header");
-        }
-    }
-}
@@ -0,0 +1,83 @@
+package ru.project.io;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVParser;
+import org.apache.commons.csv.CSVRecord;
+import ru.project.student.Student;
+import ru.project.student.StudentBuilder;
+
+public class StudentCsvReader implements Iterator<Student> {
+  private static final String GROUP_NUMBER = "groupNumber";
+  private static final String AVERAGE_GRADE = "averageGrade";
+  private static final String RECORD_BOOK_NUMBER = "recordBookNumber";
+
+  private final CSVParser parser;
+  private final Iterator<CSVRecord> records;
+
+  private int lineOfFile;
+
+  public StudentCsvReader(String absoluteFilePath) {
+    lineOfFile = 0;
+    Path path = Paths.get(absoluteFilePath);
+    if (!path.isAbsolute()) {
+      throw new IllegalArgumentException("File path must be absolute");
+    }
+
+    try {
+      CSVFormat format = CSVFormat.DEFAULT.builder().setHeader().setSkipHeaderRecord(true).build();
+      this.parser = CSVParser.parse(path, StandardCharsets.UTF_8, format);
+      validateHeader(parser.getHeaderMap());
+      this.records = parser.iterator();
+    } catch (IOException e) {
+      throw new UncheckedIOException(e);
+    }
+  }
+
+  @Override
+  public boolean hasNext() {
+    return records.hasNext();
+  }
+
+  @Override
+  public Student next() {
+    lineOfFile++;
+    if (!records.hasNext()) {
+      throw new NoSuchElementException("Problem at line " + lineOfFile + ".");
+    }
+
+    CSVRecord record = records.next();
+    if (record.size() != 3) {
+      throw new IllegalArgumentException(
+          "Problem at line " + lineOfFile + ".Expected 3 columns, but got " + record.size());
+    }
+    try {
+      double averageGrade = Double.parseDouble(record.get(AVERAGE_GRADE));
+      int recordBookNumber = Integer.parseInt(record.get(RECORD_BOOK_NUMBER));
+      return new StudentBuilder()
+          .setGroupNumber(record.get(GROUP_NUMBER))
+          .setAverageGrade(averageGrade)
+          .setRecordBookNumber(recordBookNumber)
+          .build();
+    } catch (NumberFormatException e) {
+      throw new IllegalArgumentException(
+          "Problem at line " + lineOfFile + ". Unacceptable type convertation");
+    }
+  }
+
+  private static void validateHeader(Map<String, Integer> headerMap) {
+    String[] expected = {GROUP_NUMBER, AVERAGE_GRADE, RECORD_BOOK_NUMBER};
+    if (headerMap.size() != expected.length
+        || !headerMap.keySet().containsAll(Arrays.asList(expected))) {
+      throw new IllegalArgumentException("Invalid CSV header");
+    }
+  }
+}