Speed up tests on policy-api

[policy/api.git] / main / src / main / java / org / onap / policy / api / main / startstop / ApiActivator.java

diff --git a/main/src/main/java/org/onap/policy/api/main/startstop/ApiActivator.java b/main/src/main/java/org/onap/policy/api/main/startstop/ApiActivator.java
index 4cd9884..d50ff40 100644 (file)
--- a/main/src/main/java/org/onap/policy/api/main/startstop/ApiActivator.java
+++ b/main/src/main/java/org/onap/policy/api/main/startstop/ApiActivator.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP Policy API 
- * ================================================================================ 
+ * ONAP Policy API
+ * ================================================================================
  * Copyright (C) 2018 Samsung Electronics Co., Ltd. All rights reserved.
  * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
@@ -25,24 +25,27 @@ package org.onap.policy.api.main.startstop;
 
 import org.onap.policy.api.main.exception.PolicyApiException;
 import org.onap.policy.api.main.parameters.ApiParameterGroup;
-import org.onap.policy.api.main.rest.ApiRestServer;
+import org.onap.policy.api.main.rest.ApiRestController;
+import org.onap.policy.api.main.rest.LegacyApiRestController;
+import org.onap.policy.api.main.rest.aaf.AafApiFilter;
+import org.onap.policy.common.endpoints.http.server.RestServer;
 import org.onap.policy.common.parameters.ParameterService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * This class wraps a distributor so that it can be activated as a complete service together with all its api
- * and forwarding handlers.
+ * This class wraps a distributor so that it can be activated as a complete service together with all its api and
+ * forwarding handlers.
  */
 public class ApiActivator {
-    
+
     private static final Logger LOGGER = LoggerFactory.getLogger(ApiActivator.class);
 
     private final ApiParameterGroup apiParameterGroup;
 
     private static boolean alive = false;
 
-    private ApiRestServer restServer;
+    private RestServer restServer;
 
     /**
      * Instantiate the activator for policy api as a complete service.
@@ -73,10 +76,10 @@ public class ApiActivator {
      */
     private void startApiRestServer() throws PolicyApiException {
         apiParameterGroup.getRestServerParameters().setName(apiParameterGroup.getName());
-        restServer = new ApiRestServer(apiParameterGroup.getRestServerParameters());
+        restServer = new RestServer(apiParameterGroup.getRestServerParameters(), AafApiFilter.class,
+                LegacyApiRestController.class, ApiRestController.class);
         if (!restServer.start()) {
-            throw new PolicyApiException(
-                    "Failed to start api rest server. Check log for more details...");
+            throw new PolicyApiException("Failed to start api rest server. Check log for more details...");
         }
     }
 
@@ -88,10 +91,15 @@ public class ApiActivator {
     public void terminate() throws PolicyApiException {
         try {
             deregisterToParameterService(apiParameterGroup);
-            ApiActivator.setAlive(false);
+
+            if (ApiActivator.isAlive()) {
+                ApiActivator.setAlive(false);
+            }
 
             // Stop the api rest server
-            restServer.stop();
+            if (restServer.isAlive()) {
+                restServer.stop();
+            }
         } catch (final Exception exp) {
             throw new PolicyApiException("Policy api service termination failed", exp);
         }
@@ -112,7 +120,7 @@ public class ApiActivator {
      * @param apiParameterGroup the api parameter group
      */
     public void registerToParameterService(final ApiParameterGroup apiParameterGroup) {
-        ParameterService.register(apiParameterGroup);
+        ParameterService.register(apiParameterGroup, true);
     }
 
     /**
@@ -121,7 +129,9 @@ public class ApiActivator {
      * @param apiParameterGroup the api parameter group
      */
     public void deregisterToParameterService(final ApiParameterGroup apiParameterGroup) {
-        ParameterService.deregister(apiParameterGroup.getName());
+        if (ParameterService.contains(apiParameterGroup.getName())) {
+            ParameterService.deregister(apiParameterGroup.getName());
+        }
     }
 
     /**
@@ -141,4 +151,4 @@ public class ApiActivator {
     public static void setAlive(final boolean status) {
         alive = status;
     }
-}
+}
\ No newline at end of file