X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-pdp%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fmodels%2Fpdp%2Fconcepts%2FPdpStatus.java;h=c51c1b277e754fcdda85315d21c0e417763d3d06;hb=d19537308cbdce440c1faf819eb586983d0a67c9;hp=5b1566d8b649b536bfeafa466d6c72d25f0af281;hpb=3f8536f2a89f9e34f5705def915d7ecfe3bfa5bd;p=policy%2Fmodels.git diff --git a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStatus.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStatus.java index 5b1566d8b..c51c1b277 100644 --- a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStatus.java +++ b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpStatus.java @@ -1,7 +1,8 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019-2020 Nordix Foundation. - * Modifications Copyright (C) 2019 AT&T Intellectual Property. + * Copyright (C) 2019-2021 Nordix Foundation. + * Modifications Copyright (C) 2019, 2021 AT&T Intellectual Property. + * Modifications Copyright (C) 2023 Bell Canada. 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. @@ -23,16 +24,15 @@ package org.onap.policy.models.pdp.concepts; import java.util.ArrayList; import java.util.List; - +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import lombok.ToString; - import org.onap.policy.models.base.PfUtils; import org.onap.policy.models.pdp.enums.PdpHealthStatus; import org.onap.policy.models.pdp.enums.PdpMessageType; import org.onap.policy.models.pdp.enums.PdpState; -import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyIdentifier; +import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; /** * Class to represent the PDP_STATUS message that all the PDP's will send to PAP. @@ -42,6 +42,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyIdentifier; @Getter @Setter @ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class PdpStatus extends PdpMessage { private String pdpType; @@ -53,10 +54,9 @@ public class PdpStatus extends PdpMessage { */ private String description; - private List policies; + private List policies; private String deploymentInstanceInfo; private String properties; - private PdpStatistics statistics; private PdpResponseDetails response; /** @@ -79,10 +79,9 @@ public class PdpStatus extends PdpMessage { this.state = source.state; this.healthy = source.healthy; this.description = source.description; - this.policies = PfUtils.mapList(source.policies, ToscaPolicyIdentifier::new, new ArrayList<>(0)); + this.policies = PfUtils.mapList(source.policies, ToscaConceptIdentifier::new, new ArrayList<>(0)); this.deploymentInstanceInfo = source.deploymentInstanceInfo; this.properties = source.properties; - this.statistics = (source.statistics == null ? null : new PdpStatistics(source.statistics)); this.response = (source.response == null ? null : new PdpResponseDetails(source.response)); } }