Remove model-impl/so checkstyle suppressions

Renamed classes from "SOxxx" to "SoXxx".  Also renamed a few method
names to make them camelcase, too.
Updated drl files with above changes.

Change-Id: I06aa303a20911733f870947c55e01f3a2dc66fa3
Issue-ID: POLICY-1143
Signed-off-by: Jim Hahn <jrh3@att.com>

4 files changed, 15 insertions, 45 deletions

diff --git a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
index 160b75c61..4172b2d37 100644
--- a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
+++ b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
@@ -48,18 +48,8 @@ import org.onap.policy.sdnr.PciResponse;
 import org.onap.policy.vfc.VfcRequest;
 import org.onap.policy.vfc.VfcResponse;
 import org.onap.policy.vfc.VfcManager;
-import org.onap.policy.so.SOManager;
-import org.onap.policy.so.SORequest;
-import org.onap.policy.so.SORequestStatus;
-import org.onap.policy.so.SORequestDetails;
-import org.onap.policy.so.SOModelInfo;
-import org.onap.policy.so.SOCloudConfiguration;
-import org.onap.policy.so.SORequestInfo;
-import org.onap.policy.so.SORequestParameters;
-import org.onap.policy.so.SORelatedInstanceListElement;
-import org.onap.policy.so.SORelatedInstance;
-import org.onap.policy.so.SOResponse;
-import org.onap.policy.so.SOResponseWrapper;
+import org.onap.policy.so.SoRequest;
+import org.onap.policy.so.SoResponseWrapper;
 import org.onap.policy.sdnc.SdncRequest;
 import org.onap.policy.sdnc.SdncManager;
 import org.onap.policy.sdnc.SdncResponse;
@@ -587,7 +577,7 @@ rule "${policyName}.EVENT.MANAGER.OPERATION.LOCKED.GUARD_PERMITTED"
                   // the response recieved and used
                   // in the construction of the SO Request which is stored in operationRequest
 
