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 <pdragosh@research.att.com>
import java.util.Date;
import java.util.HashMap;
import java.util.Date;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Properties;
import java.util.Properties;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
String className = null;
//There is only one entry IntegrityAuditEntity, but we will check anyway
String className = null;
//There is only one entry IntegrityAuditEntity, but we will check anyway
- HashSet<String> classNameSet = dbDAO.getPersistenceClassNames();
+ Set<String> classNameSet = dbDAO.getPersistenceClassNames();
for(String c : classNameSet){
if (c.equals("org.onap.policy.common.ia.jpa.IntegrityAuditEntity")){
className = c;
for(String c : classNameSet){
if (c.equals("org.onap.policy.common.ia.jpa.IntegrityAuditEntity")){
className = c;
myEntries.put("pdp1", entry1);
theirEntries.put("pdp1", entry2);
myEntries.put("pdp1", entry1);
theirEntries.put("pdp1", entry2);
- HashSet<Object> result = dbAudit.compareEntries(myEntries, theirEntries);
+ Set<Object> result = dbAudit.compareEntries(myEntries, theirEntries);
/*
* Assert that there are no mismatches returned
/*
* Assert that there are no mismatches returned
myEntries.put("pdp1", entry1);
theirEntries.put("pdp1", entry2);
myEntries.put("pdp1", entry1);
theirEntries.put("pdp1", entry2);
- HashSet<Object> result = dbAudit.compareEntries(myEntries, theirEntries);
+ Set<Object> result = dbAudit.compareEntries(myEntries, theirEntries);
// Assert that there are no mismatches returned
// Assert that there are no mismatches returned
myEntries.put("pdp1", entry1);
theirEntries.put("pdp1", entry2);
myEntries.put("pdp1", entry1);
theirEntries.put("pdp1", entry2);
- HashSet<Object> result = dbAudit.compareEntries(myEntries, theirEntries);
+ Set<Object> result = dbAudit.compareEntries(myEntries, theirEntries);
// Assert that there are no mismatches returned
// Assert that there are no mismatches returned
myEntries.put("pdp1", entry1);
theirEntries.put("pdp1", entry2);
myEntries.put("pdp1", entry1);
theirEntries.put("pdp1", entry2);
- HashSet<Object> result = dbAudit.compareEntries(myEntries, theirEntries);
+ Set<Object> result = dbAudit.compareEntries(myEntries, theirEntries);
// Assert that there are no mismatches returned
// Assert that there are no mismatches returned
myEntries.put("pdp1", entry1);
theirEntries.put("pdp1", entry2);
myEntries.put("pdp1", entry1);
theirEntries.put("pdp1", entry2);
- HashSet<Object> result = dbAudit.compareEntries(myEntries, theirEntries);
+ Set<Object> result = dbAudit.compareEntries(myEntries, theirEntries);
// Assert that there are no mismatches returned
// Assert that there are no mismatches returned
* limitations under the License.
* ============LICENSE_END=========================================================
*/
* 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;
/*
*/
package org.onap.policy.rest.jpa;
/*
*/
* limitations under the License.
* ============LICENSE_END=========================================================
*/
* 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;
package org.onap.policy.rest.jpa;
import java.io.Serializable;
* limitations under the License.
* ============LICENSE_END=========================================================
*/
* 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;
package org.onap.policy.rest.jpa;
import java.io.Serializable;
* limitations under the License.
* ============LICENSE_END=========================================================
*/
* 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;
package org.onap.policy.rest.jpa;
import java.io.Serializable;
* limitations under the License.
* ============LICENSE_END=========================================================
*/
* 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;
package org.onap.policyengine;
import java.io.FileNotFoundException;
* limitations under the License.
* ============LICENSE_END=========================================================
*/
* 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;
package org.onap.policyengine;
import java.io.IOException;