From b16ce237d780314ea8bbaf17cdb432bc694ee7e7 Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Tue, 29 Oct 2019 15:35:20 -0700 Subject: Fix dg-common bundle error Fix a dg-common blueprint error that was caused by the changes with the new appc-service-communicator. Added an interface for the EventSender, and created a blueprint file to publish the interface as a service. Change-Id: I37248fcbfa7cfa75e62965dad811b648c336b5e2 Signed-off-by: Patrick Brady Issue-ID: APPC-1744 --- .../dg/common/impl/DCAEReporterPluginImpl.java | 6 ++-- .../resources/OSGI-INF/blueprint/blueprint.xml | 2 +- .../appc/srvcomm/messaging/event/EventSender.java | 6 +++- .../messaging/event/EventSenderInterface.java | 14 ++++++++++ .../resources/OSGI-INF/blueprint/blueprint.xml | 32 ++++++++++++++++++++++ 5 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 appc-service-communicator/appc-service-communicator-bundle/src/main/java/org/onap/appc/srvcomm/messaging/event/EventSenderInterface.java create mode 100644 appc-service-communicator/appc-service-communicator-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/onap/appc/dg/common/impl/DCAEReporterPluginImpl.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/onap/appc/dg/common/impl/DCAEReporterPluginImpl.java index c69d1fe52..2b3c67882 100644 --- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/onap/appc/dg/common/impl/DCAEReporterPluginImpl.java +++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/onap/appc/dg/common/impl/DCAEReporterPluginImpl.java @@ -25,7 +25,7 @@ package org.onap.appc.dg.common.impl; import java.util.Map; import org.apache.commons.lang3.StringUtils; -import org.onap.appc.srvcomm.messaging.event.EventSender; +import org.onap.appc.srvcomm.messaging.event.EventSenderInterface; import org.onap.appc.srvcomm.messaging.MessageDestination; import org.onap.appc.srvcomm.messaging.event.EventHeader; import org.onap.appc.srvcomm.messaging.event.EventMessage; @@ -39,7 +39,7 @@ public class DCAEReporterPluginImpl implements DCAEReporterPlugin { private static final String ATTR_API_VERSION = "input.common-header.api-ver"; private static final String ATTR_REQUEST_ID = "input.common-header.request-id"; private static final String PARAM_EVENT_TOPIC_NAME = "event-topic-name"; - private EventSender eventSender; + private EventSenderInterface eventSender; public DCAEReporterPluginImpl() { // do nothing @@ -50,7 +50,7 @@ public class DCAEReporterPluginImpl implements DCAEReporterPlugin { * * @param eventSender to be set */ - public void setEventSender(EventSender eventSender) { + public void setEventSender(EventSenderInterface eventSender) { this.eventSender = eventSender; } diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dg/appc-dg-shared/appc-dg-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml index a90f463b9..27062d736 100644 --- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -33,7 +33,7 @@ + interface="org.onap.appc.srvcomm.messaging.event.EventSenderInterface"/> diff --git a/appc-service-communicator/appc-service-communicator-bundle/src/main/java/org/onap/appc/srvcomm/messaging/event/EventSender.java b/appc-service-communicator/appc-service-communicator-bundle/src/main/java/org/onap/appc/srvcomm/messaging/event/EventSender.java index c15670838..24442ac8b 100644 --- a/appc-service-communicator/appc-service-communicator-bundle/src/main/java/org/onap/appc/srvcomm/messaging/event/EventSender.java +++ b/appc-service-communicator/appc-service-communicator-bundle/src/main/java/org/onap/appc/srvcomm/messaging/event/EventSender.java @@ -37,7 +37,7 @@ import java.util.Date; import java.util.Map; -public class EventSender +public class EventSender implements EventSenderInterface { private final EELFLogger LOG = EELFManager.getInstance().getLogger(EventSender.class); public static final String PROPERTY_PREFIX = "dmaap.event"; @@ -50,6 +50,7 @@ public class EventSender messagingConnector = new MessagingConnector(); } + @Override public boolean sendEvent(MessageDestination destination, EventMessage msg) { String jsonStr = msg.toJson(); String id = msg.getEventHeader().getEventId(); @@ -58,6 +59,7 @@ public class EventSender return messagingConnector.publishMessage(propertyPrefix, id, jsonStr); } + @Override public boolean sendEvent(MessageDestination destination, EventMessage msg, String eventTopicName) { String jsonStr = msg.toJson(); String id = msg.getEventHeader().getEventId(); @@ -66,6 +68,7 @@ public class EventSender return messagingConnector.publishMessage(propertyPrefix, id, eventTopicName, jsonStr); } + @Override public boolean sendEvent(MessageDestination destination, Map params, SvcLogicContext ctx) throws APPCException { if (params == null) { @@ -94,4 +97,5 @@ public class EventSender return sendEvent(destination, eventMessage); } + } diff --git a/appc-service-communicator/appc-service-communicator-bundle/src/main/java/org/onap/appc/srvcomm/messaging/event/EventSenderInterface.java b/appc-service-communicator/appc-service-communicator-bundle/src/main/java/org/onap/appc/srvcomm/messaging/event/EventSenderInterface.java new file mode 100644 index 000000000..b5bb71de9 --- /dev/null +++ b/appc-service-communicator/appc-service-communicator-bundle/src/main/java/org/onap/appc/srvcomm/messaging/event/EventSenderInterface.java @@ -0,0 +1,14 @@ +package org.onap.appc.srvcomm.messaging.event; + +import java.util.Map; + +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.srvcomm.messaging.MessageDestination; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; + +public interface EventSenderInterface extends SvcLogicJavaPlugin { + boolean sendEvent(MessageDestination destination, EventMessage msg); + boolean sendEvent(MessageDestination destination, EventMessage msg,String eventTopicName); + boolean sendEvent(MessageDestination destination, Map params, SvcLogicContext ctx) throws APPCException; +} diff --git a/appc-service-communicator/appc-service-communicator-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-service-communicator/appc-service-communicator-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml new file mode 100644 index 000000000..603a5bfcc --- /dev/null +++ b/appc-service-communicator/appc-service-communicator-bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + -- cgit 1.2.3-korg