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>

1 files changed, 15 insertions, 25 deletions

diff --git a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java b/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java
index 063424b3d..8baa59b2f 100644
--- a/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java
+++ b/model/engine-model/src/test/java/org/onap/policy/apex/model/enginemodel/handling/ApexEngineModelTest.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2020,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.
@@ -26,11 +26,24 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
 import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
-import org.onap.policy.apex.model.basicmodel.dao.DaoParameters;
 import org.onap.policy.apex.model.basicmodel.test.TestApexModel;
 import org.onap.policy.apex.model.enginemodel.concepts.AxEngineModel;
 
 public class ApexEngineModelTest {
+    private static final String VALID_MODEL_STRING = "***validation of model successful***";
+
+    private static final String INVALID_MODEL_STRING = "\n" + "***validation of model failed***\n"
+                    + "AxArtifactKey:(name=AnEngine,version=0.0.1):"
+                    + "org.onap.policy.apex.model.enginemodel.concepts.AxEngineModel:INVALID:"
+                    + "AxEngineModel - state is UNDEFINED\n" + "********************************";
+
+    private static final String INVALID_MODEL_MALSTRUCTURED_STRING = "\n" + "***validation of model failed***\n"
+                    + "AxArtifactKey:(name=AnEngine,version=0.0.1):"
+                    + "org.onap.policy.apex.model.enginemodel.concepts.AxEngineModel:INVALID:"
+                    + "AxEngineModel - timestamp is not set\n" + "AxArtifactKey:(name=AnEngine,version=0.0.1):"
+                    + "org.onap.policy.apex.model.enginemodel.concepts.AxEngineModel:INVALID:"
+                    + "AxEngineModel - state is UNDEFINED\n" + "********************************";
+
     TestApexModel<AxEngineModel> testApexModel;
 
     /**
@@ -70,27 +83,4 @@ public class ApexEngineModelTest {
     public void testModelWriteReadJson() throws Exception {
         testApexModel.testApexModelWriteReadJson();
     }
-
-    @Test
-    public void testModelWriteReadJpa() throws Exception {
-        final DaoParameters DaoParameters = new DaoParameters();
-        DaoParameters.setPluginClass("org.onap.policy.apex.model.basicmodel.dao.impl.DefaultApexDao");
-        DaoParameters.setPersistenceUnit("DAOTest");
-
-        testApexModel.testApexModelWriteReadJpa(DaoParameters);
-    }
-
-    private static final String VALID_MODEL_STRING = "***validation of model successful***";
-
-    private static final String INVALID_MODEL_STRING = "\n" + "***validation of model failed***\n"
-                    + "AxArtifactKey:(name=AnEngine,version=0.0.1):"
-                    + "org.onap.policy.apex.model.enginemodel.concepts.AxEngineModel:INVALID:"
-                    + "AxEngineModel - state is UNDEFINED\n" + "********************************";
-
-    private static final String INVALID_MODEL_MALSTRUCTURED_STRING = "\n" + "***validation of model failed***\n"
-                    + "AxArtifactKey:(name=AnEngine,version=0.0.1):"
-                    + "org.onap.policy.apex.model.enginemodel.concepts.AxEngineModel:INVALID:"
-                    + "AxEngineModel - timestamp is not set\n" + "AxArtifactKey:(name=AnEngine,version=0.0.1):"
-                    + "org.onap.policy.apex.model.enginemodel.concepts.AxEngineModel:INVALID:"
-                    + "AxEngineModel - state is UNDEFINED\n" + "********************************";
 }