diff --git a/app/pom.xml b/app/pom.xml index 509e563..9caf260 100644 --- a/app/pom.xml +++ b/app/pom.xml @@ -41,6 +41,11 @@ junit-jupiter-params test + + org.apache.commons + commons-csv + 1.14.1 + diff --git a/app/src/main/java/ru/project/datasource/FileDataSource.java b/app/src/main/java/ru/project/datasource/FileDataSource.java index b2c70d9..1c80464 100644 --- a/app/src/main/java/ru/project/datasource/FileDataSource.java +++ b/app/src/main/java/ru/project/datasource/FileDataSource.java @@ -24,9 +24,10 @@ public class FileDataSource implements DataSource{ MyList resultList = new MyLinkedList<>(); try { StudentCsvReader reader = new StudentCsvReader(fileName); - while reader.hasNext() { - result.append(reader.next()); + while (reader.hasNext()) { + resultList.add(reader.next()); } + return resultList; } catch (IllegalArgumentException e){ System.out.println(e.getMessage()); diff --git a/app/src/main/java/ru/project/datasource/FileWriter.java b/app/src/main/java/ru/project/datasource/FileWriter.java index 7b2f366..5d78d89 100644 --- a/app/src/main/java/ru/project/datasource/FileWriter.java +++ b/app/src/main/java/ru/project/datasource/FileWriter.java @@ -8,7 +8,7 @@ import java.nio.file.StandardOpenOption; import ru.project.student.Student; import ru.project.collection.MyList; import ru.project.collection.MyLinkedList; -import ru.project.collection.Iterator; +//import ru.project.collection.Iterator; public class FileWriter { private Path path; @@ -24,11 +24,11 @@ public class FileWriter { StandardOpenOption.CREATE, StandardOpenOption.APPEND )) { - Iterator iterator = list.getIterator(); + /*Iterator iterator = list.getIterator(); while (iterator.hasNext()){ writer.write(iterator.next().toFileString()); writer.newLine(); - } + }*/ } catch (IOException e) { throw new RuntimeException(e); } diff --git a/app/src/main/java/ru/project/datasource/ManualDataSource.java b/app/src/main/java/ru/project/datasource/ManualDataSource.java index d7c46e7..a6ae64c 100644 --- a/app/src/main/java/ru/project/datasource/ManualDataSource.java +++ b/app/src/main/java/ru/project/datasource/ManualDataSource.java @@ -18,7 +18,9 @@ public class ManualDataSource implements DataSource{ String groupNumber, double averageGrade, int recordBookNumber - ){} + ){ + return true; + } @Override public MyList create() { MyList result = new MyLinkedList<>(); diff --git a/app/src/main/java/ru/project/datasource/RandomDataSource.java b/app/src/main/java/ru/project/datasource/RandomDataSource.java index d109fa2..9239aad 100644 --- a/app/src/main/java/ru/project/datasource/RandomDataSource.java +++ b/app/src/main/java/ru/project/datasource/RandomDataSource.java @@ -20,7 +20,7 @@ public class RandomDataSource implements DataSource{ } private String getRandomGroupNumber(Random random){ - char prefix = (char)(random.nextInt(26) + (int)'A')4 + char prefix = (char)(random.nextInt(26) + (int)'A'); String result = prefix + String.format("%02d", random.nextInt(100)); return result; } @@ -33,7 +33,7 @@ public class RandomDataSource implements DataSource{ @Override public MyList create() { if (upperBounRecordBookNumber < 0) - throw new IllegalException("The upper bound is negative!!!"); + throw new IllegalArgumentException("The upper bound is negative!!!"); Random random = new Random(); MyList result = new MyLinkedList<>(); for (short i = 0; i