src/main/java/de/jotoho/waituntil/TimeCalculator.java

@@ -1,18 +1,8 @@
 package de.jotoho.waituntil;
 
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalTime;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.format.FormatStyle;
-import java.util.TimeZone;
-
-import static java.lang.System.Logger.Level;
-
 /*
     waituntil - a tool for delaying command execution until the specified time
-    Copyright (C) 2023 Jonas Tobias Hopusch
+    Copyright (C) 2022 Jonas Tobias Hopusch
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Affero General Public License as
@@ -28,51 +18,40 @@ import static java.lang.System.Logger.Level;
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-/**
+import java.time.Instant;
- * A utility class for calculating and announcing a target time based on user input.
+import java.time.LocalDate;
- */
+import java.time.LocalTime;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
+import java.util.TimeZone;
+
+import static java.lang.System.Logger.Level;
+
 public final class TimeCalculator {
 
-    private static final String LANG_GERMAN = GlobalConf.langGerman;
-
-    /**
-     * Calculates and announces the target time based on the user input.
-     *
-     * @param userTimeInputRaw the user input representing the desired time
-     * @return the calculated target time as a {@link ZonedDateTime} object
-     */
     public static ZonedDateTime calculateAndAnnounceTargetTime(final String userTimeInputRaw) {
-        // Parsing user input to obtain the desired time
         final var userTimeInputRelative = LocalTime.parse(userTimeInputRaw);
-        final var userTimeInputAbsolute = ZonedDateTime.of(
+        final var userTimeInputAbsolute = ZonedDateTime.of(LocalDate.now(),
-                LocalDate.now(),
                                                            userTimeInputRelative,
-                TimeZone.getDefault().toZoneId()
+                                                           TimeZone.getDefault()
-        );
+                                                                   .toZoneId());
 
-        // Adjusting the target time if it has already passed for the current day
+        final var userTimeInputFinal = (Instant.now()
-        final var userTimeInputFinal = (Instant.now().isBefore(userTimeInputAbsolute.toInstant()))
+                                               .isBefore(userTimeInputAbsolute.toInstant()))
                                        ? userTimeInputAbsolute
                                        : userTimeInputAbsolute.plusDays(1);
 
-        // Formatting the target time for display
+        final var formattedTimeStamp =
-        final var formattedTimeStamp = userTimeInputFinal.format(
+            userTimeInputFinal.format(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG));
-                DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG)
-        );
 
-        // Constructing the appropriate message based on the output language
+        final String msg = switch (GlobalConf.applicationOutputLanguage) {
-        final String formattedMessage;
+            case GlobalConf.langGerman -> ("Dieses Program wird bis zum %s warten.").formatted(
-        switch (GlobalConf.applicationOutputLanguage) {
+                formattedTimeStamp);
-            case LANG_GERMAN:
+            default -> "WaitUntil will suspend until %s".formatted(formattedTimeStamp);
-                formattedMessage = ("Dieses Program wird bis zum %s warten.").formatted(formattedTimeStamp);
+        };
-                break;
+        System.getLogger("timecalculator")
-            default:
+              .log(Level.INFO, msg);
-                formattedMessage = "WaitUntil will suspend until %s".formatted(formattedTimeStamp);
-                break;
-        }
-
-        // Logging the message
-        System.getLogger("timecalculator").log(Level.INFO, formattedMessage);
 
         return userTimeInputFinal;
     }