Removed db-based statistics feature

Statistics code cleanup

Issue-ID: POLICY-4109
Change-Id: I4b94d8c0c9b0ff68569c5861f8797920efe67b17
Signed-off-by: Suresh Charan <suresh.charan@bell.ca>

5 files changed, 2 insertions, 391 deletions

diff --git a/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/PdpStatisticsTest.java b/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/PdpStatisticsTest.java
deleted file mode 100644
index 001c80b7f..000000000
--- a/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/PdpStatisticsTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * ONAP Policy Models
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2020-2021 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.models.pdp.concepts;
-
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-
-import java.time.Instant;
-import java.util.ArrayList;
-import org.junit.Test;
-
-public class PdpStatisticsTest {
-
-    @Test
-    public void testCopyConstructor() {
-        assertThatThrownBy(() -> new PdpStatistics(null)).hasMessageContaining("source");
-
-        PdpStatistics orig = createPdpStatistics();
-        PdpStatistics copied = new PdpStatistics(orig);
-        assertEquals(orig, copied);
-    }
-
-    private PdpStatistics createPdpStatistics() {
-        PdpStatistics pdpStat = new PdpStatistics();
-        pdpStat.setPdpInstanceId("PDP0");
-        pdpStat.setPdpGroupName("PDPGroup0");
-        pdpStat.setPdpSubGroupName("PDPSubGroup0");
-        pdpStat.setTimeStamp(Instant.EPOCH);
-        pdpStat.setPolicyExecutedCount(9);
-        pdpStat.setPolicyExecutedSuccessCount(4);
-        pdpStat.setPolicyExecutedFailCount(5);
-        pdpStat.setPolicyDeployCount(3);
-        pdpStat.setPolicyDeploySuccessCount(1);
-        pdpStat.setPolicyDeployFailCount(2);
-        pdpStat.setPolicyUndeployCount(4);
-        pdpStat.setPolicyUndeploySuccessCount(3);
-        pdpStat.setPolicyUndeployFailCount(1);
-        pdpStat.setEngineStats(new ArrayList<>());
-        return pdpStat;
-    }
-}
diff --git a/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/PdpStatusTest.java b/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/PdpStatusTest.java
index 90b8d43c7..07afd4098 100644
--- a/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/PdpStatusTest.java
+++ b/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/PdpStatusTest.java
@@ -4,6 +4,7 @@
  * ================================================================================
  * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
  * Modifications Copyright (C) 2020-2021 Nordix Foundation.
+ * Modifications Copyright (C) 2023 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.
@@ -61,11 +62,6 @@ public class PdpStatusTest {
         orig.setResponse(resp);
         orig.setState(PdpState.SAFE);
 
-        final PdpStatistics stats = new PdpStatistics();
-        stats.setPdpInstanceId("my-pdp-id");
-
-        orig.setStatistics(stats);
-
         assertEquals(removeVariableFields(orig.toString()), removeVariableFields(new PdpStatus(orig).toString()));
     }
 }
