Flesh out DMaaP simulator

[policy/models.git] / models-sim / models-sim-dmaap / src / main / java / org / onap / policy / models / sim / dmaap / startstop / DmaapSimActivator.java

diff --git a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/startstop/DmaapSimActivator.java b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/startstop/DmaapSimActivator.java
index 899c0e0..b9e0efa 100644 (file)
--- a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/startstop/DmaapSimActivator.java
+++ b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/startstop/DmaapSimActivator.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2019 Nordix Foundation.
+ *  Modifications Copyright (C) 2019 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.
@@ -20,19 +21,15 @@
 
 package org.onap.policy.models.sim.dmaap.startstop;
 
-import org.onap.policy.common.parameters.ParameterService;
 import org.onap.policy.common.utils.services.ServiceManagerContainer;
 import org.onap.policy.models.sim.dmaap.parameters.DmaapSimParameterGroup;
+import org.onap.policy.models.sim.dmaap.provider.DmaapSimProvider;
 import org.onap.policy.models.sim.dmaap.rest.DmaapSimRestServer;
 
 /**
  * This class activates the DMaaP simulator as a complete service.
  */
 public class DmaapSimActivator extends ServiceManagerContainer {
-    /**
-     * The DMaaP simulator REST API server.
-     */
-    private DmaapSimRestServer restServer;
 
     /**
      * Instantiate the activator for the DMaaP simulator as a complete service.
@@ -42,19 +39,11 @@ public class DmaapSimActivator extends ServiceManagerContainer {
     public DmaapSimActivator(final DmaapSimParameterGroup dmaapSimParameterGroup) {
         super("DMaaP Simulator");
 
-        // @formatter:off
-        addAction("DMaaP Simulator parameters",
-            () -> ParameterService.register(dmaapSimParameterGroup),
-            () -> ParameterService.deregister(dmaapSimParameterGroup.getName()));
-
-        addAction("Create REST server",
-            () -> restServer = new DmaapSimRestServer(dmaapSimParameterGroup.getRestServerParameters()),
-            () -> restServer = null
-        );
+        DmaapSimProvider provider = new DmaapSimProvider(dmaapSimParameterGroup);
+        DmaapSimProvider.setInstance(provider);
+        addAction("Sim Provider", provider::start, provider::stop);
 
-        addAction("REST server",
-            () -> restServer.start(),
-            () -> restServer.stop());
-        // @formatter:on
+        DmaapSimRestServer restServer = new DmaapSimRestServer(dmaapSimParameterGroup.getRestServerParameters());
+        addAction("REST server", restServer::start, restServer::stop);
     }
 }