-                  if(request instanceof SORequest) {
+                  if(request instanceof SoRequest) {
                       // Call SO. The response will be inserted into memory once it's received 
                       SoActorServiceProvider.sendRequest($event.getRequestId().toString(), drools.getWorkingMemory(),
                           request);                        
@@ -1164,7 +1154,7 @@ rule "${policyName}.SO.RESPONSE"
         $opTimer : ControlLoopTimer( closedLoopControlName == $event.getClosedLoopControlName(), 
             requestID == $event.getRequestId().toString(), timerType == "Operation", !expired )
         $lock : TargetLock (requestID == $event.getRequestId())
-        $response : SOResponseWrapper(requestID.toString() == $event.getRequestId().toString() )
+        $response : SoResponseWrapper(requestId.toString() == $event.getRequestId().toString() )
     then
 
     Logger logger = LoggerFactory.getLogger(drools.getRule().getPackage());
diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
index d8e34313e..d1c8a0739 100644
--- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
+++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
@@ -49,18 +49,8 @@ import org.onap.policy.sdnr.PciResponse;
 import org.onap.policy.vfc.VfcRequest;
 import org.onap.policy.vfc.VfcResponse;
 import org.onap.policy.vfc.VfcManager;
-import org.onap.policy.so.SOManager;
-import org.onap.policy.so.SORequest;
-import org.onap.policy.so.SORequestStatus;
-import org.onap.policy.so.SORequestDetails;
-import org.onap.policy.so.SOModelInfo;
-import org.onap.policy.so.SOCloudConfiguration;
-import org.onap.policy.so.SORequestInfo;
-import org.onap.policy.so.SORequestParameters;
-import org.onap.policy.so.SORelatedInstanceListElement;
-import org.onap.policy.so.SORelatedInstance;
-import org.onap.policy.so.SOResponse;
-import org.onap.policy.so.SOResponseWrapper;
+import org.onap.policy.so.SoRequest;
+import org.onap.policy.so.SoResponseWrapper;
 import org.onap.policy.sdnc.SdncRequest;
 import org.onap.policy.sdnc.SdncManager;
 import org.onap.policy.sdnc.SdncResponse;
@@ -537,7 +527,7 @@ rule "EVENT.MANAGER.OPERATION.LOCKED.GUARD_PERMITTED"
                   // at this point the AAI named query request should have already been made, the response 
                   // recieved and used in the construction of the SO Request which is stored in operationRequest
 
-                  if(request instanceof SORequest) {
+                  if(request instanceof SoRequest) {
                       // Call SO. The response will be inserted into memory once it's received
                       SoActorServiceProvider.sendRequest($event.getRequestId().toString(), drools.getWorkingMemory(), request);
                   }
@@ -1005,7 +995,7 @@ rule "SO.RESPONSE"
         $opTimer : ControlLoopTimer( closedLoopControlName == $event.getClosedLoopControlName(), 
             requestID == $event.getRequestId().toString(), timerType == "Operation", !expired )
         $lock : TargetLock (requestID == $event.getRequestId())
-        $response : SOResponseWrapper(requestID.toString() == $event.getRequestId().toString() )
+        $response : SoResponseWrapper(requestId.toString() == $event.getRequestId().toString() )
     then
 
     Logger logger = LoggerFactory.getLogger(drools.getRule().getPackage());
diff --git a/controlloop/templates/template.demo.clc/src/main/resources/__closedLoopControlName__.drl b/controlloop/templates/template.demo.clc/src/main/resources/__closedLoopControlName__.drl
index feb5bf499..5a2d8ded3 100644
--- a/controlloop/templates/template.demo.clc/src/main/resources/__closedLoopControlName__.drl
+++ b/controlloop/templates/template.demo.clc/src/main/resources/__closedLoopControlName__.drl
@@ -45,18 +45,8 @@ import org.onap.policy.appclcm.LcmCommonHeader;
 import org.onap.policy.vfc.VfcRequest;
 import org.onap.policy.vfc.VfcResponse;
 import org.onap.policy.vfc.VfcManager;
-import org.onap.policy.so.SOManager;
-import org.onap.policy.so.SORequest;
-import org.onap.policy.so.SORequestStatus;
-import org.onap.policy.so.SORequestDetails;
-import org.onap.policy.so.SOModelInfo;
-import org.onap.policy.so.SOCloudConfiguration;
-import org.onap.policy.so.SORequestInfo;
-import org.onap.policy.so.SORequestParameters;
-import org.onap.policy.so.SORelatedInstanceListElement;
-import org.onap.policy.so.SORelatedInstance;
-import org.onap.policy.so.SOResponse;
-import org.onap.policy.so.SOResponseWrapper;
+import org.onap.policy.so.SoRequest;
+import org.onap.policy.so.SoResponseWrapper;
 import org.onap.policy.guard.PolicyGuard;
 import org.onap.policy.guard.PolicyGuard.LockResult;
 import org.onap.policy.guard.TargetLock;
@@ -592,7 +582,7 @@ rule "${policyName}.EVENT.MANAGER.OPERATION.LOCKED.GUARD_PERMITTED"
                   // at this point the AAI named query request should have already been made, the response received
                   // and used in the construction of the SO Request which is stored in operationRequest
                   
-                  if(request instanceof SORequest) {
+                  if(request instanceof SoRequest) {
                       // Call SO. The response will be inserted into memory once it's received 
                       SoActorServiceProvider.sendRequest($event.getRequestId().toString(), drools.getWorkingMemory(), 
                           request);                        
@@ -1019,7 +1009,7 @@ rule "${policyName}.SO.RESPONSE"
         $operation : ControlLoopOperationManager( onset.closedLoopControlName == $event.getClosedLoopControlName(), onset.getRequestId() == $event.getRequestId() )
         $opTimer : OperationTimer( closedLoopControlName == $event.getClosedLoopControlName(), requestID == $event.getRequestId().toString() )
         $lock : TargetLock (requestID == $event.getRequestId())
-        $response : SOResponseWrapper(requestID.toString() == $event.getRequestId().toString() )
+        $response : SoResponseWrapper(requestId.toString() == $event.getRequestId().toString() )
     then
                 
     Logger logger = LoggerFactory.getLogger(drools.getRule().getPackage());
diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VdnsControlLoopTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VdnsControlLoopTest.java
index 58f0840ac..6bdba1ef3 100644
--- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VdnsControlLoopTest.java
+++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VdnsControlLoopTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * demo
  * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-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.
@@ -55,7 +55,7 @@ import org.onap.policy.drools.protocol.coders.JsonProtocolFilter;
 import org.onap.policy.drools.system.PolicyController;
 import org.onap.policy.drools.system.PolicyEngine;
 import org.onap.policy.drools.utils.logging.LoggerUtil;
-import org.onap.policy.so.SORequest;
+import org.onap.policy.so.SoRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -374,7 +374,7 @@ public class VdnsControlLoopTest implements TopicListener {
                 logger.debug("The control loop timed out");
                 fail("Control Loop Timed Out");
             }
-        } else if (obj instanceof SORequest) {
+        } else if (obj instanceof SoRequest) {
             logger.debug("\n============ SO received the request!!! ===========\n");
         }
     }