/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2020 Nordix Foundation.
+ * Copyright (C) 2020-2021 Nordix Foundation.
* Modifications Copyright (C) 2019 AT&T Intellectual Property.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
package org.onap.policy.pap.main.rest;
+import java.time.Instant;
import java.util.ArrayList;
-import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Registry.get(PapConstants.REG_PAP_DAO_FACTORY, PolicyModelsProviderFactoryWrapper.class);
Map<String, Map<String, List<PdpStatistics>>> pdpStatisticsMap;
try (PolicyModelsProvider databaseProvider = modelProviderWrapper.create()) {
- Date startTime = null;
- Date endTime = null;
+ Instant startTime = null;
+ Instant endTime = null;
if (groupName == null) {
pdpStatisticsMap = generatePdpStatistics(databaseProvider.getPdpStatistics(pdpName, startTime));
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.time.Instant;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
private static final CommInfrastructure INFRA = CommInfrastructure.NOOP;
private static final String TOPIC = "my-topic";
- private Date timeStamp;
+ private Instant timeStamp;
private PdpHeartbeatListener pdpHeartbeatListener;
@Test
public void testPdpStatistics() throws CoderException, PfModelException, ParseException {
addGroups("PdpGroups.json");
pdpHeartbeatListener = new PdpHeartbeatListener(new PdpParameters());
- timeStamp = new SimpleDateFormat("yyyy-MM-dd").parse("2020-01-01");
+ timeStamp = Instant.parse("2021-02-12T17:48:01.029211400Z");
// init default pdp group
final PdpStatus status1 = new PdpStatus();
* ONAP PAP
* ================================================================================
* Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
- * 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.
import static org.junit.Assert.assertEquals;
import java.net.HttpURLConnection;
+import java.time.Instant;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
import java.util.Map;
import javax.ws.rs.client.Invocation;
pdpStatisticsRecord.setPdpGroupName("defaultGroup");
pdpStatisticsRecord.setPdpSubGroupName("apex");
pdpStatisticsRecord.setPdpInstanceId("pdp1");
- pdpStatisticsRecord.setTimeStamp(new Date());
+ pdpStatisticsRecord.setTimeStamp(Instant.now());
pdpStatisticsRecord.setPolicyDeployCount(1);
pdpStatisticsRecord.setPolicyDeployFailCount(0);
pdpStatisticsRecord.setPolicyDeploySuccessCount(1);