diff --git a/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpStatisticsTest.java b/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpStatisticsTest.java
deleted file mode 100644
index 505e3f685..000000000
--- a/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpStatisticsTest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019-2021 Nordix Foundation.
- *  Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
- *  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.
- * 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.models.pdp.persistence.concepts;
-
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.time.Instant;
-import java.util.ArrayList;
-import org.junit.Test;
-import org.onap.policy.models.pdp.concepts.PdpStatistics;
-
-/**
- * Test the {@link JpaPdpStatistics} class.
- */
-public class JpaPdpStatisticsTest {
-
-    @Test
-    public void testConstructor() {
-
-        assertThatThrownBy(() -> new JpaPdpStatistics((JpaPdpStatistics) null)).hasMessageContaining("copyConcept");
-
-        assertThatThrownBy(() -> new JpaPdpStatistics((PdpStatistics) null)).hasMessageContaining("authorativeConcept");
-
-        assertNotNull(new JpaPdpStatistics());
-
-        PdpStatistics pdpStat = createPdpStatistics();
-        JpaPdpStatistics jpaPdpStat = new JpaPdpStatistics(createPdpStatistics());
-        checkEquals(pdpStat, jpaPdpStat);
-
-        JpaPdpStatistics jpaPdpStat2 = new JpaPdpStatistics(jpaPdpStat);
-        assertEquals(0, jpaPdpStat2.compareTo(jpaPdpStat));
-    }
-
-    @Test
-    public void testFromAuthorative() {
-        PdpStatistics pdpStat = createPdpStatistics();
-        JpaPdpStatistics jpaPdpStat = new JpaPdpStatistics();
-        jpaPdpStat.fromAuthorative(pdpStat);
-        checkEquals(pdpStat, jpaPdpStat);
-    }
-
-    @Test
-    public void testToAuthorative() {
-        PdpStatistics pdpStat = createPdpStatistics();
-        JpaPdpStatistics jpaPdpStat = new JpaPdpStatistics(pdpStat);
-        PdpStatistics toPdpStat = jpaPdpStat.toAuthorative();
-        assertEquals(pdpStat, toPdpStat);
-    }
-
-    @Test
-    public void testCompareTo() {
-        PdpStatistics pdpStat = createPdpStatistics();
-        JpaPdpStatistics jpaPdpStat1 = new JpaPdpStatistics(pdpStat);
-        assertEquals(-1, jpaPdpStat1.compareTo(null));
-
-        JpaPdpStatistics jpaPdpStat2 = new JpaPdpStatistics(pdpStat);
-        assertEquals(0, jpaPdpStat1.compareTo(jpaPdpStat2));
-
-        PdpStatistics pdpStat3 = createPdpStatistics();
-        pdpStat3.setPdpInstanceId("PDP3");
-        JpaPdpStatistics jpaPdpStat3 = new JpaPdpStatistics(pdpStat3);
-        assertNotEquals(0, jpaPdpStat1.compareTo(jpaPdpStat3));
-    }
-
-    @Test
-    public void testValidate() {
-        JpaPdpStatistics nullKeyJpaPdpStat = new JpaPdpStatistics();
-        assertFalse(nullKeyJpaPdpStat.validate("").isValid());
-
-        PdpStatistics pdpStat = createPdpStatistics();
-        JpaPdpStatistics jpaPdpStat2 = new JpaPdpStatistics(pdpStat);
-        assertTrue(jpaPdpStat2.validate("").isValid());
-    }
-
-    @Test
-    public void testClean() {
-        PdpStatistics pdpStat = createPdpStatistics();
-        JpaPdpStatistics jpaPdpStat = new JpaPdpStatistics(pdpStat);
-        jpaPdpStat.setPdpGroupName(" PDPGroup0 ");
-        jpaPdpStat.setPdpSubGroupName(" PDPSubGroup0 ");
-        jpaPdpStat.clean();
-        assertEquals("PDPGroup0", jpaPdpStat.getPdpGroupName());
-        assertEquals("PDPSubGroup0", jpaPdpStat.getPdpSubGroupName());
-    }
-
-    private void checkEquals(PdpStatistics pdpStat, JpaPdpStatistics jpaPdpStat) {
-        assertEquals(pdpStat.getPdpInstanceId(), jpaPdpStat.getKey().getName());
-        assertEquals(pdpStat.getPdpGroupName(), jpaPdpStat.getPdpGroupName());
-        assertEquals(pdpStat.getPdpSubGroupName(), jpaPdpStat.getPdpSubGroupName());
-        assertEquals(pdpStat.getTimeStamp(), jpaPdpStat.getTimeStamp().toInstant());
-        assertEquals(pdpStat.getPolicyDeployCount(), jpaPdpStat.getPolicyDeployCount());
-        assertEquals(pdpStat.getPolicyDeploySuccessCount(), jpaPdpStat.getPolicyDeploySuccessCount());
-        assertEquals(pdpStat.getPolicyDeployFailCount(), jpaPdpStat.getPolicyDeployFailCount());
-        assertEquals(pdpStat.getPolicyUndeployCount(), jpaPdpStat.getPolicyUndeployCount());
-        assertEquals(pdpStat.getPolicyUndeploySuccessCount(), jpaPdpStat.getPolicyUndeploySuccessCount());
-        assertEquals(pdpStat.getPolicyUndeployFailCount(), jpaPdpStat.getPolicyUndeployFailCount());
-        assertEquals(pdpStat.getPolicyExecutedCount(), jpaPdpStat.getPolicyExecutedCount());
-        assertEquals(pdpStat.getPolicyExecutedSuccessCount(), jpaPdpStat.getPolicyExecutedSuccessCount());
-        assertEquals(pdpStat.getPolicyExecutedFailCount(), jpaPdpStat.getPolicyExecutedFailCount());
-    }
-
-    private PdpStatistics createPdpStatistics() {
-        PdpStatistics pdpStat = new PdpStatistics();
-        pdpStat.setPdpInstanceId("PDP0");
-        pdpStat.setPdpGroupName("PDPGroup0");
-        pdpStat.setPdpSubGroupName("PDPSubGroup0");
-        pdpStat.setGeneratedId(10001L);
-        pdpStat.setTimeStamp(Instant.EPOCH);
-        pdpStat.setPolicyDeployCount(3);
-        pdpStat.setPolicyDeploySuccessCount(1);
-        pdpStat.setPolicyDeployFailCount(2);
-        pdpStat.setPolicyUndeployCount(5);
-        pdpStat.setPolicyUndeploySuccessCount(2);
-        pdpStat.setPolicyUndeployFailCount(3);
-        pdpStat.setPolicyExecutedCount(9);
-        pdpStat.setPolicyExecutedSuccessCount(4);
-        pdpStat.setPolicyExecutedFailCount(5);
-        pdpStat.setEngineStats(new ArrayList<>());
-        return pdpStat;
-    }
-}
diff --git a/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/provider/PdpProviderTest.java b/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/provider/PdpProviderTest.java
index 80c906e5f..620b8184c 100644
--- a/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/provider/PdpProviderTest.java
+++ b/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/provider/PdpProviderTest.java
@@ -2,6 +2,7 @@
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2019-2021,2023 Nordix Foundation.
  *  Modifications Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
