From 20e2a1787c703a7957728e0c9a190a556b0ae536 Mon Sep 17 00:00:00 2001 From: FrancescoFioraEst Date: Mon, 9 Aug 2021 16:27:25 +0100 Subject: Fix serialization of messages in Control Loop and Participants MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Issue-ID: POLICY-3536 Change-Id: I72207ba8b3894238412bf19c32b799b661a23c21 Signed-off-by: FrancescoFioraEst --- .../models/messages/dmaap/participant/ParticipantStatus.java | 5 ++--- .../models/messages/dmaap/participant/ParticipantUpdate.java | 5 +---- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'models/src/main') diff --git a/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantStatus.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantStatus.java index c3e630681..a8b268b4d 100644 --- a/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantStatus.java +++ b/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantStatus.java @@ -32,7 +32,6 @@ import org.onap.policy.clamp.controlloop.models.controlloop.concepts.Participant import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ParticipantState; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ParticipantStatistics; import org.onap.policy.models.base.PfUtils; -import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; /** * Class to represent the PARTICIPANT_STATUS message that all the participants send to the control loop runtime. @@ -51,11 +50,11 @@ public class ParticipantStatus extends ParticipantMessage { // A map with Participant ID as its key, and a map of ControlLoopElements as value. // Returned in response to ParticipantStatusReq only - private Map> + private Map> participantDefinitionUpdateMap = new LinkedHashMap<>(); // Map of ControlLoopInfo types indexed by ControlLoopId, one entry for each control loop - private Map controlLoopInfoMap; + private Map controlLoopInfoMap; /** * Constructor for instantiating ParticipantStatus class with message name. diff --git a/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantUpdate.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantUpdate.java index 5fd00e278..2733de474 100644 --- a/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantUpdate.java +++ b/models/src/main/java/org/onap/policy/clamp/controlloop/models/messages/dmaap/participant/ParticipantUpdate.java @@ -23,14 +23,11 @@ package org.onap.policy.clamp.controlloop.models.messages.dmaap.participant; import java.util.LinkedHashMap; import java.util.Map; import java.util.UUID; -import java.util.function.UnaryOperator; import lombok.Getter; import lombok.Setter; import lombok.ToString; import org.onap.policy.clamp.controlloop.models.controlloop.concepts.ControlLoopElementDefinition; import org.onap.policy.models.base.PfUtils; -import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; -import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; /** * Class to represent the PARTICIPANT_UPDATE message that the control loop runtime sends to a participant. @@ -42,7 +39,7 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; public class ParticipantUpdate extends ParticipantMessage { // A map with Participant ID as its key, and a map of ControlLoopElements as value. - private Map> + private Map> participantDefinitionUpdateMap = new LinkedHashMap<>(); /** -- cgit 1.2.3-korg