2 files changed, 20 insertions, 37 deletions

diff --git a/main/src/main/java/org/onap/policy/pap/main/service/PdpStatisticsService.java b/main/src/main/java/org/onap/policy/pap/main/service/PdpStatisticsService.java
index c9a831ee..db340041 100644
--- a/main/src/main/java/org/onap/policy/pap/main/service/PdpStatisticsService.java
+++ b/main/src/main/java/org/onap/policy/pap/main/service/PdpStatisticsService.java
@@ -26,15 +26,12 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
 import javax.ws.rs.core.Response;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import org.onap.policy.common.parameters.BeanValidationResult;
 import org.onap.policy.common.utils.services.Registry;
-import org.onap.policy.models.base.PfGeneratedIdKey;
-import org.onap.policy.models.base.PfKey;
 import org.onap.policy.models.base.PfModelRuntimeException;
 import org.onap.policy.models.pdp.concepts.PdpStatistics;
 import org.onap.policy.models.pdp.persistence.concepts.JpaPdpStatistics;
@@ -58,8 +55,6 @@ public class PdpStatisticsService {
     private static final int DEFAULT_RECORD_COUNT = 10;
     private static final int MAX_RECORD_COUNT = 100;
 
-    private AtomicLong generatedId = new AtomicLong();
-
     private final PdpStatisticsRepository pdpStatisticsRepository;
 
     /**
@@ -98,19 +93,15 @@ public class PdpStatisticsService {
             if (!validationResult.isValid()) {
                 throw new PfModelRuntimeException(Response.Status.BAD_REQUEST, validationResult.getResult());
             }
-            //TODO: Fix this as part of POLICY-3897
-            jpaPdpStatistics.getKey().setGeneratedId(generatedId.incrementAndGet());
             pdpStatisticsRepository.saveAndFlush(jpaPdpStatistics);
-            pdpStatistics.setGeneratedId(jpaPdpStatistics.getKey().getGeneratedId());
+            pdpStatistics.setGeneratedId(jpaPdpStatistics.getGeneratedId());
         }
 
         // Return the created PDP statistics
         List<PdpStatistics> pdpStatistics = new ArrayList<>(pdpStatisticsList.size());
 
         for (PdpStatistics pdpStatisticsItem : pdpStatisticsList) {
-            var jpaPdpStatistics =
-                pdpStatisticsRepository.getById(new PfGeneratedIdKey(pdpStatisticsItem.getPdpInstanceId(),
-                    PfKey.NULL_KEY_VERSION, pdpStatisticsItem.getGeneratedId()));
+            var jpaPdpStatistics = pdpStatisticsRepository.getById(pdpStatisticsItem.getGeneratedId());
             pdpStatistics.add(jpaPdpStatistics.toAuthorative());
         }
         return pdpStatistics;
@@ -133,19 +124,19 @@ public class PdpStatisticsService {
         Pageable recordSize = getRecordSize(recordCount);
         if (startTime != null && endTime != null) {
             return generatePdpStatistics(asPdpStatisticsList(pdpStatisticsRepository
-                .findByPdpGroupNameAndPdpSubGroupNameAndKeyNameAndTimeStampBetween(pdpGroup, pdpSubGroup, pdp,
+                .findByPdpGroupNameAndPdpSubGroupNameAndNameAndTimeStampBetween(pdpGroup, pdpSubGroup, pdp,
                     convertInstantToDate(startTime), convertInstantToDate(endTime), recordSize)));
         } else if (startTime == null && endTime == null) {
             return generatePdpStatistics(
-                asPdpStatisticsList(pdpStatisticsRepository.findByPdpGroupNameAndPdpSubGroupNameAndKeyName(pdpGroup,
+                asPdpStatisticsList(pdpStatisticsRepository.findByPdpGroupNameAndPdpSubGroupNameAndName(pdpGroup,
                     pdpSubGroup, pdp, recordSize)));
         } else if (startTime != null) {
             return generatePdpStatistics(asPdpStatisticsList(
-                pdpStatisticsRepository.findByPdpGroupNameAndPdpSubGroupNameAndKeyNameAndTimeStampGreaterThanEqual(
+                pdpStatisticsRepository.findByPdpGroupNameAndPdpSubGroupNameAndNameAndTimeStampGreaterThanEqual(
                     pdpGroup, pdpSubGroup, pdp, convertInstantToDate(startTime), recordSize)));
         } else {
             return generatePdpStatistics(asPdpStatisticsList(
-                pdpStatisticsRepository.findByPdpGroupNameAndPdpSubGroupNameAndKeyNameAndTimeStampLessThanEqual(
+                pdpStatisticsRepository.findByPdpGroupNameAndPdpSubGroupNameAndNameAndTimeStampLessThanEqual(
                     pdpGroup, pdpSubGroup, pdp, convertInstantToDate(endTime), recordSize)));
         }
     }
diff --git a/main/src/main/java/org/onap/policy/pap/main/service/PolicyAuditService.java b/main/src/main/java/org/onap/policy/pap/main/service/PolicyAuditService.java
index 951a3cbd..f582135d 100644
--- a/main/src/main/java/org/onap/policy/pap/main/service/PolicyAuditService.java
+++ b/main/src/main/java/org/onap/policy/pap/main/service/PolicyAuditService.java
@@ -23,7 +23,6 @@ package org.onap.policy.pap.main.service;
 import java.time.Instant;
 import java.util.Date;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
 import javax.ws.rs.core.Response;
 import lombok.NonNull;
@@ -47,8 +46,6 @@ public class PolicyAuditService {
     private static final Integer DEFAULT_MAX_RECORDS = 100;
     private static final Integer DEFAULT_MIN_RECORDS = 10;
 
-    private AtomicLong generatedId = new AtomicLong();
-
     private final PolicyAuditRepository policyAuditRepository;
 
     /**
@@ -64,8 +61,6 @@ public class PolicyAuditService {
         var count = 0;
         for (JpaPolicyAudit jpaAudit : jpaAudits) {
             result.addResult(jpaAudit.validate(String.valueOf(count++)));
-            // TODO: Fix this as part of POLICY-3897
-            jpaAudit.getKey().setGeneratedId(generatedId.incrementAndGet());
         }
 
         if (!result.isValid()) {
@@ -139,19 +134,17 @@ public class PolicyAuditService {
         @NonNull String policyVersion, int recordCount, Instant startTime, Instant endTime) {
         Pageable recordSize = getRecordSize(recordCount);
         if (startTime != null && endTime != null) {
-            return asPolicyAuditList(policyAuditRepository.findByPdpGroupAndKeyNameAndKeyVersionAndTimeStampBetween(
-                pdpGroup, policyName, policyVersion, Date.from(startTime), Date.from(endTime), recordSize));
+            return asPolicyAuditList(policyAuditRepository.findByPdpGroupAndNameAndVersionAndTimeStampBetween(pdpGroup,
+                policyName, policyVersion, Date.from(startTime), Date.from(endTime), recordSize));
         } else if (startTime == null && endTime == null) {
-            return asPolicyAuditList(policyAuditRepository.findByPdpGroupAndKeyNameAndKeyVersion(pdpGroup, policyName,
-                policyVersion, recordSize));
-        } else if (startTime != null) {
             return asPolicyAuditList(
-                policyAuditRepository.findByPdpGroupAndKeyNameAndKeyVersionAndTimeStampGreaterThanEqual(pdpGroup,
-                    policyName, policyVersion, Date.from(startTime), recordSize));
+                policyAuditRepository.findByPdpGroupAndNameAndVersion(pdpGroup, policyName, policyVersion, recordSize));
+        } else if (startTime != null) {
+            return asPolicyAuditList(policyAuditRepository.findByPdpGroupAndNameAndVersionAndTimeStampGreaterThanEqual(
+                pdpGroup, policyName, policyVersion, Date.from(startTime), recordSize));
         } else {
-            return asPolicyAuditList(
-                policyAuditRepository.findByPdpGroupAndKeyNameAndKeyVersionAndTimeStampLessThanEqual(pdpGroup,
-                    policyName, policyVersion, Date.from(endTime), recordSize));
+            return asPolicyAuditList(policyAuditRepository.findByPdpGroupAndNameAndVersionAndTimeStampLessThanEqual(
+                pdpGroup, policyName, policyVersion, Date.from(endTime), recordSize));
         }
     }
 
@@ -169,17 +162,16 @@ public class PolicyAuditService {
         Instant startTime, Instant endTime) {
         Pageable recordSize = getRecordSize(recordCount);
         if (startTime != null && endTime != null) {
-            return asPolicyAuditList(policyAuditRepository.findByKeyNameAndKeyVersionAndTimeStampBetween(policyName,
+            return asPolicyAuditList(policyAuditRepository.findByNameAndVersionAndTimeStampBetween(policyName,
                 policyVersion, Date.from(startTime), Date.from(endTime), recordSize));
         } else if (startTime == null && endTime == null) {
-            return asPolicyAuditList(
-                policyAuditRepository.findByKeyNameAndKeyVersion(policyName, policyVersion, recordSize));
+            return asPolicyAuditList(policyAuditRepository.findByNameAndVersion(policyName, policyVersion, recordSize));
         } else if (startTime != null) {
-            return asPolicyAuditList(policyAuditRepository.findByKeyNameAndKeyVersionAndTimeStampGreaterThanEqual(
-                policyName, policyVersion, Date.from(startTime), recordSize));
+            return asPolicyAuditList(policyAuditRepository.findByNameAndVersionAndTimeStampGreaterThanEqual(policyName,
+                policyVersion, Date.from(startTime), recordSize));
         } else {
-            return asPolicyAuditList(policyAuditRepository.findByKeyNameAndKeyVersionAndTimeStampLessThanEqual(
-                policyName, policyVersion, Date.from(endTime), recordSize));
+            return asPolicyAuditList(policyAuditRepository.findByNameAndVersionAndTimeStampLessThanEqual(policyName,
+                policyVersion, Date.from(endTime), recordSize));
         }
     }