HW0 and Optional

Author: bazhukovsi

src/main/java/ru/javawebinar/topjava/util/UserMealsUtil.java

@@ -29,30 +29,31 @@ public static void main(String[] args) {
     }
 
     public static List<UserMealWithExcess> filteredByCycles(List<UserMeal> meals, LocalTime startTime, LocalTime endTime, int caloriesPerDay) {
-        Map<LocalDate, Integer> caloriesSumPerDate = new HashMap<>();
+        Map<LocalDate, Integer> caloriesSumPerDates = new HashMap<>();
         for (UserMeal meal : meals) {
-            caloriesSumPerDate.merge(meal.getDateTime().toLocalDate(), meal.getCalories(), Integer::sum);
+            caloriesSumPerDates.merge(meal.getDateTime().toLocalDate(), meal.getCalories(), Integer::sum);
         }
-        List<UserMealWithExcess> userMealWithExcesses = new ArrayList<>();
+        List<UserMealWithExcess> userMealsWithExcesses = new ArrayList<>();
         for (UserMeal meal : meals) {
-            LocalDateTime dateTime = meal.getDateTime();
-            if (TimeUtil.isBetweenHalfOpen(dateTime.toLocalTime(), startTime, endTime)) {
-                userMealWithExcesses.add(createUserWithExcess(meal,
-                        caloriesSumPerDate.get(meal.getDateTime().toLocalDate()) > caloriesPerDay));
+            LocalDateTime dateTimeMeal = meal.getDateTime();
+            if (TimeUtil.isBetweenHalfOpen(dateTimeMeal.toLocalTime(), startTime, endTime)) {
+                userMealsWithExcesses.add(createUserWithExcess(meal,
+                        caloriesSumPerDates.get(meal.getDateTime().toLocalDate()) > caloriesPerDay));
             }
         }
-        return userMealWithExcesses;
+        return userMealsWithExcesses;
     }
 
     public static List<UserMealWithExcess> filteredByStreams(List<UserMeal> meals, LocalTime startTime, LocalTime endTime, int caloriesPerDay) {
-        Map<LocalDate, Integer> caloriesSumPerDate = meals.stream().collect(Collectors.groupingBy(meal -> meal.getDateTime().toLocalDate(),
-                Collectors.summingInt(UserMeal::getCalories)));
-        return meals.stream().filter(meal -> TimeUtil.isBetweenHalfOpen(meal.getDateTime().toLocalTime(), startTime, endTime))
-                .map(meal -> createUserWithExcess(meal, caloriesSumPerDate.get(meal.getDateTime().toLocalDate()) > caloriesPerDay))
+        Map<LocalDate, Integer> caloriesSumPerDates = meals.stream()
+                .collect(Collectors.groupingBy(meal -> meal.getDateTime().toLocalDate(),Collectors.summingInt(UserMeal::getCalories)));
+        return meals.stream()
+                .filter(meal -> TimeUtil.isBetweenHalfOpen(meal.getDateTime().toLocalTime(), startTime, endTime))
+                .map(meal -> createUserWithExcess(meal, caloriesSumPerDates.get(meal.getDateTime().toLocalDate()) > caloriesPerDay))
                 .collect(Collectors.toList());
     }
 
-    public static UserMealWithExcess createUserWithExcess(UserMeal meal, boolean excess) {
+    private static UserMealWithExcess createUserWithExcess(UserMeal meal, boolean excess) {
         return new UserMealWithExcess(meal.getDateTime(), meal.getDescription(), meal.getCalories(), excess);
     }
 }