From 87c95be02a8a4d77e165dede90777e811b59dcae Mon Sep 17 00:00:00 2001 From: Ravindra Bakkamanthala Date: Tue, 23 May 2017 14:56:12 -0400 Subject: Commit includes ControlLoopPolicy API and bugfixes Change-Id: I3e18bb8b4c31a0d908bb0cff4c85e2a3fb450a63 Signed-off-by: Ravindra Bakkamanthala --- .../org/openecomp/policy/pdp/test/custom/CustomDataTypeFactory.java | 2 +- .../policy/pdp/test/custom/CustomFunctionDefinitionFactory.java | 2 +- .../test/java/org/openecomp/policy/pdp/test/custom/TestBase.java | 6 +++--- .../test/java/org/openecomp/policy/pdp/test/custom/TestCustom.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom') diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/CustomDataTypeFactory.java b/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/CustomDataTypeFactory.java index a677fb849..10f77666d 100644 --- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/CustomDataTypeFactory.java +++ b/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/CustomDataTypeFactory.java @@ -29,7 +29,7 @@ import com.att.research.xacml.api.Identifier; import com.att.research.xacml.std.datatypes.DataTypes; public class CustomDataTypeFactory extends DataTypeFactory { - private static final Map> mapIdentifiersToDataTypes = new HashMap>(); + private static final Map> mapIdentifiersToDataTypes = new HashMap<>(); private static boolean mapNeedsInit = true; public static final DataTypePrivateKey DT_PRIVATEKEY = DataTypePrivateKey.newInstance(); diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/CustomFunctionDefinitionFactory.java b/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/CustomFunctionDefinitionFactory.java index c8f9bb787..80f130906 100644 --- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/CustomFunctionDefinitionFactory.java +++ b/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/CustomFunctionDefinitionFactory.java @@ -35,7 +35,7 @@ import com.att.research.xacmlatt.pdp.std.StdFunctions; import com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionBagOneAndOnly; public class CustomFunctionDefinitionFactory extends FunctionDefinitionFactory { - private static Map mapFunctionDefinitions = new HashMap(); + private static Map mapFunctionDefinitions = new HashMap<>(); private static boolean needMapInit = true; public static final Identifier ID_FUNCTION_PRIVATEKEY_ONE_AND_ONLY = new IdentifierImpl("urn:com:att:research:xacml:custom:function:3.0:rsa:privatekey-one-and-only"); diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/TestBase.java b/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/TestBase.java index 7e1928c41..a9b504dfd 100644 --- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/TestBase.java +++ b/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/TestBase.java @@ -109,7 +109,7 @@ public class TestBase extends SimpleFileVisitor { Path file; InputStream is; BufferedReader reader; - List attributes = new ArrayList(); + List attributes = new ArrayList<>(); public Generator(Path path) { this.file = path; @@ -193,7 +193,7 @@ public class TestBase extends SimpleFileVisitor { protected URL restURL = null; protected int loop = 1; protected PDPEngine engine = null; - protected List generators = new ArrayList(); + protected List generators = new ArrayList<>(); protected static DataTypeFactory dataTypeFactory = null; private long permits = 0; @@ -649,7 +649,7 @@ public class TestBase extends SimpleFileVisitor { // // Copy the request attributes // - List attributes = new ArrayList(); + List attributes = new ArrayList<>(); for (RequestAttributes a : request.getRequestAttributes()) { attributes.add(new StdMutableRequestAttributes(a)); } diff --git a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/TestCustom.java b/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/TestCustom.java index 4d6ecb714..84d8226be 100644 --- a/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/TestCustom.java +++ b/ECOMP-PDP/src/test/java/org/openecomp/policy/pdp/test/custom/TestCustom.java @@ -214,7 +214,7 @@ public class TestCustom extends TestBase { // // Copy the request attributes // - List attributes = new ArrayList(); + List attributes = new ArrayList<>(); for (RequestAttributes a : oldRequest.getRequestAttributes()) { attributes.add(new StdMutableRequestAttributes(a)); } -- cgit 1.2.3-korg