|
|
@@ -1,34 +1,34 @@
|
|
1
|
1
|
import java.util.*;
|
|
2
|
2
|
|
|
3
|
|
-public class School {
|
|
|
3
|
+class School {
|
|
4
|
4
|
|
|
5
|
5
|
private final Map<Integer, List<String>> database = new HashMap<>();
|
|
6
|
6
|
|
|
7
|
|
- public int numberOfStudents() {
|
|
|
7
|
+ int numberOfStudents() {
|
|
8
|
8
|
int result = 0;
|
|
9
|
|
- for (List<String> studentsInGrade: database.values()) {
|
|
|
9
|
+ for (List<String> studentsInGrade : database.values()) {
|
|
10
|
10
|
result += studentsInGrade.size();
|
|
11
|
11
|
}
|
|
12
|
12
|
return result;
|
|
13
|
13
|
}
|
|
14
|
14
|
|
|
15
|
|
- public void add(String student, int grade) {
|
|
|
15
|
+ void add(String student, int grade) {
|
|
16
|
16
|
List<String> students = fetchGradeFromDatabase(grade);
|
|
17
|
17
|
students.add(student);
|
|
18
|
18
|
}
|
|
19
|
19
|
|
|
20
|
|
- public List<String> grade(int grade) {
|
|
|
20
|
+ List<String> grade(int grade) {
|
|
21
|
21
|
return new ArrayList<>(fetchGradeFromDatabase(grade));
|
|
22
|
22
|
}
|
|
23
|
23
|
|
|
24
|
|
- private List<String> fetchGradeFromDatabase(int grade) {
|
|
|
24
|
+ List<String> fetchGradeFromDatabase(int grade) {
|
|
25
|
25
|
if (!database.containsKey(grade)) {
|
|
26
|
26
|
database.put(grade, new LinkedList<>());
|
|
27
|
27
|
}
|
|
28
|
28
|
return database.get(grade);
|
|
29
|
29
|
}
|
|
30
|
30
|
|
|
31
|
|
- public Map<Integer, List<String>> studentsByGradeAlphabetical() {
|
|
|
31
|
+ Map<Integer, List<String>> studentsByGradeAlphabetical() {
|
|
32
|
32
|
Map<Integer, List<String>> sortedStudents = new HashMap<>();
|
|
33
|
33
|
for (Integer grade : database.keySet()) {
|
|
34
|
34
|
List<String> studentsInGrade = database.get(grade);
|