From de18be8467912348ea73c7f5557397bab9ba86b3 Mon Sep 17 00:00:00 2001
From: liamfallon <liam.fallon@est.tech>
Date: Thu, 3 Feb 2022 12:01:57 +0000
Subject: Remove direct DB Load/Save from apex-pdp

This review is part of a series of reviews to move the apex-pdp state
machine model to use the base model types in policy models.

Persistence of policies for apex-pdp is now implemented in PAP and API.
The historic direct load and save functionality for APEX policy state
machine models to and from databases is no longer used and no longer
supported.

This revmoves the DAO code from apex-pdp and the associated handling
and test code.

The next review will remove the JPA annotations.
Subsequent reviews will mvoe the mdoel across to use the policy models
base model types.

Issue-ID: POLICY-1820
Change-Id: Iabf034b40a413d32fe62091fe3446f52ec30d3af
Signed-off-by: liamfallon <liam.fallon@est.tech>
---
 .../src/main/resources/META-INF/persistence.xml    | 263 ---------------------
 1 file changed, 263 deletions(-)
 delete mode 100644 packages/apex-pdp-package-full/src/main/resources/META-INF/persistence.xml

(limited to 'packages/apex-pdp-package-full/src/main/resources')

diff --git a/packages/apex-pdp-package-full/src/main/resources/META-INF/persistence.xml b/packages/apex-pdp-package-full/src/main/resources/META-INF/persistence.xml
deleted file mode 100644
index 23c70b18b..000000000
--- a/packages/apex-pdp-package-full/src/main/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2016-2018 Ericsson. All rights reserved.
-   Modifications Copyright (C) 2019-2021, 2022 Nordix Foundation.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-
-<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="2.0">
-    <persistence-unit name="org.onap.policy.apex.core.model.eclipselink.runtime"
-        transaction-type="RESOURCE_LOCAL">
-        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-
-        <class>org.onap.policy.apex.core.basicmodel.dao.converters.UUID2String</class>
-        <class>org.onap.policy.apex.core.basicmodel.concepts.AxArtifactKey</class>
-        <class>org.onap.policy.apex.core.basicmodel.concepts.AxConcept</class>
-        <class>org.onap.policy.apex.core.basicmodel.concepts.AxDataType</class>
-        <class>org.onap.policy.apex.core.basicmodel.concepts.AxKeyInfo</class>
-        <class>org.onap.policy.apex.core.basicmodel.concepts.AxKeyInformation</class>
-        <class>org.onap.policy.apex.core.basicmodel.concepts.AxModel</class>
-        <class>org.onap.policy.apex.core.basicmodel.concepts.TestEntity</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContextType</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContextItem</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContextItemTemplate</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContextScope</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContextType</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContextMap</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContext</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContextModel</class>
-        <class>org.onap.policy.apex.core.eventmodel.concepts.AxEventParameter</class>
-        <class>org.onap.policy.apex.core.eventmodel.concepts.AxEvent</class>
-        <class>org.onap.policy.apex.core.eventmodel.concepts.AxEvents</class>
-        <class>org.onap.policy.apex.core.eventmodel.concepts.AxEventModel</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxLogic</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxTaskParameter</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxTask</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxTasks</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxState</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxPolicy</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxPolicies</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxPolicyModel</class>
-        <class>org.onap.policy.apex.core.enginemodel.concepts.AxEngineStats</class>
-        <class>org.onap.policy.apex.core.enginemodel.concepts.AxEngineModel</class>
-        <class>org.onap.policy.apex.domains.aadm.concepts.ENodeBStatus</class>
-        <class>org.onap.policy.apex.domains.aadm.concepts.IMSIStatus</class>
-        <class>org.onap.policy.apex.domains.aadm.concepts.IPAddressStatus</class>
-        <class>org.onap.policy.apex.domains.adaptive.concepts.AnomalyDetection</class>
-        <class>org.onap.policy.apex.domains.adaptive.concepts.Autmer</class>
-        <class>org.onap.policy.apex.domains.vpn.concepts.VPNCustooLearn</class>
-        <class>org.onap.policy.apex.domains.vpn.concepts.VPNLink</class>
-        <class>org.onap.policy.apex.domains.vpn.concepts.VPNProblem</class>
-
-        <exclude-unlisted-classes>false</exclude-unlisted-classes>
-        <properties>
-            <property name="eclipselink.target-database" value="${database.target-database}" />
-            <property name="javax.persistence.jdbc.driver" value="${database.jdbc.driver}" />
-            <property name="javax.persistence.jdbc.url" value="${database.jdbc.url}" />
-            <property name="javax.persistence.jdbc.user" value="${database.jdbc.user}" />
-            <property name="javax.persistence.jdbc.password" value="${database.jdbc.password}" />
-
-            <property name="eclipselink.ddl-generation" value="create-or-extend-tables" />
-            <property name="eclipselink.logging.level" value="INFO" />
-
-        </properties>
-    </persistence-unit>
-
-    <persistence-unit name="org.onap.policy.apex.core.model.eclipselink.test"
-        transaction-type="RESOURCE_LOCAL">
-        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-
-        <class>org.onap.policy.apex.core.basicmodel.dao.converters.UUID2String</class>
-        <class>org.onap.policy.apex.core.basicmodel.concepts.AxArtifactKey</class>
-        <class>org.onap.policy.apex.core.basicmodel.concepts.AxConcept</class>
-        <class>org.onap.policy.apex.core.basicmodel.concepts.AxDataType</class>
-        <class>org.onap.policy.apex.core.basicmodel.concepts.AxKeyInfo</class>
-        <class>org.onap.policy.apex.core.basicmodel.concepts.AxKeyInformation</class>
-        <class>org.onap.policy.apex.core.basicmodel.concepts.AxModel</class>
-        <class>org.onap.policy.apex.core.basicmodel.concepts.TestEntity</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContextType</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContextItem</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContextItemTemplate</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContextScope</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContextType</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContextMap</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContext</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContextModel</class>
-        <class>org.onap.policy.apex.core.eventmodel.concepts.AxEventParameter</class>
-        <class>org.onap.policy.apex.core.eventmodel.concepts.AxEvent</class>
-        <class>org.onap.policy.apex.core.eventmodel.concepts.AxEvents</class>
-        <class>org.onap.policy.apex.core.eventmodel.concepts.AxEventModel</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxLogic</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxTaskParameter</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxTask</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxTasks</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxState</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxPolicy</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxPolicies</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxPolicyModel</class>
-        <class>org.onap.policy.apex.core.enginemodel.concepts.AxEngineStats</class>
-        <class>org.onap.policy.apex.core.enginemodel.concepts.AxEngineModel</class>
-        <class>org.onap.policy.apex.domains.aadm.concepts.ENodeBStatus</class>
-        <class>org.onap.policy.apex.domains.aadm.concepts.IMSIStatus</class>
-        <class>org.onap.policy.apex.domains.aadm.concepts.IPAddressStatus</class>
-        <class>org.onap.policy.apex.domains.adaptive.concepts.AnomalyDetection</class>
-        <class>org.onap.policy.apex.domains.adaptive.concepts.AutoLearn</class>
-        <class>org.onap.policy.apex.domains.vpn.concepts.VPNCustomer</class>
-        <class>org.onap.policy.apex.domains.vpn.concepts.VPNLink</class>
-        <class>org.onap.policy.apex.domains.vpn.concepts.VPNProblem</class>
-
-        <exclude-unlisted-classes>false</exclude-unlisted-classes>
-        <properties>
-            <property name="eclipselink.target-database" value="${database.target-database}" />
-            <property name="javax.persistence.jdbc.driver" value="${database.jdbc.driver}" />
-            <property name="javax.persistence.jdbc.url" value="${database.jdbc.url}" />
-            <property name="javax.persistence.jdbc.user" value="${database.jdbc.user}" />
-            <property name="javax.persistence.jdbc.password" value="${database.jdbc.password}" />
-
-            <property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
-            <property name="eclipselink.logging.level" value="INFO" />
-
-        </properties>
-    </persistence-unit>
-
-    <persistence-unit name="org.onap.policy.apex.core.model.hibernate.runtime">
-        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-
-        <class>org.onap.policy.apex.core.basicmodel.dao.converters.UUID2String</class>
-        <class>org.onap.policy.apex.core.basicmodel.concepts.AxArtifactKey</class>
-        <class>org.onap.policy.apex.core.basicmodel.concepts.AxConcept</class>
-        <class>org.onap.policy.apex.core.basicmodel.concepts.AxDataType</class>
-        <class>org.onap.policy.apex.core.basicmodel.concepts.AxKeyInfo</class>
-        <class>org.onap.policy.apex.core.basicmodel.concepts.AxKeyInformation</class>
-        <class>org.onap.policy.apex.core.basicmodel.concepts.AxModel</class>
-        <class>org.onap.policy.apex.core.basicmodel.concepts.TestEntity</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContextType</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContextItem</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContextItemTemplate</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContextScope</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContextType</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContextMap</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContext</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContextModel</class>
-        <class>org.onap.policy.apex.core.eventmodel.concepts.AxEventParameter</class>
-        <class>org.onap.policy.apex.core.eventmodel.concepts.AxEvent</class>
-        <class>org.onap.policy.apex.core.eventmodel.concepts.AxEvents</class>
-        <class>org.onap.policy.apex.core.eventmodel.concepts.AxEventModel</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxLogic</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxTaskParameter</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxTask</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxTasks</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxState</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxPolicy</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxPolicies</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxPolicyModel</class>
-        <class>org.onap.policy.apex.core.enginemodel.concepts.AxEngineStats</class>
-        <class>org.onap.policy.apex.core.enginemodel.concepts.AxEngineModel</class>
-        <class>org.onap.policy.apex.domains.aadm.concepts.ENodeBStatus</class>
-        <class>org.onap.policy.apex.domains.aadm.concepts.IMSIStatus</class>
-        <class>org.onap.policy.apex.domains.aadm.concepts.IPAddressStatus</class>
-        <class>org.onap.policy.apex.domains.adaptive.concepts.AnomalyDetection</class>
-        <class>org.onap.policy.apex.domains.adaptive.concepts.AutoLearn</class>
-        <class>org.onap.policy.apex.domains.vpn.concepts.VPNCustomer</class>
-        <class>org.onap.policy.apex.domains.vpn.concepts.VPNLink</class>
-        <class>org.onap.policy.apex.domains.vpn.concepts.VPNProblem</class>
-
-        <properties>
-            <property name="eclipselink.target-database" value="${database.target-database}" />
-            <property name="javax.persistence.jdbc.driver" value="${database.jdbc.driver}" />
-            <property name="javax.persistence.jdbc.url" value="${database.jdbc.url}" />
-            <property name="javax.persistence.jdbc.user" value="${database.jdbc.user}" />
-            <property name="javax.persistence.jdbc.password" value="${database.jdbc.password}" />
-
-            <property name="hibernate.dialect" value="${database.dialect}" />
-            <property name="hibernate.hbm2ddl.auto" value="update" />
-            <property name="hibernate.connection.provider_class"
-                value="org.hibernate.connection.C3P0ConnectionProvider" />
-            <property name="hibernate.temp.use_jdbc_metadata_defaults" value="false" />
-            <property name="hibernate.c3p0.max_size" value="100" />
-            <property name="hibernate.c3p0.min_size" value="0" />
-            <property name="hibernate.c3p0.acquire_increment" value="1" />
-            <property name="hibernate.c3p0.idle_test_period" value="300" />
-            <property name="hibernate.c3p0.max_statements" value="0" />
-            <property name="hibernate.c3p0.timeout" value="100" />
-        </properties>
-    </persistence-unit>
-
-    <persistence-unit name="org.onap.policy.apex.core.model.hibernate.test">
-        <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-
-        <class>org.onap.policy.apex.core.basicmodel.dao.converters.UUID2String</class>
-        <class>org.onap.policy.apex.core.basicmodel.concepts.AxArtifactKey</class>
-        <class>org.onap.policy.apex.core.basicmodel.concepts.AxConcept</class>
-        <class>org.onap.policy.apex.core.basicmodel.concepts.AxDataType</class>
-        <class>org.onap.policy.apex.core.basicmodel.concepts.AxKeyInfo</class>
-        <class>org.onap.policy.apex.core.basicmodel.concepts.AxKeyInformation</class>
-        <class>org.onap.policy.apex.core.basicmodel.concepts.AxModel</class>
-        <class>org.onap.policy.apex.core.basicmodel.concepts.TestEntity</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContextType</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContextItem</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContextItemTemplate</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContextScope</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContextType</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContextMap</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContext</class>
-        <class>org.onap.policy.apex.core.contextmodel.concepts.AxContextModel</class>
-        <class>org.onap.policy.apex.core.eventmodel.concepts.AxEventParameter</class>
-        <class>org.onap.policy.apex.core.eventmodel.concepts.AxEvent</class>
-        <class>org.onap.policy.apex.core.eventmodel.concepts.AxEvents</class>
-        <class>org.onap.policy.apex.core.eventmodel.concepts.AxEventModel</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxLogic</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxTaskParameter</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxTask</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxTasks</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxState</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxPolicy</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxPolicies</class>
-        <class>org.onap.policy.apex.core.policymodel.concepts.AxPolicyModel</class>
-        <class>org.onap.policy.apex.core.enginemodel.concepts.AxEngineStats</class>
-        <class>org.onap.policy.apex.core.enginemodel.concepts.AxEngineModel</class>
-        <class>org.onap.policy.apex.domains.aadm.concepts.ENodeBStatus</class>
-        <class>org.onap.policy.apex.domains.aadm.concepts.IMSIStatus</class>
-        <class>org.onap.policy.apex.domains.aadm.concepts.IPAddressStatus</class>
-        <class>org.onap.policy.apex.domains.adaptive.concepts.AnomalyDetection</class>
-        <class>org.onap.policy.apex.domains.adaptive.concepts.AutoLearn</class>
-        <class>org.onap.policy.apex.domains.vpn.concepts.VPNCustomer</class>
-        <class>org.onap.policy.apex.domains.vpn.concepts.VPNLink</class>
-        <class>org.onap.policy.apex.domains.vpn.concepts.VPNProblem</class>
-
-        <properties>
-            <property name="eclipselink.target-database" value="${database.target-database}" />
-            <property name="javax.persistence.jdbc.driver" value="${database.jdbc.driver}" />
-            <property name="javax.persistence.jdbc.url" value="${database.jdbc.url}" />
-            <property name="javax.persistence.jdbc.user" value="${database.jdbc.user}" />
-            <property name="javax.persistence.jdbc.password" value="${database.jdbc.password}" />
-            <property name="hibernate.dialect" value="${database.dialect}" />
-            <property name="hibernate.hbm2ddl.auto" value="create" />
-            <property name="hibernate.connection.provider_class"
-                value="org.hibernate.connection.C3P0ConnectionProvider" />
-            <property name="hibernate.temp.use_jdbc_metadata_defaults" value="false" />
-            <property name="hibernate.c3p0.max_size" value="100" />
-            <property name="hibernate.c3p0.min_size" value="0" />
-            <property name="hibernate.c3p0.acquire_increment" value="1" />
-            <property name="hibernate.c3p0.idle_test_period" value="300" />
-            <property name="hibernate.c3p0.max_statements" value="0" />
-            <property name="hibernate.c3p0.timeout" value="100" />
-        </properties>
-    </persistence-unit>
-
-</persistence>
-- 
cgit 1.2.3-korg