From 0e23f7634e1e1fb31454c516974613335fcea1a4 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Wed, 12 Sep 2018 23:29:25 +0100 Subject: Sonar/Checkstyle in model/context/core Checkstyle and sonar changes in the model, contexot and core modules. Issue-ID: POLICY-1034 Change-Id: I2d40bc877f3a548844470fc290fc89d63fa465ae Signed-off-by: liamfallon --- .../policy/apex/examples/aadm/TestAADMUseCase.java | 18 +++++----- .../adaptive/TestAnomalyDetectionTslUseCase.java | 2 +- .../examples/adaptive/TestAutoLearnTslUseCase.java | 2 +- .../examples/myfirstpolicy/TestMfpUseCase.java | 40 +++++++++++----------- 4 files changed, 31 insertions(+), 31 deletions(-) (limited to 'examples') diff --git a/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/TestAADMUseCase.java b/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/TestAADMUseCase.java index 5ff70d1af..21f240ba8 100644 --- a/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/TestAADMUseCase.java +++ b/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/TestAADMUseCase.java @@ -150,7 +150,7 @@ public class TestAADMUseCase { apexEngine.handleEvent(event); EnEvent result = listener.getResult(); assertTrue(result.getName().startsWith("XSTREAM_AADM_ACT_EVENT")); - assertEquals("ExecutionIDs are different", event.getExecutionID(), result.getExecutionID()); + assertEquals("ExecutionIDs are different", event.getExecutionId(), result.getExecutionId()); // no DOS_IN_eNodeB set so return probe action assertTrue(result.get("ACTTASK").equals("probe")); assertTrue((boolean) result.get("TCP_ON")); @@ -188,7 +188,7 @@ public class TestAADMUseCase { apexEngine.handleEvent(event); result = listener.getResult(); assertTrue(result.getName().startsWith("XSTREAM_AADM_ACT_EVENT")); - assertEquals("ExecutionIDs are different", event.getExecutionID(), result.getExecutionID()); + assertEquals("ExecutionIDs are different", event.getExecutionId(), result.getExecutionId()); // DOS_IN_eNodeB set to be more than throughput so return act action assertTrue(result.get("ACTTASK").equals("act")); // only one imsi was sent to process, so stop probe and tcp @@ -226,7 +226,7 @@ public class TestAADMUseCase { apexEngine.handleEvent(event); result = listener.getResult(); assertTrue(result.getName().startsWith("XSTREAM_AADM_ACT_EVENT")); - assertEquals("ExecutionIDs are different", event.getExecutionID(), result.getExecutionID()); + assertEquals("ExecutionIDs are different", event.getExecutionId(), result.getExecutionId()); assertTrue(result.get("ACTTASK").equals("probe")); assertTrue((boolean) result.get("TCP_ON")); assertTrue((boolean) result.get("PROBE_ON")); @@ -261,7 +261,7 @@ public class TestAADMUseCase { apexEngine.handleEvent(event); result = listener.getResult(); assertTrue(result.getName().startsWith("XSTREAM_AADM_ACT_EVENT")); - assertEquals("ExecutionIDs are different", event.getExecutionID(), result.getExecutionID()); + assertEquals("ExecutionIDs are different", event.getExecutionId(), result.getExecutionId()); assertTrue(result.get("ACTTASK").equals("act")); assertTrue(!(boolean) result.get("TCP_ON")); assertTrue(!(boolean) result.get("PROBE_ON")); @@ -298,7 +298,7 @@ public class TestAADMUseCase { apexEngine.handleEvent(event); result = listener.getResult(); assertTrue(result.getName().startsWith("XSTREAM_AADM_ACT_EVENT")); - assertEquals("ExecutionIDs are different", event.getExecutionID(), result.getExecutionID()); + assertEquals("ExecutionIDs are different", event.getExecutionId(), result.getExecutionId()); assertTrue(result.get("ACTTASK").equals("act")); assertTrue(!(boolean) result.get("TCP_ON")); assertTrue(!(boolean) result.get("PROBE_ON")); @@ -331,7 +331,7 @@ public class TestAADMUseCase { apexEngine.handleEvent(event); result = listener.getResult(); assertTrue(result.getName().startsWith("XSTREAM_AADM_ACT_EVENT")); - assertEquals("ExecutionIDs are different", event.getExecutionID(), result.getExecutionID()); + assertEquals("ExecutionIDs are different", event.getExecutionId(), result.getExecutionId()); assertTrue(result.get("ACTTASK").equals("probe")); assertTrue((boolean) result.get("TCP_ON")); assertTrue((boolean) result.get("PROBE_ON")); @@ -369,7 +369,7 @@ public class TestAADMUseCase { apexEngine.handleEvent(event); result = listener.getResult(); assertTrue(result.getName().startsWith("XSTREAM_AADM_ACT_EVENT")); - assertEquals("ExecutionIDs are different", event.getExecutionID(), result.getExecutionID()); + assertEquals("ExecutionIDs are different", event.getExecutionId(), result.getExecutionId()); assertTrue(result.get("ACTTASK").equals("probe")); assertTrue((boolean) result.get("TCP_ON")); assertTrue((boolean) result.get("PROBE_ON")); @@ -402,7 +402,7 @@ public class TestAADMUseCase { apexEngine.handleEvent(event); result = listener.getResult(); assertTrue(result.getName().startsWith("XSTREAM_AADM_ACT_EVENT")); - assertEquals("ExecutionIDs are different", event.getExecutionID(), result.getExecutionID()); + assertEquals("ExecutionIDs are different", event.getExecutionId(), result.getExecutionId()); assertTrue(result.get("ACTTASK").equals("probe")); assertTrue((boolean) result.get("TCP_ON")); assertTrue((boolean) result.get("PROBE_ON")); @@ -424,7 +424,7 @@ public class TestAADMUseCase { apexEngine.handleEvent(event); result = listener.getResult(); assertTrue(result.getName().startsWith("SAPCBlacklistSubscriberEvent")); - assertEquals("ExecutionIDs are different", event.getExecutionID(), result.getExecutionID()); + assertEquals("ExecutionIDs are different", event.getExecutionId(), result.getExecutionId()); assertEquals(0L, result.get("IMSI")); assertTrue(result.get("PROFILE").equals("ServiceA")); assertTrue(result.get("BLACKLIST_ON").equals(false)); diff --git a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestAnomalyDetectionTslUseCase.java b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestAnomalyDetectionTslUseCase.java index 1925a53f5..4b66eb116 100644 --- a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestAnomalyDetectionTslUseCase.java +++ b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestAnomalyDetectionTslUseCase.java @@ -132,7 +132,7 @@ public class TestAnomalyDetectionTslUseCase { apexEngine1.handleEvent(triggerEvent); final EnEvent result = listener1.getResult(); LOGGER.info("Receiving action event {} ", result); - assertEquals("ExecutionIDs are different", triggerEvent.getExecutionID(), result.getExecutionID()); + assertEquals("ExecutionIDs are different", triggerEvent.getExecutionId(), result.getExecutionId()); triggerEvent.clear(); result.clear(); Thread.sleep(1); diff --git a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestAutoLearnTslUseCase.java b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestAutoLearnTslUseCase.java index ce9a07e16..632ae623e 100644 --- a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestAutoLearnTslUseCase.java +++ b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/TestAutoLearnTslUseCase.java @@ -129,7 +129,7 @@ public class TestAutoLearnTslUseCase { apexEngine1.handleEvent(triggerEvent); final EnEvent result = listener1.getResult(); LOGGER.info("Receiving action event {} ", result); - assertEquals("ExecutionIDs are different", triggerEvent.getExecutionID(), result.getExecutionID()); + assertEquals("ExecutionIDs are different", triggerEvent.getExecutionId(), result.getExecutionId()); triggerEvent.clear(); result.clear(); Thread.sleep(1); diff --git a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/TestMfpUseCase.java b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/TestMfpUseCase.java index 0d6328286..ec5d9e0c9 100644 --- a/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/TestMfpUseCase.java +++ b/examples/examples-myfirstpolicy/src/test/java/org/onap/policy/apex/examples/myfirstpolicy/TestMfpUseCase.java @@ -149,7 +149,7 @@ public class TestMfpUseCase { resulexpected = fillResultEvent(axEventout, "examples/events/MyFirstPolicy/1/EventOut_BoozeItem_201713GMT.json"); assertEquals(resulexpected, resultout); - assertEquals("ExecutionIDs are different", event.getExecutionID(), resultout.getExecutionID()); + assertEquals("ExecutionIDs are different", event.getExecutionId(), resultout.getExecutionId()); event = fillTriggerEvent(axEventin, "examples/events/MyFirstPolicy/1/EventIn_NonBoozeItem_101309GMT.json"); apexEngine.handleEvent(event); @@ -157,7 +157,7 @@ public class TestMfpUseCase { resulexpected = fillResultEvent(axEventout, "examples/events/MyFirstPolicy/1/EventOut_NonBoozeItem_101309GMT.json"); assertEquals(resulexpected, resultout); - assertEquals("ExecutionIDs are different", event.getExecutionID(), resultout.getExecutionID()); + assertEquals("ExecutionIDs are different", event.getExecutionId(), resultout.getExecutionId()); apexEngine.stop(); } @@ -187,50 +187,50 @@ public class TestMfpUseCase { EnEvent event = fillTriggerEvent(axEventin, "examples/events/MyFirstPolicy/1/EventIn_BoozeItem_084106GMT.json"); apexEngine.handleEvent(event); EnEvent resultout = listener.getResult(); - EnEvent resulexpected = + EnEvent resultexpected = fillResultEvent(axEventout, "examples/events/MyFirstPolicy/1/EventOut_BoozeItem_084106GMT.json"); - assertEquals(resulexpected, resultout); - assertEquals("ExecutionIDs are different", event.getExecutionID(), resultout.getExecutionID()); + assertEquals(resultexpected, resultout); + assertEquals("ExecutionIDs are different", event.getExecutionId(), resultout.getExecutionId()); event = fillTriggerEvent(axEventin, "examples/events/MyFirstPolicy/1/EventIn_BoozeItem_201713GMT.json"); apexEngine.handleEvent(event); resultout = listener.getResult(); - resulexpected = + resultexpected = fillResultEvent(axEventout, "examples/events/MyFirstPolicy/1/EventOut_BoozeItem_201713GMT.json"); - assertEquals(resulexpected, resultout); - assertEquals("ExecutionIDs are different", event.getExecutionID(), resultout.getExecutionID()); + assertEquals(resultexpected, resultout); + assertEquals("ExecutionIDs are different", event.getExecutionId(), resultout.getExecutionId()); event = fillTriggerEvent(axEventin, "examples/events/MyFirstPolicy/1/EventIn_NonBoozeItem_101309GMT.json"); apexEngine.handleEvent(event); resultout = listener.getResult(); - resulexpected = + resultexpected = fillResultEvent(axEventout, "examples/events/MyFirstPolicy/1/EventOut_NonBoozeItem_101309GMT.json"); - assertEquals(resulexpected, resultout); - assertEquals("ExecutionIDs are different", event.getExecutionID(), resultout.getExecutionID()); + assertEquals(resultexpected, resultout); + assertEquals("ExecutionIDs are different", event.getExecutionId(), resultout.getExecutionId()); event = fillTriggerEvent(axEventin, "examples/events/MyFirstPolicy/2/EventIn_BoozeItem_101433CET_thurs.json"); apexEngine.handleEvent(event); resultout = listener.getResult(); - resulexpected = + resultexpected = fillResultEvent(axEventout, "examples/events/MyFirstPolicy/2/EventOut_BoozeItem_101433CET_thurs.json"); - assertEquals(resulexpected, resultout); - assertEquals("ExecutionIDs are different", event.getExecutionID(), resultout.getExecutionID()); + assertEquals(resultexpected, resultout); + assertEquals("ExecutionIDs are different", event.getExecutionId(), resultout.getExecutionId()); event = fillTriggerEvent(axEventin, "examples/events/MyFirstPolicy/2/EventIn_BoozeItem_171937CET_sun.json"); apexEngine.handleEvent(event); resultout = listener.getResult(); - resulexpected = + resultexpected = fillResultEvent(axEventout, "examples/events/MyFirstPolicy/2/EventOut_BoozeItem_171937CET_sun.json"); - assertEquals(resulexpected, resultout); - assertEquals("ExecutionIDs are different", event.getExecutionID(), resultout.getExecutionID()); + assertEquals(resultexpected, resultout); + assertEquals("ExecutionIDs are different", event.getExecutionId(), resultout.getExecutionId()); event = fillTriggerEvent(axEventin, "examples/events/MyFirstPolicy/2/EventIn_NonBoozeItem_111309CET_mon.json"); apexEngine.handleEvent(event); resultout = listener.getResult(); - resulexpected = + resultexpected = fillResultEvent(axEventout, "examples/events/MyFirstPolicy/2/EventOut_NonBoozeItem_111309CET_mon.json"); - assertEquals(resulexpected, resultout); - assertEquals("ExecutionIDs are different", event.getExecutionID(), resultout.getExecutionID()); + assertEquals(resultexpected, resultout); + assertEquals("ExecutionIDs are different", event.getExecutionId(), resultout.getExecutionId()); apexEngine.stop(); } -- cgit 1.2.3-korg