From 1e39c988604c9ffb8efc38ef3cf4d635b202c7b9 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Fri, 29 May 2020 11:59:53 -0400 Subject: Use OperationsHistory from models Deleted Dbao and replaced it with the shared class in policy-models. Also had to update the queries and the persistence.xml accordingly. Note: with this change, the "database" project is no longer needed, so it was deleted. Issue-ID: POLICY-2581 Change-Id: Idfde68b28b3a27f2ee794fa477d15e0f12717373 Signed-off-by: Jim Hahn --- .../controlloop/eventmanager/ControlLoopOperationManager.java | 4 ++-- .../controlloop/ophistory/OperationHistoryDataManagerImpl.java | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'controlloop/common/eventmanager/src/main/java') 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 results = - entityMgr.createQuery("select e from Dbao e" + List 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()); -- cgit 1.2.3-korg