diff options
Diffstat (limited to 'models-pdp/src/main/java/org')
3 files changed, 14 insertions, 14 deletions
diff --git a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStatistics.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStatistics.java index 1ba983be2..f7a0e7d91 100644 --- a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStatistics.java +++ b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStatistics.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2019 Nordix Foundation. * Modifications Copyright (C) 2019 AT&T Intellectual Property. - * Modifications Copyright (C) 2020 Nordix Foundation. + * 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. @@ -22,7 +22,7 @@ package org.onap.policy.models.pdp.concepts; -import java.util.Date; +import java.time.Instant; import java.util.List; import lombok.Data; import lombok.NoArgsConstructor; @@ -39,7 +39,7 @@ import org.onap.policy.models.base.PfUtils; public class PdpStatistics { private String pdpInstanceId; - private Date timeStamp; + private Instant timeStamp; private String pdpGroupName; private String pdpSubGroupName; private long policyDeployCount; @@ -57,7 +57,7 @@ public class PdpStatistics { */ public PdpStatistics(@NonNull PdpStatistics source) { this.pdpInstanceId = source.pdpInstanceId; - this.timeStamp = source.timeStamp == null ? null : new Date(source.timeStamp.getTime()); + this.timeStamp = source.timeStamp; this.pdpGroupName = source.pdpGroupName; this.pdpSubGroupName = source.pdpSubGroupName; this.policyDeployCount = source.policyDeployCount; diff --git a/models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpStatistics.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpStatistics.java index 90cf4e468..c3329cfa4 100644 --- a/models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpStatistics.java +++ b/models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpStatistics.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP Policy Model * ================================================================================ - * Copyright (C) 2019 Nordix Foundation. + * Copyright (C) 2019-2021 Nordix Foundation. * Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,7 +24,7 @@ package org.onap.policy.models.pdp.persistence.concepts; import java.io.Serializable; -import java.util.Date; +import java.time.Instant; import java.util.List; import javax.persistence.Column; import javax.persistence.ElementCollection; @@ -167,7 +167,7 @@ public class JpaPdpStatistics extends PfConcept implements PfAuthorative<PdpStat public PdpStatistics toAuthorative() { PdpStatistics pdpStatistics = new PdpStatistics(); pdpStatistics.setPdpInstanceId(key.getName()); - pdpStatistics.setTimeStamp(new Date(key.getTimeStamp().getTime())); + pdpStatistics.setTimeStamp(key.getInstant()); pdpStatistics.setPdpGroupName(pdpGroupName); pdpStatistics.setPdpSubGroupName(pdpSubGroupName); pdpStatistics.setPolicyDeployCount(policyDeployCount); @@ -185,7 +185,7 @@ public class JpaPdpStatistics extends PfConcept implements PfAuthorative<PdpStat public void fromAuthorative(@NonNull final PdpStatistics pdpStatistics) { if (this.key == null || this.getKey().isNullKey()) { this.setKey(new PfTimestampKey(pdpStatistics.getPdpInstanceId(), PfKey.NULL_KEY_VERSION, - new Date(pdpStatistics.getTimeStamp() == null ? 0 : pdpStatistics.getTimeStamp().getTime()))); + pdpStatistics.getTimeStamp() == null ? Instant.EPOCH : pdpStatistics.getTimeStamp())); } this.setPdpGroupName(pdpStatistics.getPdpGroupName()); this.setPdpSubGroupName(pdpStatistics.getPdpSubGroupName()); 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 7901246d7..e030d089d 100644 --- 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 @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP Policy Model * ================================================================================ - * Copyright (C) 2019-2020 Nordix Foundation. + * Copyright (C) 2019-2021 Nordix Foundation. * Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,8 +23,8 @@ package org.onap.policy.models.pdp.persistence.provider; +import java.time.Instant; import java.util.ArrayList; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -58,7 +58,7 @@ public class PdpStatisticsProvider { * @return the PDP statistics found * @throws PfModelException on errors getting PDP statistics */ - public List<PdpStatistics> getPdpStatistics(@NonNull final PfDao dao, final String name, final Date timestamp) + public List<PdpStatistics> getPdpStatistics(@NonNull final PfDao dao, final String name, final Instant timestamp) throws PfModelException { List<PdpStatistics> pdpStatistics = new ArrayList<>(); @@ -87,8 +87,8 @@ public class PdpStatisticsProvider { * @throws PfModelException on errors getting policies */ public List<PdpStatistics> getFilteredPdpStatistics(@NonNull final PfDao dao, final String name, - @NonNull final String pdpGroupName, final String pdpSubGroup, final Date startTimeStamp, - final Date endTimeStamp, final String sortOrder, final int getRecordNum) { + @NonNull final String pdpGroupName, final String pdpSubGroup, final Instant startTimeStamp, + final Instant endTimeStamp, final String sortOrder, final int getRecordNum) { Map<String, Object> filterMap = new HashMap<>(); filterMap.put("pdpGroupName", pdpGroupName); if (pdpSubGroup != null) { @@ -181,7 +181,7 @@ public class PdpStatisticsProvider { * @throws PfModelException on errors deleting PDP statistics */ public List<PdpStatistics> deletePdpStatistics(@NonNull final PfDao dao, @NonNull final String name, - final Date timestamp) { + final Instant timestamp) { List<PdpStatistics> pdpStatisticsListToDel = asPdpStatisticsList(dao.getFiltered(JpaPdpStatistics.class, name, PfKey.NULL_KEY_VERSION, timestamp, timestamp, null, DESC_ORDER, 0)); |