Merge "Use OperationsHistory from models"

5 files changed, 57 insertions, 57 deletions

diff --git a/controlloop/common/eventmanager/pom.xml b/controlloop/common/eventmanager/pom.xml
index 00e3c79df..aa4f8e8bb 100644
--- a/controlloop/common/eventmanager/pom.xml
+++ b/controlloop/common/eventmanager/pom.xml
@@ -105,11 +105,6 @@
         </dependency>
         <dependency>
             <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-            <artifactId>database</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
             <artifactId>guard</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
@@ -134,6 +129,11 @@
         </dependency>
         <dependency>
             <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
+            <artifactId>guard</artifactId>
+            <version>${policy.models.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
             <artifactId>vfc</artifactId>
             <version>${policy.models.version}</version>
             <scope>provided</scope>
diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java
index 2a5e64d97..d0c19ba67 100644
--- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java
+++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java
@@ -64,8 +64,8 @@ import org.onap.policy.controlloop.actor.vfc.VfcActorServiceProvider;
 import org.onap.policy.controlloop.policy.Policy;
 import org.onap.policy.controlloop.policy.PolicyResult;
 import org.onap.policy.controlloop.policy.TargetType;
-import org.onap.policy.database.operationshistory.Dbao;
 import org.onap.policy.drools.system.PolicyEngineConstants;
+import org.onap.policy.guard.OperationsHistory;
 import org.onap.policy.guard.Util;
 import org.onap.policy.sdnc.SdncResponse;
 import org.onap.policy.sdnr.PciResponseWrapper;
@@ -1093,7 +1093,7 @@ public class ControlLoopOperationManager implements Serializable {
             return;
         }
 
-        Dbao newEntry = new Dbao();
+        OperationsHistory newEntry = new OperationsHistory();
 
         newEntry.setClosedLoopName(this.onset.getClosedLoopControlName());
         newEntry.setRequestId(this.onset.getRequestId().toString());
diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/ophistory/OperationHistoryDataManagerImpl.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/ophistory/OperationHistoryDataManagerImpl.java
index 2b67865bf..741ce20f8 100644
--- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/ophistory/OperationHistoryDataManagerImpl.java
+++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/ophistory/OperationHistoryDataManagerImpl.java
@@ -39,7 +39,7 @@ import org.onap.policy.common.utils.jpa.EntityMgrCloser;
 import org.onap.policy.common.utils.jpa.EntityTransCloser;
 import org.onap.policy.controlloop.ControlLoopOperation;
 import org.onap.policy.controlloop.VirtualControlLoopEvent;
-import org.onap.policy.database.operationshistory.Dbao;
+import org.onap.policy.guard.OperationsHistory;
 import org.onap.policy.guard.Util;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -261,15 +261,15 @@ public class OperationHistoryDataManagerImpl implements OperationHistoryDataMana
 
         logger.info("store operation history record for {}", event.getRequestId());
 
-        List<Dbao> results =
-            entityMgr.createQuery("select e from Dbao e"
+        List<OperationsHistory> results =
+            entityMgr.createQuery("select e from OperationsHistory e"
                         + " where e.closedLoopName= ?1"
                         + " and e.requestId= ?2"
                         + " and e.subrequestId= ?3"
                         + " and e.actor= ?4"
                         + " and e.operation= ?5"
                         + " and e.target= ?6",
-                        Dbao.class)
+                        OperationsHistory.class)
                 .setParameter(1, event.getClosedLoopControlName())
                 .setParameter(2, record.getRequestId())
                 .setParameter(3, operation.getSubRequestId())
@@ -282,7 +282,7 @@ public class OperationHistoryDataManagerImpl implements OperationHistoryDataMana
             logger.warn("unexpected operation history record count {} for {}", results.size(), event.getRequestId());
         }
 
-        Dbao entry = (results.isEmpty() ? new Dbao() : results.get(0));
+        OperationsHistory entry = (results.isEmpty() ? new OperationsHistory() : results.get(0));
 
         entry.setClosedLoopName(event.getClosedLoopControlName());
         entry.setRequestId(record.getRequestId());
diff --git a/controlloop/common/eventmanager/src/main/resources/META-INF/persistence.xml b/controlloop/common/eventmanager/src/main/resources/META-INF/persistence.xml
index 210e22f27..c3c633674 100644
--- a/controlloop/common/eventmanager/src/main/resources/META-INF/persistence.xml
+++ b/controlloop/common/eventmanager/src/main/resources/META-INF/persistence.xml
@@ -3,7 +3,7 @@
   ============LICENSE_START=======================================================
   drools-applications
   ================================================================================
-  Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
   transaction-type="RESOURCE_LOCAL">
   <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
 
-  <class>org.onap.policy.database.operationshistory.Dbao</class>
+  <class>org.onap.policy.guard.OperationsHistory</class>
 
   <properties>
    <property name="eclipselink.ddl-generation" value="create-or-extend-tables" />
diff --git a/controlloop/common/eventmanager/src/test/resources/META-INF/persistence.xml b/controlloop/common/eventmanager/src/test/resources/META-INF/persistence.xml
index 4d47751bf..917f8aad3 100644
--- a/controlloop/common/eventmanager/src/test/resources/META-INF/persistence.xml
+++ b/controlloop/common/eventmanager/src/test/resources/META-INF/persistence.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-  ============LICENSE_START=======================================================

-  drools-applications

-  ================================================================================

-  Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.

-  ================================================================================

-  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.

-  ============LICENSE_END=========================================================

-  -->

-<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">

-

-    <!-- In-mem DB for junit -->

-    <persistence-unit name="OperationsHistoryPUTest" transaction-type="RESOURCE_LOCAL">

-        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>

-

-        <class>org.onap.policy.database.operationshistory.Dbao</class>

-

-        <properties>

-            <property name="eclipselink.ddl-generation" value="create-tables" />

-            <property name="eclipselink.logging.level" value="INFO" />

-            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" />

-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />

-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:testdb;DATABASE_TO_UPPER=FALSE" />

-            <property name="javax.persistence.jdbc.user" value="policy" />

-            <property name="javax.persistence.jdbc.password" value="P01icY" />

-            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create" />

-            <property name="javax.persistence.schema-generation.create-source" value="metadata" />

-        </properties>

-    </persistence-unit>

-

-</persistence>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  drools-applications
+  ================================================================================
+  Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved.
+  ================================================================================
+  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.
+  ============LICENSE_END=========================================================
+  -->
+<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">
+
+    <!-- In-mem DB for junit -->
+    <persistence-unit name="OperationsHistoryPUTest" 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="INFO" />
+            <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" />
+            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />
+            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:testdb;DATABASE_TO_UPPER=FALSE" />
+            <property name="javax.persistence.jdbc.user" value="policy" />
+            <property name="javax.persistence.jdbc.password" value="P01icY" />
+            <property name="javax.persistence.schema-generation.database.action" value="drop-and-create" />
+            <property name="javax.persistence.schema-generation.create-source" value="metadata" />
+        </properties>
+    </persistence-unit>
+
+</persistence>