From 3708244571ca093459f4680af00b5f3eacb29b55 Mon Sep 17 00:00:00 2001
From: "Michael N. Lipp" <mnl@mnl.de>
Date: Sat, 26 Oct 2024 21:16:50 +0200
Subject: [PATCH] Fix warnings.

---
 .../test/org/jdrupes/vmoperator/manager/BasicTests.java   | 4 ----
 .../org/jdrupes/vmoperator/runner/qemu/QemuMonitor.java   | 8 +++++++-
 .../src/org/jdrupes/vmoperator/runner/qemu/Runner.java    | 5 +++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/org.jdrupes.vmoperator.manager/test/org/jdrupes/vmoperator/manager/BasicTests.java b/org.jdrupes.vmoperator.manager/test/org/jdrupes/vmoperator/manager/BasicTests.java
index bd5fb54..bd479d0 100644
--- a/org.jdrupes.vmoperator.manager/test/org/jdrupes/vmoperator/manager/BasicTests.java
+++ b/org.jdrupes.vmoperator.manager/test/org/jdrupes/vmoperator/manager/BasicTests.java
@@ -3,22 +3,18 @@ package org.jdrupes.vmoperator.manager;
 import io.kubernetes.client.Discovery.APIResource;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.util.generic.options.ListOptions;
-
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.Map;
-
 import static org.jdrupes.vmoperator.common.Constants.APP_NAME;
 import static org.jdrupes.vmoperator.common.Constants.VM_OP_GROUP;
 import static org.jdrupes.vmoperator.common.Constants.VM_OP_KIND_VM;
 import static org.jdrupes.vmoperator.common.Constants.VM_OP_NAME;
-
 import org.jdrupes.vmoperator.common.K8s;
 import org.jdrupes.vmoperator.common.K8sClient;
 import org.jdrupes.vmoperator.common.K8sDynamicStub;
 import org.jdrupes.vmoperator.common.K8sV1ConfigMapStub;
 import org.jdrupes.vmoperator.common.K8sV1DeploymentStub;
-import org.jdrupes.vmoperator.common.K8sV1PodStub;
 import org.jdrupes.vmoperator.common.K8sV1PvcStub;
 import org.junit.jupiter.api.AfterAll;
 import static org.junit.jupiter.api.Assertions.*;
diff --git a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/QemuMonitor.java b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/QemuMonitor.java
index f59375c..7cac734 100644
--- a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/QemuMonitor.java
+++ b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/QemuMonitor.java
@@ -238,6 +238,8 @@ public class QemuMonitor extends Component {
      * @param event the event
      */
     @Handler
+    @SuppressWarnings({ "PMD.AvoidSynchronizedStatement",
+        "PMD.AvoidDuplicateLiterals" })
     public void onClosed(Closed<?> event, SocketIOChannel channel) {
         channel.associated(QemuMonitor.class).ifPresent(qm -> {
             monitorChannel = null;
@@ -259,7 +261,8 @@ public class QemuMonitor extends Component {
      * @param event the event
      */
     @Handler
-    @SuppressWarnings("PMD.AvoidLiteralsInIfCondition")
+    @SuppressWarnings({ "PMD.AvoidLiteralsInIfCondition",
+        "PMD.AvoidSynchronizedStatement" })
     public void onExecQmpCommand(MonitorCommand event) {
         var command = event.command();
         logger.fine(() -> "monitor(out): " + command.toString());
@@ -290,6 +293,7 @@ public class QemuMonitor extends Component {
      * @param event the event
      */
     @Handler(priority = 100)
+    @SuppressWarnings("PMD.AvoidSynchronizedStatement")
     public void onStop(Stop event) {
         if (monitorChannel != null) {
             // We have a connection to Qemu, attempt ACPI shutdown.
@@ -321,6 +325,7 @@ public class QemuMonitor extends Component {
      * @param event the event
      */
     @Handler
+    @SuppressWarnings("PMD.AvoidSynchronizedStatement")
     public void onPowerdownEvent(PowerdownEvent event) {
         synchronized (this) {
             // Cancel confirmation timeout
@@ -349,6 +354,7 @@ public class QemuMonitor extends Component {
      * @param event the event
      */
     @Handler
+    @SuppressWarnings("PMD.AvoidSynchronizedStatement")
     public void onConfigureQemu(ConfigureQemu event) {
         int newTimeout = event.configuration().vm.powerdownTimeout;
         if (powerdownTimeout != newTimeout) {
diff --git a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Runner.java b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Runner.java
index c837537..0b6e22e 100644
--- a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Runner.java
+++ b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Runner.java
@@ -41,8 +41,8 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.Instant;
 import java.util.Comparator;
+import java.util.EnumSet;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
 import java.util.logging.Level;
@@ -227,7 +227,7 @@ public class Runner extends Component {
         CloudInit
     }
 
-    private final Set<QemuPreps> qemuLatch = new HashSet<>();
+    private final Set<QemuPreps> qemuLatch = EnumSet.noneOf(QemuPreps.class);
 
     /**
      * Instantiates a new runner.
@@ -483,6 +483,7 @@ public class Runner extends Component {
         mayBeStartQemu(QemuPreps.Config);
     }
 
+    @SuppressWarnings("PMD.AvoidSynchronizedStatement")
     private void mayBeStartQemu(QemuPreps done) {
         synchronized (qemuLatch) {
             if (qemuLatch.isEmpty()) {