Add default min records for policy audit

Adding default min records as 10 for policy audit provider.
This is inline with our discussions and design doumented here
https://wiki.onap.org/display/DW/PAP+REST+API+changes+for+Istanbul+release

Issue-ID: POLICY-3340
Change-Id: I5bab5f186f2591b1a2f2c42e9851ad88f73c8dfb
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>

diff --git a/models-pap/src/main/java/org/onap/policy/models/pap/persistence/provider/PolicyAuditProvider.java b/models-pap/src/main/java/org/onap/policy/models/pap/persistence/provider/PolicyAuditProvider.java
index 7368d29..ec759d3 100644 (file)
--- a/models-pap/src/main/java/org/onap/policy/models/pap/persistence/provider/PolicyAuditProvider.java
+++ b/models-pap/src/main/java/org/onap/policy/models/pap/persistence/provider/PolicyAuditProvider.java
@@ -49,6 +49,7 @@ import org.onap.policy.models.pap.persistence.concepts.JpaPolicyAudit;
 public class PolicyAuditProvider {
 
     private static final Integer DEFAULT_MAX_RECORDS = 100;
+    private static final Integer DEFAULT_MIN_RECORDS = 10;
 
     /**
      * Create audit records.
@@ -79,7 +80,9 @@ public class PolicyAuditProvider {
      * @return list of {@link PolicyAudit} records
      */
     public List<PolicyAudit> getAuditRecords(@NonNull PfDao dao, @NonNull AuditFilter auditFilter) {
-        if (auditFilter.getRecordNum() < 1 || auditFilter.getRecordNum() > DEFAULT_MAX_RECORDS) {
+        if (auditFilter.getRecordNum() < 1) {
+            auditFilter.setRecordNum(DEFAULT_MIN_RECORDS);
+        } else if (auditFilter.getRecordNum() > DEFAULT_MAX_RECORDS) {
             auditFilter.setRecordNum(DEFAULT_MAX_RECORDS);
         }
 

diff --git a/models-pap/src/test/java/org/onap/policy/models/pap/persistence/provider/PolicyAuditProviderTest.java b/models-pap/src/test/java/org/onap/policy/models/pap/persistence/provider/PolicyAuditProviderTest.java
index 7c70371..41c9b92 100644 (file)
--- a/models-pap/src/test/java/org/onap/policy/models/pap/persistence/provider/PolicyAuditProviderTest.java
+++ b/models-pap/src/test/java/org/onap/policy/models/pap/persistence/provider/PolicyAuditProviderTest.java
@@ -184,9 +184,9 @@ public class PolicyAuditProviderTest {
         records = provider.getAuditRecords(pfDao, AuditFilter.builder().recordNum(102).build());
         assertThat(records).hasSize(100);
 
-        // try to get -1 records should return 100
+        // try to get -1 records should return 10
         records = provider.getAuditRecords(pfDao, AuditFilter.builder().recordNum(-1).build());
-        assertThat(records).hasSize(100);
+        assertThat(records).hasSize(10);
     }
 
     @Test