Fix sonars in policy-models

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

diff --git a/models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/provider/PdpStatisticsProvider.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/provider/PdpStatisticsProvider.java
index ece09b0..ea118f3 100644 (file)
--- a/models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/provider/PdpStatisticsProvider.java
+++ b/models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/provider/PdpStatisticsProvider.java
@@ -3,7 +3,7 @@
  * ONAP Policy Model
  * ================================================================================
  * Copyright (C) 2019-2021 Nordix Foundation.
- * Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2020-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.
@@ -37,6 +37,7 @@ import org.onap.policy.models.base.PfKey;
 import org.onap.policy.models.base.PfModelException;
 import org.onap.policy.models.base.PfModelRuntimeException;
 import org.onap.policy.models.dao.PfDao;
+import org.onap.policy.models.dao.PfFilterParameters;
 import org.onap.policy.models.pdp.concepts.PdpStatistics;
 import org.onap.policy.models.pdp.persistence.concepts.JpaPdpStatistics;
 
@@ -47,8 +48,6 @@ import org.onap.policy.models.pdp.persistence.concepts.JpaPdpStatistics;
  * @author Ning Xi (ning.xi@est.tech)
  */
 public class PdpStatisticsProvider {
-    // Recurring string constants
-    private static final String DESC_ORDER = "DESC";
 
     /**
      * Get PDP statistics.
@@ -60,7 +59,6 @@ public class PdpStatisticsProvider {
      */
     public List<PdpStatistics> getPdpStatistics(@NonNull final PfDao dao, final String name, final Instant timeStamp)
             throws PfModelException {
-        List<PdpStatistics> pdpStatistics = new ArrayList<>();
         if (name != null && timeStamp != null) {
             return asPdpStatisticsList(dao.getByTimestamp(JpaPdpStatistics.class,
                     new PfGeneratedIdKey(name, PfKey.NULL_KEY_VERSION), timeStamp));
@@ -114,9 +112,32 @@ public class PdpStatisticsProvider {
             filterMap.put("pdpSubGroupName", pdpSubGroup);
         }
 
-        return asPdpStatisticsList(dao.getFiltered(JpaPdpStatistics.class, name,
-                PfKey.NULL_KEY_VERSION, startTimeStamp,
-                endTimeStamp, filterMap, sortOrder, getRecordNum));
+        // @formatter:off
+        return asPdpStatisticsList(
+                    dao.getFiltered(JpaPdpStatistics.class,
+                        PdpFilterParameters.builder()
+                            .name(name)
+                            .startTime(startTimeStamp)
+                            .endTime(endTimeStamp)
+                            .group(pdpGroupName)
+                            .subGroup(pdpSubGroup)
+                            .sortOrder(sortOrder)
+                            .recordNum(getRecordNum)
+                            .build()));
+        // @formatter:on
+    }
+
+    /**
+     * Get filtered PDP statistics.
+     *
+     * @param dao the DAO to use to access the database
+     * @param filterParams filter parameters
+     * @return the PDP statistics found
+     * @throws PfModelException on errors getting policies
+     */
+    public List<PdpStatistics> getFilteredPdpStatistics(@NonNull final PfDao dao,
+                    PdpFilterParameters filterParams) {
+        return asPdpStatisticsList(dao.getFiltered(JpaPdpStatistics.class, filterParams));
     }
 
     /**
@@ -130,7 +151,7 @@ public class PdpStatisticsProvider {
     public List<PdpStatistics> createPdpStatistics(@NonNull final PfDao dao,
             @NonNull final List<PdpStatistics> pdpStatisticsList) throws PfModelException {
         for (PdpStatistics pdpStatistics : pdpStatisticsList) {
-            JpaPdpStatistics jpaPdpStatistics = new JpaPdpStatistics();
+            var jpaPdpStatistics = new JpaPdpStatistics();
             jpaPdpStatistics.fromAuthorative(pdpStatistics);
             BeanValidationResult validationResult = jpaPdpStatistics.validate("pdp statistics");
             if (!validationResult.isValid()) {
@@ -145,7 +166,7 @@ public class PdpStatisticsProvider {
         List<PdpStatistics> pdpStatistics = new ArrayList<>(pdpStatisticsList.size());
 
         for (PdpStatistics pdpStatisticsItem : pdpStatisticsList) {
-            JpaPdpStatistics jpaPdpStatistics =
+            var jpaPdpStatistics =
                     dao.get(JpaPdpStatistics.class, new PfGeneratedIdKey(pdpStatisticsItem.getPdpInstanceId(),
                             PfKey.NULL_KEY_VERSION, pdpStatisticsItem.getGeneratedId()));
             pdpStatistics.add(jpaPdpStatistics.toAuthorative());
@@ -165,7 +186,7 @@ public class PdpStatisticsProvider {
             @NonNull final List<PdpStatistics> pdpStatisticsList) throws PfModelException {
 
         for (PdpStatistics pdpStatistics : pdpStatisticsList) {
-            JpaPdpStatistics jpaPdpStatistics = new JpaPdpStatistics();
+            var jpaPdpStatistics = new JpaPdpStatistics();
             jpaPdpStatistics.fromAuthorative(pdpStatistics);
 
             BeanValidationResult validationResult = jpaPdpStatistics.validate("pdp statistics");
@@ -180,7 +201,7 @@ public class PdpStatisticsProvider {
         List<PdpStatistics> pdpStatistics = new ArrayList<>(pdpStatisticsList.size());
 
         for (PdpStatistics pdpStatisticsItem : pdpStatisticsList) {
-            JpaPdpStatistics jpaPdpStatistics =
+            var jpaPdpStatistics =
                     dao.get(JpaPdpStatistics.class, new PfGeneratedIdKey(pdpStatisticsItem.getPdpInstanceId(),
                             PfKey.NULL_KEY_VERSION, pdpStatisticsItem.getGeneratedId()));
             pdpStatistics.add(jpaPdpStatistics.toAuthorative());
@@ -199,10 +220,9 @@ public class PdpStatisticsProvider {
      * @throws PfModelException on errors deleting PDP statistics
      */
     public List<PdpStatistics> deletePdpStatistics(@NonNull final PfDao dao, @NonNull final String name,
-            final Instant timestamp) {
-        List<PdpStatistics> pdpStatisticsListToDel = asPdpStatisticsList(
-                dao.getFiltered(JpaPdpStatistics.class, name,
-                PfKey.NULL_KEY_VERSION, timestamp, timestamp, null, DESC_ORDER, 0));
+                    final Instant timestamp) {
+        List<PdpStatistics> pdpStatisticsListToDel = asPdpStatisticsList(dao.getFiltered(JpaPdpStatistics.class,
+                        PfFilterParameters.builder().name(name).startTime(timestamp).endTime(timestamp).build()));
 
         pdpStatisticsListToDel.stream().forEach(s -> dao.delete(JpaPdpStatistics.class,
                 new PfGeneratedIdKey(s.getPdpInstanceId(), PfKey.NULL_KEY_VERSION, s.getGeneratedId())));