Removed db-based statistics feature

[policy/models.git] / models-pdp / src / main / java / org / onap / policy / models / pdp / persistence / provider / PdpProvider.java

diff --git a/models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/provider/PdpProvider.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/provider/PdpProvider.java
index 7d59166..0cc0eb2 100644 (file)
--- a/models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/provider/PdpProvider.java
+++ b/models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/provider/PdpProvider.java
@@ -2,6 +2,7 @@
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2019 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.
@@ -36,11 +37,11 @@ import org.onap.policy.models.base.PfModelException;
 import org.onap.policy.models.base.PfModelRuntimeException;
 import org.onap.policy.models.base.PfReferenceKey;
 import org.onap.policy.models.dao.PfDao;
+import org.onap.policy.models.dao.PfFilterParameters;
 import org.onap.policy.models.pdp.concepts.Pdp;
 import org.onap.policy.models.pdp.concepts.PdpGroup;
 import org.onap.policy.models.pdp.concepts.PdpGroupFilter;
 import org.onap.policy.models.pdp.concepts.PdpPolicyStatus;
-import org.onap.policy.models.pdp.concepts.PdpStatistics;
 import org.onap.policy.models.pdp.concepts.PdpSubGroup;
 import org.onap.policy.models.pdp.persistence.concepts.JpaPdp;
 import org.onap.policy.models.pdp.persistence.concepts.JpaPdpGroup;
