1 files changed, 22 insertions, 21 deletions

diff --git a/utils/src/main/java/org/onap/policy/common/utils/services/ServiceManager.java b/utils/src/main/java/org/onap/policy/common/utils/services/ServiceManager.java
index 5c8c01df..08994912 100644
--- a/utils/src/main/java/org/onap/policy/common/utils/services/ServiceManager.java
+++ b/utils/src/main/java/org/onap/policy/common/utils/services/ServiceManager.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP PAP
  * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,9 @@ package org.onap.policy.common.utils.services;
 import java.util.Deque;
 import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.concurrent.atomic.AtomicBoolean;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
 import org.onap.policy.common.capabilities.Startable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -37,6 +40,7 @@ public class ServiceManager implements Startable {
     /**
      * Manager name.
      */
+    @Getter
     private final String name;
 
     /**
@@ -47,7 +51,7 @@ public class ServiceManager implements Startable {
     /**
      * {@code True} if the services are currently running, {@code false} otherwise.
      */
-    private boolean running;
+    private final AtomicBoolean running = new AtomicBoolean(false);
 
     /**
      * Constructs the object, with a default name.
@@ -58,16 +62,13 @@ public class ServiceManager implements Startable {
 
     /**
      * Constructs the object.
+     *
      * @param name the manager's name, used for logging purposes
      */
     public ServiceManager(String name) {
         this.name = name;
     }
 
-    public String getName() {
-        return name;
-    }
-
     /**
      * Adds a pair of service actions to the manager.
      *
@@ -77,7 +78,7 @@ public class ServiceManager implements Startable {
      * @return this manager
      */
     public synchronized ServiceManager addAction(String stepName, RunnableWithEx starter, RunnableWithEx stopper) {
-        if (running) {
+        if (isAlive()) {
             throw new IllegalStateException(name + " is already running; cannot add " + stepName);
         }
 
@@ -94,7 +95,7 @@ public class ServiceManager implements Startable {
      * @return this manager
      */
     public synchronized ServiceManager addService(String stepName, Startable service) {
-        if (running) {
+        if (isAlive()) {
             throw new IllegalStateException(name + " is already running; cannot add " + stepName);
         }
 
@@ -103,13 +104,13 @@ public class ServiceManager implements Startable {
     }
 
     @Override
-    public synchronized boolean isAlive() {
-        return running;
+    public boolean isAlive() {
+        return running.get();
     }
 
     @Override
     public synchronized boolean start() {
-        if (running) {
+        if (isAlive()) {
             throw new IllegalStateException(name + " is already running");
         }
 
@@ -134,7 +135,7 @@ public class ServiceManager implements Startable {
 
         if (ex == null) {
             logger.info("{} started", name);
-            running = true;
+            running.set(true);
             return true;
         }
 
@@ -151,11 +152,11 @@ public class ServiceManager implements Startable {
 
     @Override
     public synchronized boolean stop() {
-        if (!running) {
+        if (!isAlive()) {
             throw new IllegalStateException(name + " is not running");
         }
 
-        running = false;
+        running.set(false);
         rewind(items);
 
         return true;
@@ -203,20 +204,20 @@ public class ServiceManager implements Startable {
     /**
      * Service information.
      */
+    @AllArgsConstructor
     private static class Service {
         private String stepName;
         private RunnableWithEx starter;
         private RunnableWithEx stopper;
-
-        public Service(String stepName, RunnableWithEx starter, RunnableWithEx stopper) {
-            this.stepName = stepName;
-            this.starter = starter;
-            this.stopper = stopper;
-        }
     }
 
+    /*
+     * Cannot use a plain Runnable, because it can't throw exceptions. Could use a
+     * Callable, instead, but then all the lambda expressions become rather messy, thus
+     * we'll stick with RunnableWithEx, and just disable the sonar warning.
+     */
     @FunctionalInterface
     public static interface RunnableWithEx {
-        void run() throws Exception;
+        void run() throws Exception; // NOSONAR
     }
 }