From 4b3d5ae4a7ae81dc337c81abc282d1e2fa7213c5 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Fri, 11 Jan 2019 11:46:55 -0500 Subject: 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 --- .../src/main/resources/__closedLoopControlName__.drl | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'controlloop/templates/template.demo.clc/src') 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()); -- cgit 1.2.3-korg