Use enhanced switch

1 files changed, 7 insertions, 15 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
index aad67d19f3f..1507e13bf95 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
@@ -485,17 +485,13 @@ public class NodeAgentImpl implements NodeAgent {
         }
 
         switch (node.state()) {
-            case ready:
-            case reserved:
-            case failed:
-            case inactive:
-            case parked:
+            case ready, reserved, failed, inactive, parked -> {
                 storageMaintainer.syncLogs(context, true);
                 removeContainerIfNeededUpdateContainerState(context, container);
                 updateNodeRepoWithCurrentAttributes(context, Optional.empty());
                 stopServicesIfNeeded(context);
-                break;
-            case active:
+            }
+            case active -> {
                 storageMaintainer.syncLogs(context, true);
                 storageMaintainer.cleanDiskIfFull(context);
                 storageMaintainer.handleCoreDumpsForContainer(context, container, false);
@@ -548,11 +544,9 @@ public class NodeAgentImpl implements NodeAgent {
                     orchestrator.resume(context.hostname().value());
                     suspendedInOrchestrator = false;
                 }
-                break;
-            case provisioned:
-                nodeRepository.setNodeState(context.hostname().value(), NodeState.ready);
-                break;
-            case dirty:
+            }
+            case provisioned -> nodeRepository.setNodeState(context.hostname().value(), NodeState.ready);
+            case dirty -> {
                 removeContainerIfNeededUpdateContainerState(context, container);
                 context.log(logger, "State is " + node.state() + ", will delete application storage and mark node as ready");
                 credentialsMaintainers.forEach(maintainer -> maintainer.clearCredentials(context));
@@ -560,9 +554,7 @@ public class NodeAgentImpl implements NodeAgent {
                 storageMaintainer.archiveNodeStorage(context);
                 updateNodeRepoWithCurrentAttributes(context, Optional.empty());
                 nodeRepository.setNodeState(context.hostname().value(), NodeState.ready);
-                break;
-            default:
-                throw ConvergenceException.ofError("UNKNOWN STATE " + node.state().name());
+            }
         }
     }