[java] [student_grades] Replace Control Flag With Break Refactoring (refactor)

Author: JavierCane

examples/java/java-student_grades-04_replace_control_flag/src/main/java/tv/codely/student_grades/StudentGradeCalculator.java

@@ -30,26 +30,27 @@ public StudentGradeCalculator(final int yearToCalculate) {
     }
 
     public float calculateGrades(final List<Pair<Integer, Float>> examsGrades, final boolean hasReachedMinimumClasses) {
-        if (examsGrades.isEmpty()) {
+        boolean hasNotDoneAnyExam = examsGrades.isEmpty();
+        if (hasNotDoneAnyExam) {
             return 0f;
         }
 
         if (!hasReachedMinimumClasses) {
             return 0f;
         }
 
-        ensureGradesWeightSumIs100percent(examsGrades);
-
-        float gradesSum = gradesSum(examsGrades);
+        ensureGradesWeightsIsValid(examsGrades);
 
         if (hasToIncreaseOneExtraPoint()) {
-            return Float.min(10f, gradesSum + 1);
+            float increasedGrade = gradesSum(examsGrades) + 1;
+
+            return Float.min(10f, increasedGrade);
         }
 
-        return gradesSum;
+        return gradesSum(examsGrades);
     }
 
-    private void ensureGradesWeightSumIs100percent(List<Pair<Integer, Float>> examsGrades) {
+    private void ensureGradesWeightsIsValid(List<Pair<Integer, Float>> examsGrades) {
         int gradesWeightSum = gradesWeightSum(examsGrades);
 
         if (gradesWeightSum > 100) {
@@ -72,22 +73,21 @@ private int gradesWeightSum(List<Pair<Integer, Float>> examsGrades) {
     }
 
     private boolean hasToIncreaseOneExtraPoint() {
-        boolean hasToIncreaseOneExtraPoint = false;
-
         for (Map.Entry<Integer, List<Pair<String, Boolean>>> yearlyTeachers : allYearsTeachers.entrySet()) {
-            if (!(yearToCalculate != yearlyTeachers.getKey())) {
-                List<Pair<String, Boolean>> teachers = yearlyTeachers.getValue();
-
-                for (Pair<String, Boolean> teacher : teachers) {
-                    if (teacher.second() != true) {
-                        continue;
-                    }
-                    hasToIncreaseOneExtraPoint = true;
-                }
-            } else {
+            if (yearToCalculate != yearlyTeachers.getKey()) {
                 continue;
             }
+
+            List<Pair<String, Boolean>> teachers = yearlyTeachers.getValue();
+
+            for (Pair<String, Boolean> teacher : teachers) {
+                Boolean isBenevolent = teacher.second();
+                if (isBenevolent) {
+                    return true;
+                }
+            }
         }
-        return hasToIncreaseOneExtraPoint;
+
+        return false;
     }
 }