More actor clean-up

[policy/models.git] / models-interactions / model-actors / actor.so / src / main / java / org / onap / policy / controlloop / actor / so / SoActorServiceProvider.java

diff --git a/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SoActorServiceProvider.java b/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SoActorServiceProvider.java
index b853075..1dbad62 100644 (file)
--- a/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SoActorServiceProvider.java
+++ b/models-interactions/model-actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SoActorServiceProvider.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * SOActorServiceProvider
  * ================================================================================
- * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
  * Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -35,7 +35,7 @@ import org.onap.aai.domain.yang.Tenant;
 import org.onap.policy.aai.AaiCqResponse;
 import org.onap.policy.controlloop.ControlLoopOperation;
 import org.onap.policy.controlloop.VirtualControlLoopEvent;
-import org.onap.policy.controlloop.actorserviceprovider.spi.Actor;
+import org.onap.policy.controlloop.actorserviceprovider.impl.ActorImpl;
 import org.onap.policy.controlloop.policy.Policy;
 import org.onap.policy.so.SoCloudConfiguration;
 import org.onap.policy.so.SoManager;
@@ -51,15 +51,16 @@ import org.onap.policy.so.util.Serialization;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class SoActorServiceProvider implements Actor {
+public class SoActorServiceProvider extends ActorImpl {
     private static final Logger logger = LoggerFactory.getLogger(SoActorServiceProvider.class);
 
+    public static final String NAME = "SO";
+
+    // TODO old code: remove lines down to **HERE**
+
     private static final String TENANT_NOT_FOUND = "Tenant Item not found in AAI response {}";
     private static final String CONSTRUCTED_SO_MSG = "Constructed SO request: {}";
 
-    // Strings for SO Actor
-    private static final String SO_ACTOR = "SO";
-
     // Strings for targets
     private static final String TARGET_VFC = "VFC";
 
@@ -89,9 +90,22 @@ public class SoActorServiceProvider implements Actor {
     private static String lastServiceItemServiceInstanceId;
     private static String lastVfModuleItemVfModuleInstanceId;
 
+    // **HERE**
+
+    /**
+     * Constructs the object.
+     */
+    public SoActorServiceProvider() {
+        super(NAME);
+
+        addOperator(new SoOperator(NAME, VfModuleCreate.NAME, VfModuleCreate::new));
+    }
+
+    // TODO old code: remove lines down to **HERE**
+
     @Override
     public String actor() {
-        return SO_ACTOR;
+        return NAME;
     }
 
     @Override
@@ -233,7 +247,7 @@ public class SoActorServiceProvider implements Actor {
      */
     public SoRequest constructRequestCq(VirtualControlLoopEvent onset, ControlLoopOperation operation, Policy policy,
             AaiCqResponse aaiCqResponse) {
-        if (!SO_ACTOR.equals(policy.getActor()) || !recipes().contains(policy.getRecipe())) {
+        if (!NAME.equals(policy.getActor()) || !recipes().contains(policy.getRecipe())) {
             return null;
         }
 
@@ -440,4 +454,6 @@ public class SoActorServiceProvider implements Actor {
         return cloudConfiguration;
     }
 
+    // **HERE**
+
 }