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>

11 files changed, 1 insertions, 827 deletions

diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/pom.xml b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/pom.xml
deleted file mode 100644
index 8df1b8168..000000000
--- a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2018 Ericsson. 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.
-
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.onap.policy.apex-pdp.plugins.plugins-persistence.plugins-persistence-jpa</groupId>
-        <artifactId>plugins-persistence-jpa</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
-    </parent>
-    <artifactId>plugins-persistence-jpa-eclipselink</artifactId>
-    <name>${project.artifactId}</name>
-    <description>[${project.parent.artifactId}] Plugin for persistence using EclipseLink</description>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/main/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/EclipselinkApexDao.java b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/main/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/EclipselinkApexDao.java
deleted file mode 100644
index e0bce2dd6..000000000
--- a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/main/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/EclipselinkApexDao.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.plugins.persistence.jpa.eclipselink;
-
-import org.onap.policy.apex.model.basicmodel.dao.impl.DefaultApexDao;
-
-/**
- * The Class EclipselinkApexDao is the EclipseLink JPA implementation. It just uses the standard Apex JPA
- * implementation.
- *
- * @author Sergey Sachkov (sergey.sachkov@ericsson.com)
- */
-public class EclipselinkApexDao extends DefaultApexDao {
-}
diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/main/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/package-info.java b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/main/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/package-info.java
deleted file mode 100644
index f58e5fc76..000000000
--- a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/main/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/package-info.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-/**
- * Provides the <a href="http://www.eclipse.org/eclipselink/">EclipseLink</a> implementation on the APEX DAO for
- * persistence over <a href="https://en.wikipedia.org/wiki/Java_Database_Connectivity">JDBC</a>.
- *
- * @author Liam Fallon (liam.fallon@ericsson.com)
- */
-
-package org.onap.policy.apex.plugins.persistence.jpa.eclipselink;
diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/EclipselinkApexDaoTest.java b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/EclipselinkApexDaoTest.java
deleted file mode 100644
index 4f3c68b0f..000000000
--- a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/EclipselinkApexDaoTest.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020 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=========================================================
- */
-
-package org.onap.policy.apex.plugins.persistence.jpa.eclipselink;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
-import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
-import org.onap.policy.apex.model.basicmodel.dao.DaoParameters;
-import org.onap.policy.apex.plugins.persistence.jpa.eclipselink.entities.ArtifactKeyTestEntity;
-import org.onap.policy.apex.plugins.persistence.jpa.eclipselink.entities.ReferenceKeyTestEntity;
-
-/**
- * Junit tests for class EclipselinkApexDao.
- *
- * @author Dinh Danh Le (dinh.danh.le@ericsson.com)
- *
- */
-
-public class EclipselinkApexDaoTest {
-
-    private static final List<AxArtifactKey> TEST_ARTIKEYS = Arrays.asList(new AxArtifactKey[]
-        { new AxArtifactKey("ABC", "0.0.1"), new AxArtifactKey("DEF", "0.1.1"), new AxArtifactKey("XYZ", "1.1.1") });
-
-    private final DaoParameters daoParameters = new DaoParameters();
-
-    private EclipselinkApexDao eclipselinkApexDao = null;
-
-    /**
-     * Setup the tests.
-     *
-     * @throws ApexException Exceptions from test setup
-     */
-    @Before
-    public void setup() throws ApexException {
-        daoParameters.setPluginClass(EclipselinkApexDao.class.getName());
-        daoParameters.setPersistenceUnit("DAOTest");
-        eclipselinkApexDao = new EclipselinkApexDao();
-        eclipselinkApexDao.init(daoParameters);
-    }
-
-    @After
-    public void teardown() {
-        eclipselinkApexDao.close();
-    }
-
-    @Test
-    public void test_NullArguments() {
-        final AxArtifactKey nullArtifactKey = null;
-        final AxArtifactKey nullRefernceKey = null;
-        final List<Object> emptyList = Collections.emptyList();
-
-        assertNull(eclipselinkApexDao.getArtifact(null, nullArtifactKey));
-        assertNull(eclipselinkApexDao.getArtifact(ArtifactKeyTestEntity.class, nullArtifactKey));
-
-        assertNull(eclipselinkApexDao.getArtifact(null, nullRefernceKey));
-        assertNull(eclipselinkApexDao.getArtifact(ReferenceKeyTestEntity.class, nullRefernceKey));
-
-        assertNotNull(eclipselinkApexDao.getAll(null));
-        assertEquals(emptyList, eclipselinkApexDao.getAll(null));
-        assertNotNull(eclipselinkApexDao.getAll(ReferenceKeyTestEntity.class));
-    }
-
-    @Test
-    public void test_createObject() throws ApexException {
-        // create 3 more entities from testArtiKeys
-        for (final AxArtifactKey akey : TEST_ARTIKEYS) {
-            eclipselinkApexDao.create(new ReferenceKeyTestEntity(new AxReferenceKey(akey), Math.random()));
-        }
-        assertEquals(3, eclipselinkApexDao.getAll(ReferenceKeyTestEntity.class).size());
-    }
-
-    @Test
-    public void test_getAll() {
-        // create a list of three entities from testArtiKeys
-        final double[] genDoubleVals = new double[TEST_ARTIKEYS.size()];
-
-        for (int i = 0; i < TEST_ARTIKEYS.size(); i++) {
-            final AxArtifactKey akey = TEST_ARTIKEYS.get(i);
-            genDoubleVals[i] = Math.random();
-            eclipselinkApexDao.create(new ReferenceKeyTestEntity(new AxReferenceKey(akey), genDoubleVals[i]));
-        }
-
-        final List<ReferenceKeyTestEntity> ret = eclipselinkApexDao.getAll(ReferenceKeyTestEntity.class);
-        assertEquals(TEST_ARTIKEYS.size(), ret.size());
-
-        for (int i = 0; i < TEST_ARTIKEYS.size(); i++) {
-            final ReferenceKeyTestEntity e = ret.get(i);
-            assertEquals(TEST_ARTIKEYS.get(i), e.getKey().getParentArtifactKey());
-            assertEquals(genDoubleVals[i], e.getDoubleValue(), 0.0);
-        }
-    }
-
-    @Test
-    public void test_getArtifactByReferenceKey() {
-        final AxArtifactKey artifactKey = new AxArtifactKey("XXX", "0.0.1");
-        final AxReferenceKey referenceKey = new AxReferenceKey(artifactKey, "Entity1");
-
-        // assert null if Entity Class is null
-        assertNull(eclipselinkApexDao.getArtifact(null, referenceKey));
-
-        // create PersistenceContext with an entity
-        eclipselinkApexDao.create(new ReferenceKeyTestEntity(referenceKey, 1.0));
-        // assert null when trying to find an entity with an unknown key
-        final AxArtifactKey anotherArtifactKey = new AxArtifactKey("YYY", "0.0.2");
-        final AxReferenceKey anotherReferenceKey = new AxReferenceKey(anotherArtifactKey);
-
-        assertNull(eclipselinkApexDao.getArtifact(ReferenceKeyTestEntity.class, anotherReferenceKey));
-
-        // assert return only one entity when finding an entity with correct key
-        final ReferenceKeyTestEntity retEntity = eclipselinkApexDao.getArtifact(ReferenceKeyTestEntity.class,
-                        referenceKey);
-        assertEquals(referenceKey, retEntity.getKey());
-    }
-
-    @Test
-    public void test_getArtifactByArtifactKey() {
-        final AxArtifactKey artifactKey = new AxArtifactKey("XXX", "0.0.1");
-        // assert null if either Entity Class is null
-        assertNull(eclipselinkApexDao.getArtifact(null, artifactKey));
-        // create an entity
-        eclipselinkApexDao.create(new ArtifactKeyTestEntity(artifactKey, 1.0));
-
-        // assert null when trying to find an entity with an unknown key
-        final AxArtifactKey otherArtifactKey = new AxArtifactKey("YYY", "0.0.2");
-        assertNull(eclipselinkApexDao.getArtifact(ArtifactKeyTestEntity.class, otherArtifactKey));
-
-        // assert return only one entity when finding an entity with correct key
-        final ArtifactKeyTestEntity retEntity = eclipselinkApexDao.getArtifact(ArtifactKeyTestEntity.class,
-                        artifactKey);
-        assertNotNull(retEntity);
-        assertEquals(artifactKey, retEntity.getKey());
-    }
-
-    @Test
-    public void test_deleteByArtifactKey() {
-        // initialize a list of (3) entities corresponding to the list of testArtiKeys
-        for (final AxArtifactKey akey : TEST_ARTIKEYS) {
-            eclipselinkApexDao.create(new ArtifactKeyTestEntity(akey, Math.random()));
-        }
-        // create one more entity
-        final ArtifactKeyTestEntity entity = new ArtifactKeyTestEntity(new AxArtifactKey("XYZ", "100.0.0"), 100.0);
-        eclipselinkApexDao.create(entity);
-
-        assertEquals(3, eclipselinkApexDao.deleteByArtifactKey(ArtifactKeyTestEntity.class, TEST_ARTIKEYS));
-
-        // after deleteByArtifactKey()--> getAll().size() == 1
-        final List<ArtifactKeyTestEntity> remainingEntities = eclipselinkApexDao.getAll(ArtifactKeyTestEntity.class);
-        assertEquals(1, remainingEntities.size());
-        // more details about the remainingEntities
-        assertEquals(100.0, remainingEntities.get(0).getDoubleValue(), 0.0);
-    }
-
-    @Test
-    public void test_deleteByReferenceKey() {
-        // prepare 2 AxArtifactKeys
-        final AxArtifactKey owner0Key = new AxArtifactKey("Owner0", "0.0.1");
-        final AxArtifactKey owner1Key = new AxArtifactKey("Owner1", "0.0.1");
-
-        // prepare a list of (3) AxReferenceKeys corresponding to owner0Key
-        final List<AxReferenceKey> refKey0s = Arrays.asList(new AxReferenceKey[] {
-            new AxReferenceKey(owner0Key, "Entity01"),
-            new AxReferenceKey(owner0Key, "Entity02"),
-            new AxReferenceKey(owner0Key, "Entity03")
-        });
-
-        // prepare 2 more AxReferenceKeys corresponding to owner1Key
-        final AxReferenceKey refKey11 = new AxReferenceKey(owner1Key, "Entity11");
-        final AxReferenceKey refKey12 = new AxReferenceKey(owner1Key, "Entity12");
-
-        // create a list of 5 entities
-        eclipselinkApexDao.create(new ReferenceKeyTestEntity(refKey0s.get(0), 101.0));
-        eclipselinkApexDao.create(new ReferenceKeyTestEntity(refKey0s.get(1), 102.0));
-        eclipselinkApexDao.create(new ReferenceKeyTestEntity(refKey0s.get(2), 103.0));
-        eclipselinkApexDao.create(new ReferenceKeyTestEntity(refKey11, 104.0));
-        eclipselinkApexDao.create(new ReferenceKeyTestEntity(refKey12, 105.0));
-
-        // assert 3 entities are deleted by this deletion
-        assertEquals(3, eclipselinkApexDao.deleteByReferenceKey(ReferenceKeyTestEntity.class, refKey0s));
-        // after deletion, make sure getAll().size() == 2
-        assertEquals(2, eclipselinkApexDao.getAll(ReferenceKeyTestEntity.class).size());
-    }
-
-    @Test
-    public void test_deleteAll() {
-        // initialize a list of (3) entities and add to the PersistenceContext
-        for (final AxArtifactKey akey : TEST_ARTIKEYS) {
-            eclipselinkApexDao.create(new ReferenceKeyTestEntity(new AxReferenceKey(akey), Math.random()));
-        }
-        // before deleteAll()--> getAll().size() == 3
-        assertEquals(3, eclipselinkApexDao.getAll(ReferenceKeyTestEntity.class).size());
-        eclipselinkApexDao.deleteAll(ReferenceKeyTestEntity.class);
-        // after deleteAll()--> getAll().size() == 0
-        assertEquals(0, eclipselinkApexDao.getAll(ReferenceKeyTestEntity.class).size());
-    }
-
-    @Test
-    public void test_getAllByArtifactKey() {
-
-        final AxArtifactKey artiKey0 = new AxArtifactKey("XYZA", "0.1.2");
-        final AxArtifactKey artiKey1 = new AxArtifactKey("ONAP", "0.0.1");
-
-        final AxReferenceKey refKey0 = new AxReferenceKey(artiKey0, "Entity0");
-        final AxReferenceKey refKey1 = new AxReferenceKey(artiKey1, "Entity1");
-
-        // test with null class with known key --> return an empty list
-        assertNotNull(eclipselinkApexDao.getAll(null, artiKey1));
-        assertEquals(Collections.emptyList(), eclipselinkApexDao.getAll(null, artiKey1));
-
-        // test with (not_null) ArtifactKeyTestEntity class
-        assertEquals(0, eclipselinkApexDao.getAll(ReferenceKeyTestEntity.class, artiKey0).size());
-        // create 2 entities
-        eclipselinkApexDao.create(new ReferenceKeyTestEntity(refKey0, 100.0));
-        eclipselinkApexDao.create(new ReferenceKeyTestEntity(refKey0, 200.0));
-        eclipselinkApexDao.create(new ReferenceKeyTestEntity(refKey1, 100.0));
-
-        final List<ReferenceKeyTestEntity> ret = eclipselinkApexDao.getAll(ReferenceKeyTestEntity.class, artiKey0);
-        assertEquals(1, ret.size());
-        final ReferenceKeyTestEntity retEntity = ret.get(0);
-        assertEquals(200.0, retEntity.getDoubleValue(), 0);
-    }
-
-}
diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/entities/ArtifactKeyTestEntity.java b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/entities/ArtifactKeyTestEntity.java
deleted file mode 100644
index 98a4c5738..000000000
--- a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/entities/ArtifactKeyTestEntity.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- *  Modifications Copyright (C) 2021 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.plugins.persistence.jpa.eclipselink.entities;
-
-import java.util.Arrays;
-import java.util.List;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlElement;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-import org.apache.commons.lang3.builder.CompareToBuilder;
-import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
-import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
-import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
-import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
-
-/**
- * The Class ArtifactKeyTestEntity is an entity for testing artifact keys.
- */
-@Entity
-@Table(name = "ArtifactKeyTestEntity")
-@Getter
-@Setter
-@ToString
-@EqualsAndHashCode(callSuper = false)
-public class ArtifactKeyTestEntity extends AxConcept {
-    private static final long serialVersionUID = -2962570563281067896L;
-
-    @EmbeddedId()
-    @XmlElement(name = "key", required = true)
-    protected AxArtifactKey key;
-
-    private double doubleValue;
-
-    /**
-     * Instantiates a new artifact key test entity.
-     */
-    public ArtifactKeyTestEntity() {
-        this.key = new AxArtifactKey();
-        this.doubleValue = 0;
-    }
-
-    /**
-     * Instantiates a new artifact key test entity.
-     *
-     * @param doubleValue the double value
-     */
-    public ArtifactKeyTestEntity(final Double doubleValue) {
-        this.key = new AxArtifactKey();
-        this.doubleValue = doubleValue;
-    }
-
-    /**
-     * Instantiates a new artifact key test entity.
-     *
-     * @param key the key
-     * @param doubleValue the double value
-     */
-    public ArtifactKeyTestEntity(final AxArtifactKey key, final Double doubleValue) {
-        this.key = key;
-        this.doubleValue = doubleValue;
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public List<AxKey> getKeys() {
-        return Arrays.asList((AxKey) getKey());
-    }
-
-    /**
-     * Check set key.
-     *
-     * @return true, if successful
-     */
-    public boolean checkSetKey() {
-        return (this.key != null);
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public AxValidationResult validate(final AxValidationResult result) {
-        return key.validate(result);
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public void clean() {
-        key.clean();
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public AxConcept copyTo(final AxConcept target) {
-        final Object copyObject = ((target == null) ? new ArtifactKeyTestEntity() : target);
-        if (copyObject instanceof ArtifactKeyTestEntity) {
-            final ArtifactKeyTestEntity copy = ((ArtifactKeyTestEntity) copyObject);
-            if (this.checkSetKey()) {
-                copy.setKey(new AxArtifactKey(key));
-            } else {
-                copy.key = null;
-            }
-            copy.doubleValue = doubleValue;
-            return copy;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public int compareTo(final AxConcept otherObj) {
-        if (otherObj == null) {
-            return -1;
-        }
-        if (this == otherObj) {
-            return 0;
-        }
-        if (getClass() != otherObj.getClass()) {
-            return -1;
-        }
-        final ArtifactKeyTestEntity other = (ArtifactKeyTestEntity) otherObj;
-        return new CompareToBuilder()
-                        .append(key, other.key)
-                        .append(doubleValue, other.doubleValue)
-                        .toComparison();
-    }
-}
diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/entities/ReferenceKeyTestEntity.java b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/entities/ReferenceKeyTestEntity.java
deleted file mode 100644
index cadc9b8db..000000000
--- a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/entities/ReferenceKeyTestEntity.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- *  Modifications Copyright (C) 2021 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.plugins.persistence.jpa.eclipselink.entities;
-
-import java.util.Arrays;
-import java.util.List;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-import org.apache.commons.lang3.builder.CompareToBuilder;
-import org.onap.policy.apex.model.basicmodel.concepts.AxConcept;
-import org.onap.policy.apex.model.basicmodel.concepts.AxKey;
-import org.onap.policy.apex.model.basicmodel.concepts.AxReferenceKey;
-import org.onap.policy.apex.model.basicmodel.concepts.AxValidationResult;
-import org.onap.policy.apex.model.basicmodel.xml.AxReferenceKeyAdapter;
-
-/**
- * The Class ReferenceKeyTestEntity provides a reference key test concept.
- */
-@Entity
-@Table(name = "ReferenceKeyTestEntity")
-@Getter
-@Setter
-@ToString
-@EqualsAndHashCode(callSuper = false)
-public class ReferenceKeyTestEntity extends AxConcept {
-    private static final long serialVersionUID = -2962570563281067895L;
-
-    @EmbeddedId()
-    @XmlElement(name = "key", required = true)
-    @XmlJavaTypeAdapter(AxReferenceKeyAdapter.class)
-    protected AxReferenceKey key;
-
-    private double doubleValue;
-
-    /**
-     * Instantiates a new reference key test entity.
-     */
-    public ReferenceKeyTestEntity() {
-        this.key = new AxReferenceKey();
-        this.doubleValue = 0;
-    }
-
-    /**
-     * Instantiates a new reference key test entity.
-     *
-     * @param doubleValue the double value
-     */
-    public ReferenceKeyTestEntity(final Double doubleValue) {
-        this.key = new AxReferenceKey();
-        this.doubleValue = doubleValue;
-    }
-
-    /**
-     * Instantiates a new reference key test entity.
-     *
-     * @param key the key
-     * @param doubleValue the double value
-     */
-    public ReferenceKeyTestEntity(final AxReferenceKey key, final Double doubleValue) {
-        this.key = key;
-        this.doubleValue = doubleValue;
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public List<AxKey> getKeys() {
-        return Arrays.asList((AxKey) getKey());
-    }
-
-    /**
-     * Check set key.
-     *
-     * @return true, if successful
-     */
-    public boolean checkSetKey() {
-        return (this.key != null);
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public AxValidationResult validate(final AxValidationResult result) {
-        return key.validate(result);
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public void clean() {
-        key.clean();
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public AxConcept copyTo(final AxConcept target) {
-        final Object copyObject = ((target == null) ? new ReferenceKeyTestEntity() : target);
-        if (copyObject instanceof ReferenceKeyTestEntity) {
-            final ReferenceKeyTestEntity copy = ((ReferenceKeyTestEntity) copyObject);
-            if (this.checkSetKey()) {
-                copy.setKey(new AxReferenceKey(key));
-            } else {
-                copy.key = null;
-            }
-            copy.doubleValue = doubleValue;
-            return copy;
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Override
-    public int compareTo(final AxConcept otherObj) {
-        if (otherObj == null) {
-            return -1;
-        }
-        if (this == otherObj) {
-            return 0;
-        }
-        if (getClass() != otherObj.getClass()) {
-            return -1;
-        }
-        final ReferenceKeyTestEntity other = (ReferenceKeyTestEntity) otherObj;
-        return new CompareToBuilder()
-                        .append(key, other.key)
-                        .append(doubleValue, other.doubleValue)
-                        .toComparison();
-    }
-}
diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/entities/package-info.java b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/entities/package-info.java
deleted file mode 100644
index b30d40559..000000000
--- a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/java/org/onap/policy/apex/plugins/persistence/jpa/eclipselink/entities/package-info.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 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=========================================================
- */
-
-/**
- * Contains common test entities.
- */
-package org.onap.policy.apex.plugins.persistence.jpa.eclipselink.entities;
diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/resources/META-INF/persistence.xml b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/resources/META-INF/persistence.xml
deleted file mode 100644
index 3f8be58e4..000000000
--- a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/test/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2018 Ericsson. 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.
-  
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-<!-- This is to configure H2-IMDB using EclipseLink JPA-->
-
-<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="2.0">
-    <persistence-unit name="DAOTest" transaction-type="RESOURCE_LOCAL">
-        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-
-        <class>org.onap.policy.apex.plugins.persistence.jpa.eclipselink.entities.ReferenceKeyTestEntity</class>
-        <class>org.onap.policy.apex.plugins.persistence.jpa.eclipselink.entities.ArtifactKeyTestEntity</class>
-
-        <properties>
-            <property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test" />
-            <property name="javax.persistence.jdbc.user" value="sa" />
-            <property name="javax.persistence.jdbc.password" value="" />
-            <property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
-            <property name="eclipselink.ddl-generation.output-mode" value="database" />
-            <property name="eclipselink.logging.level" value="INFO" />
-        </properties>
-    </persistence-unit>
-</persistence>
\ No newline at end of file
diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/pom.xml b/plugins/plugins-persistence/plugins-persistence-jpa/pom.xml
deleted file mode 100644
index 647c3e03a..000000000
--- a/plugins/plugins-persistence/plugins-persistence-jpa/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2018 Ericsson. 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.
-
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.onap.policy.apex-pdp.plugins.plugins-persistence</groupId>
-        <artifactId>plugins-persistence</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.onap.policy.apex-pdp.plugins.plugins-persistence.plugins-persistence-jpa</groupId>
-    <artifactId>plugins-persistence-jpa</artifactId>
-    <packaging>pom</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>Plugins for 3pps that handle persistence over JPA</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.onap.policy.apex-pdp.model</groupId>
-            <artifactId>basic-model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <modules>
-        <module>plugins-persistence-jpa-eclipselink</module>
-    </modules>
-</project>
diff --git a/plugins/plugins-persistence/pom.xml b/plugins/plugins-persistence/pom.xml
deleted file mode 100644
index 4e16478eb..000000000
--- a/plugins/plugins-persistence/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2018 Ericsson. 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.
-
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.onap.policy.apex-pdp.plugins</groupId>
-        <artifactId>plugins</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.onap.policy.apex-pdp.plugins.plugins-persistence</groupId>
-    <artifactId>plugins-persistence</artifactId>
-    <packaging>pom</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>Plugins for 3pps that implement persistence</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>42.2.14</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <modules>
-        <module>plugins-persistence-jpa</module>
-    </modules>
-</project>
\ No newline at end of file
diff --git a/plugins/pom.xml b/plugins/pom.xml
index b1ef1fac6..b30bf65af 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -1,7 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
-   Modifications Copyright (C) 2021 Nordix Foundation.
+   Modifications Copyright (C) 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.
@@ -42,6 +42,5 @@
         <module>plugins-context</module>
         <module>plugins-event</module>
         <module>plugins-executor</module>
-        <module>plugins-persistence</module>
     </modules>
 </project>