Policy 1707 commit to LF

[policy/engine.git] / PolicyEngineAPI / src / test / java / org / openecomp / policy / test / PolicyParametersTest.java

diff --git a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyParametersTest.java b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyParametersTest.java
index ca272c7..eeb973b 100644 (file)
--- a/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyParametersTest.java
+++ b/PolicyEngineAPI/src/test/java/org/openecomp/policy/test/PolicyParametersTest.java
@@ -20,21 +20,24 @@
 
 package org.openecomp.policy.test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import java.util.Hashtable;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.junit.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 import org.openecomp.policy.api.AttributeType;
 import org.openecomp.policy.api.PolicyClass;
 import org.openecomp.policy.api.PolicyConfigType;
 import org.openecomp.policy.api.PolicyParameters;
 import org.openecomp.policy.api.PolicyType;
 
-import static org.junit.Assert.*;
-
 /**
  * The class <code>PolicyParametersTest</code> contains tests for the class <code>{@link PolicyParameters}</code>.
  *
@@ -55,18 +58,18 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -90,18 +93,18 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -125,19 +128,19 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -162,19 +165,19 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -198,19 +201,19 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -237,19 +240,19 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -273,19 +276,19 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -310,19 +313,19 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -347,19 +350,19 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -384,19 +387,19 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -421,19 +424,19 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -457,19 +460,19 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -496,24 +499,24 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
 
-               PolicyConfigType result = fixture.getPolicyConfigType();
+               PolicyConfigType result = (PolicyConfigType) fixture.getPolicyConfigType();
 
                // add additional test code here
                assertNotNull(result);
@@ -535,19 +538,19 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -571,19 +574,19 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -607,19 +610,19 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -643,19 +646,19 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.fromString("878d319c-2799-4684-b480-99f40e1042b2"));
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -684,19 +687,19 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -720,19 +723,19 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -756,23 +759,23 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
-               Map<AttributeType, Map<String, String>> attributes = new Hashtable();
+               Map<AttributeType, Map<String, String>> attributes = new Hashtable<AttributeType, Map<String, String>>();
 
                fixture.setAttributes(attributes);
 
@@ -792,19 +795,19 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -828,19 +831,19 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -864,19 +867,19 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -902,19 +905,19 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -938,19 +941,19 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -959,7 +962,7 @@ public class PolicyParametersTest {
                String policyDescription = "";
                String ecompName = "";
                String configName = "";
-               Map<AttributeType, Map<String, String>> attributes = new Hashtable();
+               Map<AttributeType, Map<String, String>> attributes = new Hashtable<AttributeType, Map<String, String>>();
                PolicyType configBodyType = PolicyType.JSON;
                String configBody = "";
                UUID requestID = UUID.randomUUID();
@@ -982,23 +985,23 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
-               List<String> dynamicRuleAlgorithmField1 = new LinkedList();
+               List<String> dynamicRuleAlgorithmField1 = new LinkedList<String>();
 
                fixture.setDynamicRuleAlgorithmField1(dynamicRuleAlgorithmField1);
 
@@ -1018,23 +1021,23 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
-               List<String> dynamicRuleAlgorithmField2 = new LinkedList();
+               List<String> dynamicRuleAlgorithmField2 = new LinkedList<String>();
 
                fixture.setDynamicRuleAlgorithmField2(dynamicRuleAlgorithmField2);
 
@@ -1054,23 +1057,23 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
-               List<String> dynamicRuleAlgorithmFunctions = new LinkedList();
+               List<String> dynamicRuleAlgorithmFunctions = new LinkedList<String>();
 
                fixture.setDynamicRuleAlgorithmFunctions(dynamicRuleAlgorithmFunctions);
 
@@ -1090,23 +1093,23 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
-               List<String> dynamicRuleAlgorithmLabels = new LinkedList();
+               List<String> dynamicRuleAlgorithmLabels = new LinkedList<String>();
 
                fixture.setDynamicRuleAlgorithmLabels(dynamicRuleAlgorithmLabels);
 
@@ -1126,19 +1129,19 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -1162,19 +1165,19 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -1198,19 +1201,19 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -1234,19 +1237,19 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -1270,19 +1273,19 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -1306,19 +1309,19 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");
@@ -1342,19 +1345,19 @@ public class PolicyParametersTest {
                PolicyParameters fixture = new PolicyParameters();
                fixture.setRequestID(UUID.randomUUID());
                fixture.setActionAttribute("");
-               fixture.setAttributes(new Hashtable());
-               fixture.setDynamicRuleAlgorithmLabels(new LinkedList());
+               fixture.setAttributes(new Hashtable<AttributeType, Map<String, String>>());
+               fixture.setDynamicRuleAlgorithmLabels(new LinkedList<String>());
                fixture.setPolicyDescription("");
                
                fixture.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
-               fixture.setDynamicRuleAlgorithmField2(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField2(new LinkedList<String>());
                fixture.setPolicyName("");
                fixture.setConfigName("");
-               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList());
+               fixture.setDynamicRuleAlgorithmFunctions(new LinkedList<String>());
                fixture.setPolicyClass(PolicyClass.Action);
                fixture.setEcompName("");
                fixture.setConfigBodyType(PolicyType.JSON);
-               fixture.setDynamicRuleAlgorithmField1(new LinkedList());
+               fixture.setDynamicRuleAlgorithmField1(new LinkedList<String>());
                fixture.setPriority("");
                fixture.setActionPerformer("");
                fixture.setConfigBody("");