Skip to content

Commit 424b965

Browse files
committed
[java] [student_grades] Decompose Conditional & Consolidate Conditional Expression Refactoring (little readability improvements)
1 parent 75e9b0a commit 424b965

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

examples/java/java-student_grades-05_simplify_conditionals/src/main/java/tv/codely/student_grades/StudentGradeCalculator.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ public StudentGradeCalculator(final int yearToCalculate) {
4343
}
4444

4545
public float calculateGrades(final List<Pair<Integer, Float>> examsGrades, final boolean hasReachedMinimumClasses) {
46-
boolean hasNotDoneAnyExam = examsGrades.isEmpty();
47-
if (hasNotDoneAnyExam) {
46+
boolean hasDoneAnyExam = !examsGrades.isEmpty();
47+
if (!hasDoneAnyExam) {
4848
return 0f;
4949
}
5050

@@ -82,7 +82,7 @@ private float gradesSum(List<Pair<Integer, Float>> examsGrades) {
8282
}
8383

8484
private int gradesWeightSum(List<Pair<Integer, Float>> examsGrades) {
85-
return examsGrades.stream().map(Pair::first).reduce(Integer::sum).get();
85+
return examsGrades.stream().map(Pair::first).reduce(Integer::sum).orElse(0);
8686
}
8787

8888
private boolean hasToIncreaseOneExtraPoint() {
@@ -95,7 +95,9 @@ private boolean hasToIncreaseOneExtraPoint() {
9595

9696
for (Pair<String, Boolean> teacher : teachers) {
9797
Boolean isBenevolent = teacher.second();
98-
if (isBenevolent && yearToCalculate % 2 == 0 || teacher.first().equals("Núria")) {
98+
boolean isEvenYear = yearToCalculate % 2 == 0;
99+
100+
if ((isBenevolent && isEvenYear) || teacher.first().equals("Núria")) {
99101
return true;
100102
}
101103
}

0 commit comments

Comments
 (0)