diff options
| author |   liamfallon <liam.fallon@est.tech> | 2023-02-02 16:26:18 +0000 |
|---|---|---|
| committer | liamfallon <liam.fallon@est.tech> | 2023-02-02 18:05:54 +0000 |
| commit | 8b4cc76050c377e35c7e36580f3226c789bdc65d (patch) | |
| tree | 576d59962aa95c9386368d8846479524c85f590c /applications/common/src | |
| parent | 1e82ff4b693e2920dfde67cdfc30bf0648f1b097 (diff) | |
Replace Eclipselink with Hibernate
Issue-ID: POLICY-4533
Change-Id: I56cfd55cd66e228e3012152a8fcc11e3011c8a3c
Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'applications/common/src')
3 files changed, 9 insertions, 10 deletions
diff --git a/applications/common/src/main/resources/persistence.xml b/applications/common/src/main/resources/persistence.xml index a9dedccb..e256bf99 100644 --- a/applications/common/src/main/resources/persistence.xml +++ b/applications/common/src/main/resources/persistence.xml @@ -4,6 +4,7 @@ ONAP ================================================================================ Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. + Modifications Copyright (C) 2023 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,15 +23,13 @@ <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence persistence_1_0.xsd" version="1.0"> <persistence-unit name="OperationsHistoryPU" transaction-type="RESOURCE_LOCAL"> - <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider> - <class>org.onap.policy.guard.OperationsHistory</class> <properties> <property name="javax.persistence.schema-generation.database.action" value="create" /> - <property name="eclipselink.ddl-generation" value="create-or-extend-tables" /> - <property name="eclipselink.ddl-generation.output-mode" value="database" /> - <property name="eclipselink.logging.level" value="INFO" /> + <property name="javax.persistence.schema-generation.create-source" value="metadata"/> + <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/> + <property name="hibernate.show_sql" value="false" /> </properties> </persistence-unit> diff --git a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/operationshistory/CountRecentOperationsPipTest.java b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/operationshistory/CountRecentOperationsPipTest.java index e12a204e..b2116f96 100644 --- a/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/operationshistory/CountRecentOperationsPipTest.java +++ b/applications/common/src/test/java/org/onap/policy/pdp/xacml/application/common/operationshistory/CountRecentOperationsPipTest.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2023 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -221,7 +222,7 @@ public class CountRecentOperationsPipTest { // // Directly check ground truth // - Query queryCount = em.createNativeQuery("select count(*) as numops from operationshistory").setParameter(1, 1); + Query queryCount = em.createNativeQuery("select count(*) as numops from operationshistory"); LOGGER.info("{} entries", queryCount.getSingleResult()); // // Should count 1 entry now diff --git a/applications/common/src/test/resources/META-INF/persistence.xml b/applications/common/src/test/resources/META-INF/persistence.xml index a0f0d45d..ebddf87b 100644 --- a/applications/common/src/test/resources/META-INF/persistence.xml +++ b/applications/common/src/test/resources/META-INF/persistence.xml @@ -4,6 +4,7 @@ ONAP ================================================================================ Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. + Modifications Copyright (C) 2023 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,15 +23,13 @@ <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence persistence_1_0.xsd" version="1.0"> <persistence-unit name="PipEngineTest" transaction-type="RESOURCE_LOCAL"> - <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider> <class>org.onap.policy.guard.OperationsHistory</class> <properties> - <property name="eclipselink.ddl-generation" value="create-tables" /> - <property name="eclipselink.logging.level" value="FINE" /> - <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/> <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/> <property name="javax.persistence.schema-generation.create-source" value="metadata"/> + <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/> + <property name="hibernate.show_sql" value="false" /> </properties> </persistence-unit> |