From: Pamela Dragosh Date: Thu, 1 Feb 2018 20:05:16 +0000 (-0500) Subject: Resolve LF license header issue X-Git-Tag: v1.2.0~168 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=commitdiff_plain;h=e8c14515d3f48aad6d42a31d7489a3ef25557f2d Resolve LF license header issue These were simple, we just forgot to remove the old license headers. Also needed to add a missed fix for a JUnit test. Not sure how this made it past verify. Issue-ID: POLICY-552 Change-Id: I30610ba4f8440ee16d0a5c372985f50429d60a34 Signed-off-by: Pamela Dragosh --- diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/ia/DbAuditCompareEntriesTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/ia/DbAuditCompareEntriesTest.java index 13255ba50..049f721ea 100644 --- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/ia/DbAuditCompareEntriesTest.java +++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/ia/DbAuditCompareEntriesTest.java @@ -25,8 +25,8 @@ import static org.junit.Assert.assertTrue; import java.util.Date; import java.util.HashMap; -import java.util.HashSet; import java.util.Properties; +import java.util.Set; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; @@ -150,7 +150,7 @@ public class DbAuditCompareEntriesTest { String className = null; //There is only one entry IntegrityAuditEntity, but we will check anyway - HashSet classNameSet = dbDAO.getPersistenceClassNames(); + Set classNameSet = dbDAO.getPersistenceClassNames(); for(String c : classNameSet){ if (c.equals("org.onap.policy.common.ia.jpa.IntegrityAuditEntity")){ className = c; @@ -187,7 +187,7 @@ public class DbAuditCompareEntriesTest { myEntries.put("pdp1", entry1); theirEntries.put("pdp1", entry2); - HashSet result = dbAudit.compareEntries(myEntries, theirEntries); + Set result = dbAudit.compareEntries(myEntries, theirEntries); /* * Assert that there are no mismatches returned @@ -246,7 +246,7 @@ public class DbAuditCompareEntriesTest { myEntries.put("pdp1", entry1); theirEntries.put("pdp1", entry2); - HashSet result = dbAudit.compareEntries(myEntries, theirEntries); + Set result = dbAudit.compareEntries(myEntries, theirEntries); // Assert that there are no mismatches returned @@ -306,7 +306,7 @@ public class DbAuditCompareEntriesTest { myEntries.put("pdp1", entry1); theirEntries.put("pdp1", entry2); - HashSet result = dbAudit.compareEntries(myEntries, theirEntries); + Set result = dbAudit.compareEntries(myEntries, theirEntries); // Assert that there are no mismatches returned @@ -363,7 +363,7 @@ public class DbAuditCompareEntriesTest { myEntries.put("pdp1", entry1); theirEntries.put("pdp1", entry2); - HashSet result = dbAudit.compareEntries(myEntries, theirEntries); + Set result = dbAudit.compareEntries(myEntries, theirEntries); // Assert that there are no mismatches returned @@ -420,7 +420,7 @@ public class DbAuditCompareEntriesTest { myEntries.put("pdp1", entry1); theirEntries.put("pdp1", entry2); - HashSet result = dbAudit.compareEntries(myEntries, theirEntries); + Set result = dbAudit.compareEntries(myEntries, theirEntries); // Assert that there are no mismatches returned diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupEntity.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupEntity.java index a53ac2d58..7bb9c54fc 100644 --- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupEntity.java +++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupEntity.java @@ -17,17 +17,6 @@ * limitations under the License. * ============LICENSE_END========================================================= */ - -/* - * AT&T - PROPRIETARY - * THIS FILE CONTAINS PROPRIETARY INFORMATION OF - * AT&T AND IS NOT TO BE DISCLOSED OR USED EXCEPT IN - * ACCORDANCE WITH APPLICABLE AGREEMENTS. - * - * Copyright (c) 2013 AT&T Knowledge Ventures - * Unpublished and Not for Publication - * All Rights Reserved - */ package org.onap.policy.rest.jpa; /* */ diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceModels.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceModels.java index ff4028f2d..699aa8ac4 100644 --- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceModels.java +++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceModels.java @@ -17,17 +17,6 @@ * limitations under the License. * ============LICENSE_END========================================================= */ - -/* - * AT&T - PROPRIETARY - * THIS FILE CONTAINS PROPRIETARY INFORMATION OF - * AT&T AND IS NOT TO BE DISCLOSED OR USED EXCEPT IN - * ACCORDANCE WITH APPLICABLE AGREEMENTS. - * - * Copyright (c) 2015 AT&T Knowledge Ventures - * Unpublished and Not for Publication - * All Rights Reserved - */ package org.onap.policy.rest.jpa; import java.io.Serializable; diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/RuleAlgorithms.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/RuleAlgorithms.java index 9d0f005be..ae73fd71e 100644 --- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/RuleAlgorithms.java +++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/RuleAlgorithms.java @@ -17,17 +17,6 @@ * limitations under the License. * ============LICENSE_END========================================================= */ - -/* - * AT&T - PROPRIETARY - * THIS FILE CONTAINS PROPRIETARY INFORMATION OF - * AT&T AND IS NOT TO BE DISCLOSED OR USED EXCEPT IN - * ACCORDANCE WITH APPLICABLE AGREEMENTS. - * - * Copyright (c) 2014 AT&T Knowledge Ventures - * Unpublished and Not for Publication - * All Rights Reserved - */ package org.onap.policy.rest.jpa; import java.io.Serializable; diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/SystemLogDB.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/SystemLogDB.java index 0747c837f..324e92f76 100644 --- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/SystemLogDB.java +++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/SystemLogDB.java @@ -17,17 +17,6 @@ * limitations under the License. * ============LICENSE_END========================================================= */ - -/* - * AT&T - PROPRIETARY - * THIS FILE CONTAINS PROPRIETARY INFORMATION OF - * AT&T AND IS NOT TO BE DISCLOSED OR USED EXCEPT IN - * ACCORDANCE WITH APPLICABLE AGREEMENTS. - * - * Copyright (c) 2013 AT&T Knowledge Ventures - * Unpublished and Not for Publication - * All Rights Reserved - */ package org.onap.policy.rest.jpa; import java.io.Serializable; diff --git a/PolicyEngineClient/src/test/java/org/onap/policyengine/GeneralTestClient.java b/PolicyEngineClient/src/test/java/org/onap/policyengine/GeneralTestClient.java index e81939be6..4c5a262df 100644 --- a/PolicyEngineClient/src/test/java/org/onap/policyengine/GeneralTestClient.java +++ b/PolicyEngineClient/src/test/java/org/onap/policyengine/GeneralTestClient.java @@ -17,17 +17,6 @@ * limitations under the License. * ============LICENSE_END========================================================= */ - -/* - * AT&T - PROPRIETARY - * THIS FILE CONTAINS PROPRIETARY INFORMATION OF - * AT&T AND IS NOT TO BE DISCLOSED OR USED EXCEPT IN - * ACCORDANCE WITH APPLICABLE AGREEMENTS. - * - * Copyright (c) 2014 AT&T Knowledge Ventures - * Unpublished and Not for Publication - * All Rights Reserved - */ package org.onap.policyengine; import java.io.FileNotFoundException; diff --git a/PolicyEngineClient/src/test/java/org/onap/policyengine/PolicyEngineTestClient.java b/PolicyEngineClient/src/test/java/org/onap/policyengine/PolicyEngineTestClient.java index 39346eaea..9ce4a2a22 100644 --- a/PolicyEngineClient/src/test/java/org/onap/policyengine/PolicyEngineTestClient.java +++ b/PolicyEngineClient/src/test/java/org/onap/policyengine/PolicyEngineTestClient.java @@ -17,17 +17,6 @@ * limitations under the License. * ============LICENSE_END========================================================= */ - -/* - * AT&T - PROPRIETARY - * THIS FILE CONTAINS PROPRIETARY INFORMATION OF - * AT&T AND IS NOT TO BE DISCLOSED OR USED EXCEPT IN - * ACCORDANCE WITH APPLICABLE AGREEMENTS. - * - * Copyright (c) 2014 AT&T Knowledge Ventures - * Unpublished and Not for Publication - * All Rights Reserved - */ package org.onap.policyengine; import java.io.IOException;