1 files changed, 14 insertions, 11 deletions
diff --git a/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardYamlToXacmlTest.java b/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardYamlToXacmlTest.java
index dced2889d..a35696dec 100644
--- a/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardYamlToXacmlTest.java
+++ b/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardYamlToXacmlTest.java
@@ -116,10 +116,11 @@ public class PolicyGuardYamlToXacmlTest {
         final File tempXacmlTemplateFile = new File("src/test/resources/frequency_limiter_template.xml");
         final File tempXacmlOutputFile = File.createTempFile("ONAPPF", ".out.xacml");
 
-        clGuard.getGuards().getFirst().getMatch_parameters().setControlLoopName(null);
-        clGuard.getGuards().getFirst().getMatch_parameters().setActor(null);
-        clGuard.getGuards().getFirst().getMatch_parameters().setRecipe(null);
-        clGuard.getGuards().getFirst().getMatch_parameters().setTargets(null);
+        MatchParameters matchParameters = clGuard.getGuards().get(0).getMatch_parameters();
+        matchParameters.setControlLoopName(null);
+        matchParameters.setActor(null);
+        matchParameters.setRecipe(null);
+        matchParameters.setTargets(null);
 
         Yaml clYaml = new Yaml(new Constructor(ControlLoopGuard.class));
         String clYamlString = clYaml.dump(clGuard);
@@ -179,7 +180,7 @@ public class PolicyGuardYamlToXacmlTest {
         List<String> blacklist = new ArrayList<>();
         blacklist.add("WestWitches");
         blacklist.add("EastWitches");
-        clGuard.getGuards().getFirst().getLimit_constraints().getFirst().setBlacklist(blacklist);
+        clGuard.getGuards().get(0).getLimit_constraints().get(0).setBlacklist(blacklist);
 
         Yaml clYaml = new Yaml(new Constructor(ControlLoopGuard.class));
         String clYamlString = clYaml.dump(clGuard);
@@ -210,12 +211,14 @@ public class PolicyGuardYamlToXacmlTest {
         List<String> blacklist = new ArrayList<>();
         blacklist.add("WestWitches");
         blacklist.add("EastWitches");
-        clGuard.getGuards().getFirst().getLimit_constraints().getFirst().setBlacklist(blacklist);
-
-        clGuard.getGuards().getFirst().getMatch_parameters().setControlLoopName(null);
-        clGuard.getGuards().getFirst().getMatch_parameters().setActor(null);
-        clGuard.getGuards().getFirst().getMatch_parameters().setRecipe(null);
-        clGuard.getGuards().getFirst().getMatch_parameters().setTargets(null);
+        GuardPolicy guardPolicy = clGuard.getGuards().get(0);
+        guardPolicy.getLimit_constraints().get(0).setBlacklist(blacklist);
+
+        MatchParameters matchParameters = guardPolicy.getMatch_parameters();
+        matchParameters.setControlLoopName(null);
+        matchParameters.setActor(null);
+        matchParameters.setRecipe(null);
+        matchParameters.setTargets(null);
 
         Yaml clYaml = new Yaml(new Constructor(ControlLoopGuard.class));
         String clYamlString = clYaml.dump(clGuard);