Move PAP database provider to spring boot default

This review makes PAP talk to DB directly using the spring repositories
instead of going to policy-models-provider.
The models-provider methods that were just used by PAP (and not used
anymore) will be removed in a different review.
Also a bug identified with the usage of GeneratedValue in
PfGeneratedIdKey (which is just used by PAP in statistics & audit) will
also be fixed in a separate review as part of POLICY-3897.

CSIT changes: https://gerrit.onap.org/r/c/policy/docker/+/127033
WIP OOM review: https://gerrit.onap.org/r/c/oom/+/127035

Change-Id: Idb13ba7eb2767cc718672b582a6518fcfc95320f
Issue-ID: POLICY-3867
Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>

1 files changed, 2 insertions, 10 deletions

diff --git a/main/src/test/java/org/onap/policy/pap/main/comm/CommonRequestBase.java b/main/src/test/java/org/onap/policy/pap/main/comm/CommonRequestBase.java
index 0dc6636b..dd206062 100644
--- a/main/src/test/java/org/onap/policy/pap/main/comm/CommonRequestBase.java
+++ b/main/src/test/java/org/onap/policy/pap/main/comm/CommonRequestBase.java
@@ -4,6 +4,7 @@
  * ================================================================================
  * Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
  * Modifications Copyright (C) 2021 Nordix Foundation.
+ * Modifications Copyright (C) 2022 Bell Canada. 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.
@@ -43,10 +44,8 @@ import org.onap.policy.models.pdp.concepts.PdpStateChange;
 import org.onap.policy.models.pdp.concepts.PdpStatus;
 import org.onap.policy.models.pdp.concepts.PdpUpdate;
 import org.onap.policy.models.pdp.enums.PdpState;
-import org.onap.policy.models.provider.PolicyModelsProvider;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
 import org.onap.policy.pap.main.PapConstants;
-import org.onap.policy.pap.main.PolicyModelsProviderFactoryWrapper;
 import org.onap.policy.pap.main.comm.msgdata.RequestListener;
 import org.onap.policy.pap.main.comm.msgdata.StateChangeReq;
 import org.onap.policy.pap.main.comm.msgdata.UpdateReq;
@@ -84,8 +83,6 @@ public class CommonRequestBase {
     protected TimerManager.Timer timer;
     protected Queue<QueueToken<PdpMessage>> queue;
     protected RequestListener listener;
-    protected PolicyModelsProviderFactoryWrapper daoFactory;
-    protected PolicyModelsProvider dao;
     protected RequestParams reqParams;
     protected PdpModifyRequestMapParams mapParams;
 
@@ -105,9 +102,6 @@ public class CommonRequestBase {
         timer = mock(TimerManager.Timer.class);
         queue = new LinkedList<>();
         listener = mock(RequestListener.class);
-        daoFactory = mock(PolicyModelsProviderFactoryWrapper.class);
-        dao = mock(PolicyModelsProvider.class);
-
         PdpParameters pdpParams = mock(PdpParameters.class);
 
         doAnswer(new Answer<Object>() {
@@ -120,8 +114,6 @@ public class CommonRequestBase {
 
         when(timers.register(any(), any())).thenReturn(timer);
 
-        when(daoFactory.create()).thenReturn(dao);
-
         PdpStateChangeParameters stateParams = mock(PdpStateChangeParameters.class);
         when(stateParams.getMaxRetryCount()).thenReturn(RETRIES);
         when(pdpParams.getStateChangeParameters()).thenReturn(stateParams);
@@ -134,7 +126,7 @@ public class CommonRequestBase {
                         .setResponseDispatcher(dispatcher).setTimers(timers);
 
         mapParams = PdpModifyRequestMapParams.builder().modifyLock(lock).pdpPublisher(publisher)
-                        .policyNotifier(notifier).responseDispatcher(dispatcher).daoFactory(daoFactory)
+                        .responseDispatcher(dispatcher)
                         .updateTimers(timers).stateChangeTimers(timers).params(pdpParams)
                         .maxPdpAgeMs(100).build();
     }