From ca26a0e6524a297a9ceb764636fc422dbaf9b2bd Mon Sep 17 00:00:00 2001
From: Jonas Tobias Hopusch <git@jotoho.de>
Date: Sat, 12 Mar 2022 15:40:06 +0100
Subject: [PATCH] Some tweaks to the formatting settings

---
 .idea/codeStyles/Project.xml                  |  6 +-
 build.gradle.kts                              |  4 +-
 .../java/de/jotoho/waituntil/AppOptions.java  | 27 ++++-----
 .../java/de/jotoho/waituntil/GlobalConf.java  | 13 ++---
 src/main/java/de/jotoho/waituntil/Main.java   | 57 +++++++------------
 src/main/java/de/jotoho/waituntil/Sleep.java  | 20 +++----
 .../de/jotoho/waituntil/TimeCalculator.java   | 25 ++++----
 7 files changed, 59 insertions(+), 93 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 05caf41..aa6aa86 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,7 +1,7 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <option name="LINE_SEPARATOR" value="&#10;" />
-    <option name="RIGHT_MARGIN" value="80" />
+    <option name="RIGHT_MARGIN" value="100" />
     <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />
     <option name="ENABLE_SECOND_REFORMAT" value="true" />
     <option name="SOFT_MARGINS" value="80" />
@@ -40,7 +40,6 @@
       <option name="EXTENDS_KEYWORD_WRAP" value="1" />
       <option name="THROWS_KEYWORD_WRAP" value="1" />
       <option name="METHOD_CALL_CHAIN_WRAP" value="2" />
-      <option name="WRAP_FIRST_METHOD_IN_CALL_CHAIN" value="true" />
       <option name="BINARY_OPERATION_WRAP" value="1" />
       <option name="TERNARY_OPERATION_WRAP" value="5" />
       <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
@@ -52,12 +51,13 @@
       <option name="ARRAY_INITIALIZER_WRAP" value="5" />
       <option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
       <option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
-      <option name="ASSIGNMENT_WRAP" value="5" />
+      <option name="ASSIGNMENT_WRAP" value="1" />
       <option name="ASSERT_STATEMENT_WRAP" value="1" />
       <option name="WRAP_LONG_LINES" value="true" />
       <option name="PARAMETER_ANNOTATION_WRAP" value="5" />
       <option name="VARIABLE_ANNOTATION_WRAP" value="5" />
       <option name="ENUM_CONSTANTS_WRAP" value="5" />