+ *  Modifications Copyright (C) 2023 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.
@@ -51,7 +52,6 @@ import org.onap.policy.models.pdp.concepts.PdpGroups;
 import org.onap.policy.models.pdp.concepts.PdpPolicyStatus;
 import org.onap.policy.models.pdp.concepts.PdpPolicyStatus.PdpPolicyStatusBuilder;
 import org.onap.policy.models.pdp.concepts.PdpPolicyStatus.State;
-import org.onap.policy.models.pdp.concepts.PdpStatistics;
 import org.onap.policy.models.pdp.concepts.PdpSubGroup;
 import org.onap.policy.models.pdp.enums.PdpHealthStatus;
 import org.onap.policy.models.pdp.enums.PdpState;
@@ -508,151 +508,6 @@ public class PdpProviderTest {
     }
 
     @Test
-    public void testGetPdpStatistics() throws PfModelException {
-        assertThatThrownBy(() -> {
-            new PdpProvider().getPdpStatistics(null, null);
-        }).hasMessageMatching(DAO_IS_NULL);
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().getPdpStatistics(null, "name");
-        }).hasMessageMatching(DAO_IS_NULL);
-
-        assertEquals(0, new PdpProvider().getPdpStatistics(pfDao, "name").size());
-    }
-
-    @Test
-    public void testUpdatePdpStatisticsDao() throws PfModelException {
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(null, null, null, null, null);
-        }).hasMessageMatching(DAO_IS_NULL);
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(null, null, null, null, new PdpStatistics());
-        }).hasMessageMatching(DAO_IS_NULL);
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(null, null, null, "inst", null);
-        }).hasMessageMatching(DAO_IS_NULL);
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(null, null, null, "inst", new PdpStatistics());
-        }).hasMessageMatching(DAO_IS_NULL);
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(null, null, "TYPE", null, null);
-        }).hasMessageMatching(DAO_IS_NULL);
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(null, null, "TYPE", null, new PdpStatistics());
-        }).hasMessageMatching(DAO_IS_NULL);
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(null, null, "TYPE", "inst", null);
-        }).hasMessageMatching(DAO_IS_NULL);
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(null, null, "TYPE", "inst", new PdpStatistics());
-        }).hasMessageMatching(DAO_IS_NULL);
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(null, "name", null, null, null);
-        }).hasMessageMatching(DAO_IS_NULL);
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(null, "name", null, null, new PdpStatistics());
-        }).hasMessageMatching(DAO_IS_NULL);
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(null, "name", null, "inst", null);
-        }).hasMessageMatching(DAO_IS_NULL);
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(null, "name", null, "inst", new PdpStatistics());
-        }).hasMessageMatching(DAO_IS_NULL);
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(null, "name", "TYPE", null, null);
-        }).hasMessageMatching(DAO_IS_NULL);
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(null, "name", "TYPE", null, new PdpStatistics());
-        }).hasMessageMatching(DAO_IS_NULL);
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(null, "name", "TYPE", "inst", null);
-        }).hasMessageMatching(DAO_IS_NULL);
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(null, "name", "TYPE", "inst", new PdpStatistics());
-        }).hasMessageMatching(DAO_IS_NULL);
-    }
-
-    @Test
-    public void testUpdatePdpStatisticsGroup() throws PfModelException {
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(pfDao, null, null, null, null);
-        }).hasMessageMatching(GROUP_IS_NULL);
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(pfDao, null, null, null, new PdpStatistics());
-        }).hasMessageMatching(GROUP_IS_NULL);
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(pfDao, null, null, "inst", null);
-        }).hasMessageMatching(GROUP_IS_NULL);
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(pfDao, null, null, "inst", new PdpStatistics());
-        }).hasMessageMatching(GROUP_IS_NULL);
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(pfDao, null, "TYPE", null, null);
-        }).hasMessageMatching(GROUP_IS_NULL);
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(pfDao, null, "TYPE", null, new PdpStatistics());
-        }).hasMessageMatching(GROUP_IS_NULL);
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(pfDao, null, "TYPE", "inst", null);
-        }).hasMessageMatching(GROUP_IS_NULL);
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(pfDao, null, "TYPE", "inst", new PdpStatistics());
-        }).hasMessageMatching(GROUP_IS_NULL);
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(pfDao, "name", null, null, null);
-        }).hasMessageMatching(PDP_TYPE_IS_NULL);
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(pfDao, "name", null, null, new PdpStatistics());
-        }).hasMessageMatching(PDP_TYPE_IS_NULL);
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(pfDao, "name", null, "inst", null);
-        }).hasMessageMatching(PDP_TYPE_IS_NULL);
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(pfDao, "name", null, "inst", new PdpStatistics());
-        }).hasMessageMatching(PDP_TYPE_IS_NULL);
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(pfDao, "name", "TYPE", null, null);
-        }).hasMessageMatching("pdpInstanceId is marked .*ull but is null");
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(pfDao, "name", "TYPE", null, new PdpStatistics());
-        }).hasMessageMatching("pdpInstanceId is marked .*ull but is null");
-
-        assertThatThrownBy(() -> {
-            new PdpProvider().updatePdpStatistics(pfDao, "name", "TYPE", "inst", null);
-        }).hasMessageMatching("pdpStatistics is marked .*ull but is null");
-
-        new PdpProvider().updatePdpStatistics(pfDao, "name", "TYPE", "inst", new PdpStatistics());
-    }
-
-    @Test
     public void testGetAllPolicyStatusPfDao() throws PfModelException {
         assertThatThrownBy(() -> {
             new PdpProvider().getAllPolicyStatus(null);
diff --git a/models-pdp/src/test/java/org/onap/policy/models/pdp/testconcepts/DummyJpaPdpStatisticsChild.java b/models-pdp/src/test/java/org/onap/policy/models/pdp/testconcepts/DummyJpaPdpStatisticsChild.java
deleted file mode 100644
index b428fc679..000000000
--- a/models-pdp/src/test/java/org/onap/policy/models/pdp/testconcepts/DummyJpaPdpStatisticsChild.java
+++ /dev/null
@@ -1,34 +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=========================================================
- */
-
-package org.onap.policy.models.pdp.testconcepts;
-
-import org.onap.policy.models.pdp.persistence.concepts.JpaPdpStatistics;
-
-/**
- * Test class for JpaPdpStatistics comparisons.
- *
- */
-
-public class DummyJpaPdpStatisticsChild extends JpaPdpStatistics {
-
-    private static final long serialVersionUID = -5911806849612508805L;
-
-}