@@ -95,7 +96,7 @@ public class PdpProvider {
             throws PfModelException {
 
         for (PdpGroup pdpGroup : pdpGroups) {
-            JpaPdpGroup jpaPdpGroup = new JpaPdpGroup();
+            var jpaPdpGroup = new JpaPdpGroup();
             jpaPdpGroup.fromAuthorative(pdpGroup);
 
             BeanValidationResult validationResult = jpaPdpGroup.validate("PDP group");
@@ -110,8 +111,7 @@ public class PdpProvider {
         List<PdpGroup> returnPdpGroups = new ArrayList<>();
 
         for (PdpGroup pdpGroup : pdpGroups) {
-            JpaPdpGroup jpaPdpGroup =
-                    dao.get(JpaPdpGroup.class, new PfConceptKey(pdpGroup.getName(), PfKey.NULL_KEY_VERSION));
+            var jpaPdpGroup = dao.get(JpaPdpGroup.class, new PfConceptKey(pdpGroup.getName(), PfKey.NULL_KEY_VERSION));
             returnPdpGroups.add(jpaPdpGroup.toAuthorative());
         }
 
@@ -130,7 +130,7 @@ public class PdpProvider {
             throws PfModelException {
 
         for (PdpGroup pdpGroup : pdpGroups) {
-            JpaPdpGroup jpaPdpGroup = new JpaPdpGroup();
+            var jpaPdpGroup = new JpaPdpGroup();
             jpaPdpGroup.fromAuthorative(pdpGroup);
 
             BeanValidationResult validationResult = jpaPdpGroup.validate("PDP group");
@@ -145,7 +145,7 @@ public class PdpProvider {
         List<PdpGroup> returnPdpGroups = new ArrayList<>();
 
         for (PdpGroup pdpGroup : pdpGroups) {
-            JpaPdpGroup jpaPdpGroup =
+            var jpaPdpGroup =
                     dao.get(JpaPdpGroup.class, new PfConceptKey(pdpGroup.getName(), PfKey.NULL_KEY_VERSION));
             returnPdpGroups.add(jpaPdpGroup.toAuthorative());
         }
@@ -164,9 +164,9 @@ public class PdpProvider {
     public void updatePdpSubGroup(@NonNull final PfDao dao, @NonNull final String pdpGroupName,
             @NonNull final PdpSubGroup pdpSubGroup) throws PfModelException {
 
-        final PfReferenceKey subGroupKey =
+        final var subGroupKey =
                 new PfReferenceKey(pdpGroupName, PfKey.NULL_KEY_VERSION, pdpSubGroup.getPdpType());
-        final JpaPdpSubGroup jpaPdpSubgroup = new JpaPdpSubGroup(subGroupKey);
+        final var jpaPdpSubgroup = new JpaPdpSubGroup(subGroupKey);
         jpaPdpSubgroup.fromAuthorative(pdpSubGroup);
 
         BeanValidationResult validationResult = jpaPdpSubgroup.validate("PDP sub group");
@@ -189,9 +189,9 @@ public class PdpProvider {
     public void updatePdp(@NonNull final PfDao dao, @NonNull final String pdpGroupName,
             @NonNull final String pdpSubGroup, @NonNull final Pdp pdp) {
 
-        final PfReferenceKey pdpKey =
+        final var pdpKey =
                 new PfReferenceKey(pdpGroupName, PfKey.NULL_KEY_VERSION, pdpSubGroup, pdp.getInstanceId());
-        final JpaPdp jpaPdp = new JpaPdp(pdpKey);
+        final var jpaPdp = new JpaPdp(pdpKey);
         jpaPdp.fromAuthorative(pdp);
 
         BeanValidationResult validationResult = jpaPdp.validate("PDP");
@@ -212,7 +212,7 @@ public class PdpProvider {
      */
     public PdpGroup deletePdpGroup(@NonNull final PfDao dao, @NonNull final String name) {
 
-        PfConceptKey pdpGroupKey = new PfConceptKey(name, PfKey.NULL_KEY_VERSION);
+        var pdpGroupKey = new PfConceptKey(name, PfKey.NULL_KEY_VERSION);
 
         JpaPdpGroup jpaDeletePdpGroup = dao.get(JpaPdpGroup.class, pdpGroupKey);
 
@@ -227,34 +227,6 @@ public class PdpProvider {
         return jpaDeletePdpGroup.toAuthorative();
     }
 
-    /**
-     * Get PDP statistics.
-     *
-     * @param dao the DAO to use to access the database
-     * @param name the name of the PDP group to get statistics for, null to get all PDP groups
-     * @return the statistics found
-     * @throws PfModelException on errors getting statistics
-     */
-    public List<PdpStatistics> getPdpStatistics(@NonNull final PfDao dao, final String name) throws PfModelException {
-        return new ArrayList<>();
-    }
-
-    /**
-     * Update PDP statistics for a PDP.
-     *
-     * @param dao the DAO to use to access the database
-     * @param pdpGroupName the name of the PDP group containing the PDP that the statistics are for
-     * @param pdpType the PDP type of the subgroup containing the PDP that the statistics are for
-     * @param pdpInstanceId the instance ID of the PDP to update statistics for
-     * @param pdpStatistics the statistics to update
-     * @throws PfModelException on errors updating statistics
-     */
-    public void updatePdpStatistics(@NonNull final PfDao dao, @NonNull final String pdpGroupName,
-            @NonNull final String pdpType, @NonNull final String pdpInstanceId,
-            @NonNull final PdpStatistics pdpStatistics) throws PfModelException {
-        // Not implemented yet
-    }
-
     /**
      * Gets all policy deployments.
      *
@@ -301,10 +273,10 @@ public class PdpProvider {
     public List<PdpPolicyStatus> getGroupPolicyStatus(@NonNull final PfDao dao, @NonNull final String groupName)
                     throws PfModelException {
 
-        Map<String, Object> filter = Map.of("pdpGroup", groupName);
+        PfFilterParameters params = PfFilterParameters.builder().filterMap(Map.of("pdpGroup", groupName)).build();
 
-        return dao.getFiltered(JpaPdpPolicyStatus.class, null, null, null, null, filter, null, 0).stream()
-                        .map(JpaPdpPolicyStatus::toAuthorative).collect(Collectors.toList());
+        return dao.getFiltered(JpaPdpPolicyStatus.class, params)
+                        .stream().map(JpaPdpPolicyStatus::toAuthorative).collect(Collectors.toList());
     }
 
     /**
@@ -341,9 +313,9 @@ public class PdpProvider {
         List<JpaPdpPolicyStatus> jpas = objs.stream().map(JpaPdpPolicyStatus::new).collect(Collectors.toList());
 
         // validate the objects
-        BeanValidationResult result = new BeanValidationResult(fieldName, jpas);
+        var result = new BeanValidationResult(fieldName, jpas);
 
-        int count = 0;
+        var count = 0;
         for (JpaPdpPolicyStatus jpa: jpas) {
             result.addResult(jpa.validate(String.valueOf(count++)));
         }
@@ -358,7 +330,7 @@ public class PdpProvider {
     /**
      * Convert JPA PDP group list to an authorative PDP group list.
      *
-     * @param foundPdpGroups the list to convert
+     * @param jpaPdpGroupList the list to convert
      * @return the authorative list
      */
     private List<PdpGroup> asPdpGroupList(List<JpaPdpGroup> jpaPdpGroupList) {