From 952d4f5aab9913f961e77fa0457da5d38f31d94f Mon Sep 17 00:00:00 2001 From: liamfallon Date: Sun, 16 Sep 2018 02:03:12 +0100 Subject: Fix Sonar issues in apex Fixing various Sonar issues in apex. Issue-ID: POLICY-1034 Change-Id: Ie693637d75bd7e38c71b7ba04886fb75636276ed Signed-off-by: liamfallon --- .../integration/common/model/EvalDomainModelFactory.java | 2 +- .../testsuites/integration/context/TestConcurrentContext.java | 4 ++-- .../integration/uservice/engdep/EngDepMessagingTest.java | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'testsuites/integration') diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/EvalDomainModelFactory.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/EvalDomainModelFactory.java index 883793290..25c7fa16e 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/EvalDomainModelFactory.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/testsuites/integration/common/model/EvalDomainModelFactory.java @@ -215,7 +215,7 @@ public class EvalDomainModelFactory { final AxLogicReader logicReader = new PolicyLogicReader().setLogicPackage(PACKAGE) .setDefaultLogic("EvalTask_Logic"); - final AxTask obTask = new AxTask(new AxArtifactKey("Task_Observe_0", "0.0.1")); + final AxTask obTask = new AxTask(new AxArtifactKey("Task_Observe_0", DEFAULT_VERSION)); obTask.duplicateInputFields(event0000.getParameterMap()); obTask.duplicateOutputFields(event0001.getParameterMap()); final AxTaskLogic obAxLogic = new AxTaskLogic(obTask.getKey(), TASK_LOGIC, diff --git a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/TestConcurrentContext.java b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/TestConcurrentContext.java index 5fadb2279..a62414ac6 100644 --- a/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/TestConcurrentContext.java +++ b/testsuites/integration/integration-context-test/src/test/java/org/onap/policy/apex/testsuites/integration/context/TestConcurrentContext.java @@ -30,7 +30,7 @@ import java.io.File; import java.io.IOException; import java.net.InetSocketAddress; import java.util.Map; -import java.util.TreeSet; +import java.util.SortedSet; import org.junit.BeforeClass; import org.junit.Rule; @@ -106,7 +106,7 @@ public class TestConcurrentContext { final String hazelCastfileLocation = ResourceUtils.getFilePath4Resource(HAZELCAST_XML_FILE); System.setProperty(HAZELCAST_CONFIG, hazelCastfileLocation); - final TreeSet ipAddressSet = NetworkUtils.getIPv4NonLoopAddresses(); + final SortedSet ipAddressSet = NetworkUtils.getIPv4NonLoopAddresses(); if (ipAddressSet.size() == 0) { throw new Exception("cound not find real IP address for test"); diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/engdep/EngDepMessagingTest.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/engdep/EngDepMessagingTest.java index a306b536e..5251cc078 100644 --- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/engdep/EngDepMessagingTest.java +++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/testsuites/integration/uservice/engdep/EngDepMessagingTest.java @@ -87,9 +87,9 @@ public class EngDepMessagingTest { contextParameters.getPersistorParameters().setName(ContextParameterConstants.PERSISTENCE_GROUP_NAME); ParameterService.register(contextParameters, true); - ParameterService.register(contextParameters.getDistributorParameters()); - ParameterService.register(contextParameters.getLockManagerParameters()); - ParameterService.register(contextParameters.getPersistorParameters()); + ParameterService.register(contextParameters.getDistributorParameters(), true); + ParameterService.register(contextParameters.getLockManagerParameters(), true); + ParameterService.register(contextParameters.getPersistorParameters(), true); engineServiceParameters = new EngineServiceParameters(); engineServiceParameters.setName("EngDepMessagingTest"); @@ -100,8 +100,8 @@ public class EngDepMessagingTest { engineServiceParameters.getEngineParameters().getExecutorParameterMap().put("MVEL", new MvelExecutorParameters()); - ParameterService.register(engineServiceParameters); - ParameterService.register(engineServiceParameters.getEngineParameters()); + ParameterService.register(engineServiceParameters, true); + ParameterService.register(engineServiceParameters.getEngineParameters(), true); } /** -- cgit 1.2.3-korg