add IDE and sonarlint suggestions

uyuni-project · Oct 25, 2023 · f4dbac8 · f4dbac8
1 parent 0f9654c
commit f4dbac8
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/java/code/src/com/suse/manager/webui/services/impl/SaltService.java b/java/code/src/com/suse/manager/webui/services/impl/SaltService.java
@@ -585,8 +585,8 @@ public void eventStreamClosed(int code, String phrase) {
             }
             catch (SaltException e) {
                 try {
-                    LOG.error("Unable to connect: {}, retrying in " + DELAY_TIME_SECONDS + " seconds.", e);
-                    Thread.sleep(1000 * DELAY_TIME_SECONDS);
+                    LOG.error("Unable to connect: {}, retrying in {} seconds.", e, DELAY_TIME_SECONDS);
+                    Thread.sleep(1000L * DELAY_TIME_SECONDS);
                     if (retries == 1) {
                         MailHelper.withSmtp().sendAdminEmail("Cannot connect to salt event bus",
                                 "salt-api daemon is not responding. Check the status of " +
@@ -599,6 +599,7 @@ public void eventStreamClosed(int code, String phrase) {
                 }
                 catch (InterruptedException e1) {
                     LOG.error("Interrupted during sleep", e1);
+                    Thread.currentThread().interrupt();
                 }
             }
         }
@@ -1091,7 +1092,7 @@ public void updateSystemInfo(MinionList minionTarget) {
     public Optional<SystemInfo> getSystemInfoFull(String minionId) {
         return rawJsonCall(State.apply(Collections.singletonList(ApplyStatesEventMessage.SYSTEM_INFO_FULL),
                Optional.empty()), minionId)
-               .flatMap(result -> result.result())
+               .flatMap(Result::result)
                .map(result -> Json.GSON.fromJson(result, SystemInfo.class));
     }