diff options
Diffstat (limited to 'runtime-acm/src/main/java')
7 files changed, 18 insertions, 28 deletions
diff --git a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProvider.java b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProvider.java index 099c0e740..53288d15e 100644 --- a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProvider.java +++ b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/instantiation/AutomationCompositionInstantiationProvider.java @@ -243,7 +243,7 @@ public class AutomationCompositionInstantiationProvider { var result = new BeanValidationResult("AutomationComposition", automationComposition); var participantMap = participants.stream() - .collect(Collectors.toMap(participant -> participant.getKey().asIdentifier(), Function.identity())); + .collect(Collectors.toMap(participant -> participant.getParticipantId(), Function.identity())); for (var element : automationComposition.getElements().values()) { diff --git a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/participants/AcmParticipantProvider.java b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/participants/AcmParticipantProvider.java index 617f75668..18a8e8a26 100644 --- a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/participants/AcmParticipantProvider.java +++ b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/participants/AcmParticipantProvider.java @@ -23,12 +23,11 @@ package org.onap.policy.clamp.acm.runtime.participants; import java.util.ArrayList; import java.util.List; import java.util.UUID; +import lombok.RequiredArgsConstructor; import org.onap.policy.clamp.acm.runtime.supervision.comm.ParticipantStatusReqPublisher; -import org.onap.policy.clamp.models.acm.concepts.Participant; import org.onap.policy.clamp.models.acm.concepts.ParticipantInformation; import org.onap.policy.clamp.models.acm.concepts.ParticipantState; import org.onap.policy.clamp.models.acm.persistence.provider.ParticipantProvider; -import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -36,25 +35,20 @@ import org.springframework.transaction.annotation.Transactional; @Service @Transactional +@RequiredArgsConstructor public class AcmParticipantProvider { private static final Logger LOGGER = LoggerFactory.getLogger(AcmParticipantProvider.class); private final ParticipantProvider participantProvider; private final ParticipantStatusReqPublisher participantStatusReqPublisher; - public AcmParticipantProvider(ParticipantProvider participantProvider, - ParticipantStatusReqPublisher participantStatusReqPublisher) { - this.participantProvider = participantProvider; - this.participantStatusReqPublisher = participantStatusReqPublisher; - } - /** * Get all participants. * * @return A list of available participants */ public List<ParticipantInformation> getAllParticipants() { - List<Participant> participants = this.participantProvider.getParticipants(); + var participants = this.participantProvider.getParticipants(); List<ParticipantInformation> participantInformationList = new ArrayList<>(); participants.forEach(participant -> { @@ -72,8 +66,8 @@ public class AcmParticipantProvider { * @return The participant */ public ParticipantInformation getParticipantById(UUID participantId) { - Participant participant = this.participantProvider.getParticipantById(participantId); - ParticipantInformation participantInformation = new ParticipantInformation(); + var participant = this.participantProvider.getParticipantById(participantId); + var participantInformation = new ParticipantInformation(); participantInformation.setParticipant(participant); return participantInformation; } @@ -84,11 +78,10 @@ public class AcmParticipantProvider { * @param participantId The UUID of the participant to send request to */ public void sendParticipantStatusRequest(UUID participantId) { - Participant participant = this.participantProvider.getParticipantById(participantId); - ToscaConceptIdentifier id = participant.getKey().asIdentifier(); + var participant = this.participantProvider.getParticipantById(participantId); LOGGER.debug("Requesting Participant Status Now ParticipantStatusReq"); - participantStatusReqPublisher.send(id); + participantStatusReqPublisher.send(participantId); participant.setParticipantState(ParticipantState.OFF_LINE); participantProvider.updateParticipant(participant); } @@ -98,6 +91,6 @@ public class AcmParticipantProvider { * */ public void sendAllParticipantStatusRequest() { - this.participantStatusReqPublisher.send((ToscaConceptIdentifier) null); + this.participantStatusReqPublisher.send((UUID) null); } } diff --git a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionParticipantHandler.java b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionParticipantHandler.java index 6f0f5cc7b..f58543684 100644 --- a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionParticipantHandler.java +++ b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionParticipantHandler.java @@ -106,9 +106,7 @@ public class SupervisionParticipantHandler { if (participantOpt.isEmpty()) { ParticipantRegister registerMessage = (ParticipantRegister) participantMessage; var participant = new Participant(); - participant.setName(registerMessage.getParticipantId().getName()); - participant.setVersion(registerMessage.getParticipantId().getVersion()); - participant.setDefinition(registerMessage.getParticipantId()); + participant.setParticipantId(participantMessage.getParticipantId()); participant.setParticipantType(registerMessage.getParticipantType()); participant.setParticipantSupportedElementTypes(listToMap(registerMessage .getParticipantSupportedElementType())); diff --git a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionScanner.java b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionScanner.java index f758c9893..0e5aab5e3 100644 --- a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionScanner.java +++ b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/SupervisionScanner.java @@ -36,7 +36,6 @@ import org.onap.policy.clamp.models.acm.concepts.ParticipantUtils; import org.onap.policy.clamp.models.acm.persistence.provider.AcDefinitionProvider; import org.onap.policy.clamp.models.acm.persistence.provider.AutomationCompositionProvider; import org.onap.policy.clamp.models.acm.persistence.provider.ParticipantProvider; -import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,7 +49,7 @@ public class SupervisionScanner { private static final Logger LOGGER = LoggerFactory.getLogger(SupervisionScanner.class); private final HandleCounter<UUID> automationCompositionCounter = new HandleCounter<>(); - private final HandleCounter<ToscaConceptIdentifier> participantStatusCounter = new HandleCounter<>(); + private final HandleCounter<UUID> participantStatusCounter = new HandleCounter<>(); private final Map<UUID, Integer> phaseMap = new HashMap<>(); @@ -118,7 +117,7 @@ public class SupervisionScanner { } private void scanParticipantStatus(Participant participant) { - var id = participant.getKey().asIdentifier(); + var id = participant.getParticipantId(); if (participantStatusCounter.isFault(id)) { LOGGER.debug("report Participant fault"); return; @@ -135,7 +134,7 @@ public class SupervisionScanner { /** * handle participant Status message. */ - public void handleParticipantStatus(ToscaConceptIdentifier id) { + public void handleParticipantStatus(UUID id) { participantStatusCounter.clear(id); } diff --git a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/ParticipantRegisterAckPublisher.java b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/ParticipantRegisterAckPublisher.java index bd8f2b560..3cadff6ee 100644 --- a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/ParticipantRegisterAckPublisher.java +++ b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/ParticipantRegisterAckPublisher.java @@ -40,7 +40,7 @@ public class ParticipantRegisterAckPublisher extends AbstractParticipantAckPubli * @param participantType the participant Type */ @Timed(value = "publisher.participant_register_ack", description = "PARTICIPANT_REGISTER_ACK messages published") - public void send(UUID responseTo, ToscaConceptIdentifier participantId, ToscaConceptIdentifier participantType) { + public void send(UUID responseTo, UUID participantId, ToscaConceptIdentifier participantType) { var message = new ParticipantRegisterAck(); message.setParticipantId(participantId); message.setParticipantType(participantType); diff --git a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/ParticipantStatusReqPublisher.java b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/ParticipantStatusReqPublisher.java index d1f183ee8..db69cdaf8 100644 --- a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/ParticipantStatusReqPublisher.java +++ b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/ParticipantStatusReqPublisher.java @@ -22,8 +22,8 @@ package org.onap.policy.clamp.acm.runtime.supervision.comm; import io.micrometer.core.annotation.Timed; import java.time.Instant; +import java.util.UUID; import org.onap.policy.clamp.models.acm.messages.dmaap.participant.ParticipantStatusReq; -import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -39,7 +39,7 @@ public class ParticipantStatusReqPublisher extends AbstractParticipantPublisher< * @param participantId the participant Id */ @Timed(value = "publisher.participant_status_req", description = "PARTICIPANT_STATUS_REQ messages published") - public void send(ToscaConceptIdentifier participantId) { + public void send(UUID participantId) { ParticipantStatusReq message = new ParticipantStatusReq(); message.setParticipantId(participantId); message.setTimestamp(Instant.now()); diff --git a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/ParticipantUpdatePublisher.java b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/ParticipantUpdatePublisher.java index af9023815..504ddc28c 100644 --- a/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/ParticipantUpdatePublisher.java +++ b/runtime-acm/src/main/java/org/onap/policy/clamp/acm/runtime/supervision/comm/ParticipantUpdatePublisher.java @@ -68,7 +68,7 @@ public class ParticipantUpdatePublisher extends AbstractParticipantPublisher<Par * @param participantId the ParticipantId */ @Timed(value = "publisher.participant_update", description = "PARTICIPANT_UPDATE messages published") - public void sendCommissioning(ToscaConceptIdentifier participantType, ToscaConceptIdentifier participantId) { + public void sendCommissioning(ToscaConceptIdentifier participantType, UUID participantId) { var list = acDefinitionProvider.getAllAcDefinitions(); if (list.isEmpty()) { LOGGER.warn("No tosca service template found, cannot send participantupdate"); @@ -88,7 +88,7 @@ public class ParticipantUpdatePublisher extends AbstractParticipantPublisher<Par */ @Timed(value = "publisher.participant_update", description = "PARTICIPANT_UPDATE messages published") public void sendCommissioning(AutomationCompositionDefinition acmDefinition, - ToscaConceptIdentifier participantType, ToscaConceptIdentifier participantId) { + ToscaConceptIdentifier participantType, UUID participantId) { var message = new ParticipantUpdate(); message.setCompositionId(acmDefinition.getCompositionId()); message.setParticipantType(participantType); |