Attempt at refactoring/bugfixing for #264

src/main/java/nl/tudelft/ewi/queue/helper/CsvUserHelper.java

@@ -15,8 +15,7 @@
  */
 package nl.tudelft.ewi.queue.helper;
 
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.Scanner;
 
@@ -45,20 +44,18 @@ public class CsvUserHelper {
 	}
 
 	public static ArrayList<CsvUserHelper> readCsv(MultipartFile csvFile) throws IOException {
+		if (csvFile.isEmpty())
+			return null;
+
 		InputStream content = csvFile.getInputStream();
-		Scanner scanner = new Scanner(content).useDelimiter("\\A");
+		BufferedReader reader = new BufferedReader(new InputStreamReader(content));
 		ArrayList<CsvUserHelper> csvUserHelpersSet = new ArrayList<>();
 
-		String csv = "";
-		if (scanner.hasNext()) {
-			csv = scanner.next();
-		}
-		String[] lines = csv.split("\n");
-		for (String line : lines) {
-			String[] currLine = line.split(",");
-			if (currLine[1].contains("\r")) {
-				currLine[1] = currLine[1].substring(0, currLine[1].length() - 1);
-			}
+		String line;
+		while((line = reader.readLine()) != null) {
+			// not accepting comma as we have students with a comma in their last name...
+			String[] currLine = line.split("[;\t]");
+
 			csvUserHelpersSet.add(new CsvUserHelper(currLine[0],
 					DefaultRole.valueOfExt(currLine[1])));
 		}

src/main/java/nl/tudelft/ewi/queue/service/CourseService.java

@@ -95,6 +95,9 @@ public class CourseService {
 
 	public void addCourseStaff(MultipartFile csv, Course course) throws IOException {
 		ArrayList<CsvUserHelper> users = CsvUserHelper.readCsv(csv);
+		if (null == users)
+			return;
+
 		for (CsvUserHelper csvUser : users) {
 			User staff = findUser(csvUser.getNetId());
 			Optional<Role> oldRole = staff.getRole(course);