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 --- .../eventmanager/ControlLoopOperationManager.java | 8 ++++---- .../eventmanager/ControlLoopOperationManagerTest.java | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'controlloop/common/eventmanager') diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java index 36db9fe53..2ea1c48f4 100644 --- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java +++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java @@ -53,7 +53,7 @@ import org.onap.policy.drools.system.PolicyEngine; import org.onap.policy.guard.Util; import org.onap.policy.sdnc.SdncResponse; import org.onap.policy.sdnr.PciResponseWrapper; -import org.onap.policy.so.SOResponseWrapper; +import org.onap.policy.so.SoResponseWrapper; import org.onap.policy.vfc.VfcResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -346,11 +346,11 @@ public class ControlLoopOperationManager implements Serializable { // Cast SDNR response and handle it // return onResponse((PciResponseWrapper) response); - } else if (response instanceof SOResponseWrapper) { + } else if (response instanceof SoResponseWrapper) { // // Cast SO response and handle it // - return onResponse((SOResponseWrapper) response); + return onResponse((SoResponseWrapper) response); } else if (response instanceof VfcResponse) { // // Cast VFC response and handle it @@ -531,7 +531,7 @@ public class ControlLoopOperationManager implements Serializable { * @param msoResponse the SO response * @return The result of the response handling */ - private PolicyResult onResponse(SOResponseWrapper msoResponse) { + private PolicyResult onResponse(SoResponseWrapper msoResponse) { switch (msoResponse.getSoResponse().getHttpResponseCode()) { case 200: case 202: diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java index f761d69b7..0189e17bf 100644 --- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java +++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java @@ -71,8 +71,8 @@ import org.onap.policy.controlloop.policy.Target; import org.onap.policy.controlloop.policy.TargetType; import org.onap.policy.controlloop.processor.ControlLoopProcessor; import org.onap.policy.drools.system.PolicyEngine; -import org.onap.policy.so.SOResponse; -import org.onap.policy.so.SOResponseWrapper; +import org.onap.policy.so.SoResponse; +import org.onap.policy.so.SoResponseWrapper; import org.onap.policy.vfc.VfcResponse; import org.onap.policy.vfc.VfcResponseDescriptor; import org.slf4j.Logger; @@ -741,8 +741,8 @@ public class ControlLoopOperationManagerTest { lcmCh.setSubRequestId("12345"); assertEquals(PolicyResult.FAILURE_EXCEPTION, clom.onResponse(lrw)); - SOResponse soResponse = new SOResponse(); - SOResponseWrapper soRw = new SOResponseWrapper(soResponse, null); + SoResponse soResponse = new SoResponse(); + SoResponseWrapper soRw = new SoResponseWrapper(soResponse, null); soResponse.setHttpResponseCode(200); assertEquals(PolicyResult.SUCCESS, clom.onResponse(soRw)); @@ -791,8 +791,8 @@ public class ControlLoopOperationManagerTest { clom.startOperation(onsetEvent); - SOResponse soResponse = new SOResponse(); - final SOResponseWrapper soRw = new SOResponseWrapper(soResponse, null); + SoResponse soResponse = new SoResponse(); + final SoResponseWrapper soRw = new SoResponseWrapper(soResponse, null); PolicyEngine.manager.setEnvironmentProperty("guard.disabled", "false"); PolicyEngine.manager.setEnvironmentProperty(org.onap.policy.guard.Util.ONAP_KEY_URL, @@ -881,8 +881,8 @@ public class ControlLoopOperationManagerTest { assertNotNull(clom); assertTrue(clom.isOperationRunning()); - SOResponse soResponse = new SOResponse(); - final SOResponseWrapper soRw = new SOResponseWrapper(soResponse, null); + SoResponse soResponse = new SoResponse(); + final SoResponseWrapper soRw = new SoResponseWrapper(soResponse, null); PolicyEngine.manager.setEnvironmentProperty("guard.disabled", "false"); PolicyEngine.manager.setEnvironmentProperty(org.onap.policy.guard.Util.ONAP_KEY_URL, -- cgit 1.2.3-korg