+      <option name="KEEP_BUILDER_METHODS_INDENTS" value="true" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
diff --git a/build.gradle.kts b/build.gradle.kts
index 956e774..5d054a1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,9 +15,7 @@ repositories {
 }
 
 dependencies {
-    implementation(group = "commons-cli",
-                   name = "commons-cli",
-                   version = "1.5.0")
+    implementation(group = "commons-cli", name = "commons-cli", version = "1.5.0")
 }
 
 fun versionBanner(): String {
diff --git a/src/main/java/de/jotoho/waituntil/AppOptions.java b/src/main/java/de/jotoho/waituntil/AppOptions.java
index 86fce7f..4bf7fde 100644
--- a/src/main/java/de/jotoho/waituntil/AppOptions.java
+++ b/src/main/java/de/jotoho/waituntil/AppOptions.java
@@ -22,21 +22,18 @@ import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 
 final class AppOptions {
-    public final Option help = Option
-        .builder()
-        .argName("h")
-        .longOpt("help")
-        .desc("Shows this help " + "message and exits")
-        .build();
+    public final Option help = Option.builder()
+                                     .argName("h")
+                                     .longOpt("help")
+                                     .desc("Shows this help message and exits")
+                                     .build();
 
-    public final Option version = Option
-        .builder()
-        .argName("v")
-        .longOpt("version")
-        .desc("Shows version information and exits")
-        .build();
+    public final Option version = Option.builder()
+                                        .argName("v")
+                                        .longOpt("version")
+                                        .desc("Shows version information and exits")
+                                        .build();
 
-    public final Options options = new Options()
-        .addOption(help)
-        .addOption(version);
+    public final Options options = new Options().addOption(help)
+                                                .addOption(version);
 }
diff --git a/src/main/java/de/jotoho/waituntil/GlobalConf.java b/src/main/java/de/jotoho/waituntil/GlobalConf.java
index 5d2046a..c416365 100644
--- a/src/main/java/de/jotoho/waituntil/GlobalConf.java
+++ b/src/main/java/de/jotoho/waituntil/GlobalConf.java
@@ -22,12 +22,9 @@ import java.util.Locale;
 
 public record GlobalConf() {
     public static final String langGerman = "de";
-    public static final String applicationOutputLanguage = (Locale
-        .getDefault()
-        .getLanguage()
-        .equals(Locale.GERMAN.getLanguage()))
-                                                           ?
-                                                           Locale.GERMAN.getLanguage()
-                                                           :
-                                                           Locale.ENGLISH.getLanguage();
+    public static final String applicationOutputLanguage = (Locale.getDefault()
+                                                                  .getLanguage()
+                                                                  .equals(Locale.GERMAN.getLanguage()))
+                                                           ? Locale.GERMAN.getLanguage()
+                                                           : Locale.ENGLISH.getLanguage();
 }
diff --git a/src/main/java/de/jotoho/waituntil/Main.java b/src/main/java/de/jotoho/waituntil/Main.java
index 857a5de..e1c3b3a 100644
--- a/src/main/java/de/jotoho/waituntil/Main.java
+++ b/src/main/java/de/jotoho/waituntil/Main.java
@@ -36,11 +36,9 @@ public final class Main {
 
     private static void printVersionInformation() {
         final var thisPackage = Main.class.getPackage();
-        final var
-            appVersion =
-            thisPackage.getImplementationVersion() != null
-            ? thisPackage.getImplementationVersion()
-            : "version unknown";
+        final var appVersion = thisPackage.getImplementationVersion() != null
+                               ? thisPackage.getImplementationVersion()
+                               : "version unknown";
 
         System.out.println("waituntil " + appVersion);
         System.out.println("""
@@ -58,23 +56,18 @@ public final class Main {
     private static void printHelpInformation() {
         switch (applicationOutputLanguage) {
             case GlobalConf.langGerman -> logger.log(Level.ERROR,
-                                                     "Hilfe " +
-                                                     "kommt noch. (Nicht " +
+                                                     "Hilfe kommt noch. (Nicht " +
                                                      "implementiert)");
-            default -> logger.log(Level.ERROR,
-                                  "Help is yet to come. (Not " +
-                                  "implemented)");
+            default -> logger.log(Level.ERROR, "Help is yet to come. (Not implemented)");
         }
     }
 
-    private static CommandLine parseArgs(final Options options,
-                                         final String[] args)
+    private static CommandLine parseArgs(final Options options, final String[] args)
         throws ParseException {
-        return DefaultParser
-            .builder()
-            .setStripLeadingAndTrailingQuotes(true)
-            .build()
-            .parse(options, args);
+        return DefaultParser.builder()
+                            .setStripLeadingAndTrailingQuotes(true)
+                            .build()
+                            .parse(options, args);
     }
 
     public synchronized static void main(final String[] args) {
@@ -94,38 +87,28 @@ public final class Main {
             } else if (userData.length == 0) {
                 switch (applicationOutputLanguage) {
                     case GlobalConf.langGerman -> logger.log(Level.ERROR,
-                                                             "Es" +
-                                                             " wurde keine " +
-                                                             "Uhrzeit " +
+                                                             "Es wurde keine Uhrzeit " +
                                                              "angegeben.");
-                    default -> logger.log(Level.ERROR,
-                                          "No target time was " + "provided.");
+                    default -> logger.log(Level.ERROR, "No target time was provided.");
                 }
                 System.exit(1);
             } else if (userData.length > 1) {
                 switch (applicationOutputLanguage) {
                     case GlobalConf.langGerman -> logger.log(Level.ERROR,
-                                                             "Zu" + " viele " +
-                                                             "Argumente " +
-                                                             "wurden " +
-                                                             "angegeben.");
-                    default -> logger.log(Level.ERROR,
-                                          "Too many arguments " + "provided.");
+                                                             "Zu viele Argumente " +
+                                                             "wurden angegeben.");
+                    default -> logger.log(Level.ERROR, "Too many arguments provided.");
                 }
                 System.exit(1);
             } else {
-                final var
-                    target =
-                    TimeCalculator.calculateAndAnnounceTargetTime(userData[0]);
+                final var target = TimeCalculator.calculateAndAnnounceTargetTime(userData[0]);
                 Sleep.waitUntilTimeStamp(target);
             }
         } catch (final ParseException e) {
-            System
-                .getLogger("main")
-                .log(Level.ERROR,
-                     "Parsing of arguments " +
-                     "failed and the program cannot " + "continue.",
-                     e);
+            System.getLogger("main")
+                  .log(Level.ERROR,
+                       "Parsing of arguments failed and the program cannot continue.",
+                       e);
             System.exit(1);
         }
     }
diff --git a/src/main/java/de/jotoho/waituntil/Sleep.java b/src/main/java/de/jotoho/waituntil/Sleep.java
index 1e532aa..55cf80d 100644
--- a/src/main/java/de/jotoho/waituntil/Sleep.java
+++ b/src/main/java/de/jotoho/waituntil/Sleep.java
@@ -31,18 +31,15 @@ public final class Sleep {
     public static void waitUntilTimeStamp(ZonedDateTime timestamp) {
         try {
             Thread.sleep(Math.max(0,
-                                  Instant
-                                      .now()
-                                      .until(timestamp, ChronoUnit.MILLIS)));
+                                  Instant.now()
+                                         .until(timestamp, ChronoUnit.MILLIS)));
         } catch (final InterruptedException ignored) {
         }
 
-        final String formattedTimeStamp = DateTimeFormatter
-            .ofLocalizedDateTime(FormatStyle.LONG)
-            .withZone(TimeZone
-                          .getDefault()
-                          .toZoneId())
-            .format(Instant.now());
+        final String formattedTimeStamp = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG)
+                                                           .withZone(TimeZone.getDefault()
+                                                                             .toZoneId())
+                                                           .format(Instant.now());
 
         final String msg = switch (GlobalConf.applicationOutputLanguage) {
             case GlobalConf.langGerman -> "Erfolgreich bis %s gewartet!";
@@ -50,8 +47,7 @@ public final class Sleep {
         };
 
         final String msgWithData = msg.formatted(formattedTimeStamp);
-        System
-            .getLogger("sleep")
-            .log(Level.INFO, msgWithData);
+        System.getLogger("sleep")
+              .log(Level.INFO, msgWithData);
     }
 }
diff --git a/src/main/java/de/jotoho/waituntil/TimeCalculator.java b/src/main/java/de/jotoho/waituntil/TimeCalculator.java
index 0b74e2a..c3b2903 100644
--- a/src/main/java/de/jotoho/waituntil/TimeCalculator.java
+++ b/src/main/java/de/jotoho/waituntil/TimeCalculator.java
@@ -34,29 +34,24 @@ public final class TimeCalculator {
         final var userTimeInputRelative = LocalTime.parse(userTimeInputRaw);
         final var userTimeInputAbsolute = ZonedDateTime.of(LocalDate.now(),
                                                            userTimeInputRelative,
-                                                           TimeZone
-                                                               .getDefault()
-                                                               .toZoneId());
+                                                           TimeZone.getDefault()
+                                                                   .toZoneId());
 
-        final var userTimeInputFinal = (Instant
-            .now()
-            .isBefore(userTimeInputAbsolute.toInstant()))
+        final var userTimeInputFinal = (Instant.now()
+                                               .isBefore(userTimeInputAbsolute.toInstant()))
                                        ? userTimeInputAbsolute
                                        : userTimeInputAbsolute.plusDays(1);
 
-        final var formattedTimeStamp = userTimeInputFinal.format(
-            DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG));
+        final var formattedTimeStamp =
+            userTimeInputFinal.format(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG));
 
         final String msg = switch (GlobalConf.applicationOutputLanguage) {
-            case GlobalConf.langGerman -> ("Dieses Program wird bis zum %s " +
-                                           "warten.").formatted(
-                formattedTimeStamp);
-            default -> "WaitUntil will suspend until %s".formatted(
+            case GlobalConf.langGerman -> ("Dieses Program wird bis zum %s warten.").formatted(
                 formattedTimeStamp);
+            default -> "WaitUntil will suspend until %s".formatted(formattedTimeStamp);
         };
-        System
-            .getLogger("timecalculator")
-            .log(Level.INFO, msg);
+        System.getLogger("timecalculator")
+              .log(Level.INFO, msg);
 
         return userTimeInputFinal;
     }