X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fdmaap%2FDmaapMessageConsumer.java;h=0ee621322c05a3ba7a64c3d7142e09e32edc6e8a;hb=6a39814272307d0207222c9229b0d765ac062bf0;hp=dd60d3947a2845e54a19d90c6422e3aa3861f99c;hpb=73a8d2b71f8b683865d96ad78576d0f7ab654ba6;p=nonrtric.git
diff --git a/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageConsumer.java b/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageConsumer.java
index dd60d394..0ee62132 100644
--- a/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageConsumer.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageConsumer.java
@@ -21,33 +21,35 @@
package org.oransc.policyagent.dmaap;
import com.google.common.collect.Iterables;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
-import java.io.IOException;
import java.time.Duration;
-import java.util.Properties;
+import java.util.ArrayList;
+import java.util.List;
-import org.onap.dmaap.mr.client.MRBatchingPublisher;
-import org.onap.dmaap.mr.client.MRClientFactory;
-import org.onap.dmaap.mr.client.MRConsumer;
-import org.onap.dmaap.mr.client.response.MRConsumerResponse;
import org.oransc.policyagent.clients.AsyncRestClient;
import org.oransc.policyagent.configuration.ApplicationConfig;
import org.oransc.policyagent.exceptions.ServiceException;
-import org.oransc.policyagent.tasks.RefreshConfigTask;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
/**
- * The class fetches incoming requests from DMAAP. It uses the timeout parameter that lets the MessageRouter keep the
- * connection with the Kafka open until requests are sent in.
+ * The class fetches incoming requests from DMAAP. It uses the timeout parameter
+ * that lets the MessageRouter keep the connection with the Kafka open until
+ * requests are sent in.
*
- * If there is no DMaaP configuration in the application configuration, then this service will regularly check the
- * configuration and start polling DMaaP if the configuration is added. If the DMaaP configuration is removed, then the
- * service will stop polling and resume checking for configuration.
+ *
+ * this service will regularly check the configuration and start polling DMaaP
+ * if the configuration is added. If the DMaaP configuration is removed, then
+ * the service will stop polling and resume checking for configuration.
*
+ *
* Each received request is processed by {@link DmaapMessageHandler}.
*/
@Component
@@ -59,42 +61,44 @@ public class DmaapMessageConsumer {
private final ApplicationConfig applicationConfig;
- @Value("${server.port}")
- private int localServerPort;
+ private DmaapMessageHandler dmaapMessageHandler = null;
+
+ @Value("${server.http-port}")
+ private int localServerHttpPort;
@Autowired
public DmaapMessageConsumer(ApplicationConfig applicationConfig) {
this.applicationConfig = applicationConfig;
}
+ /**
+ * Starts the consumer. If there is a DMaaP configuration, it will start polling
+ * for messages. Otherwise it will check regularly for the configuration.
+ *
+ * @return the running thread, for test purposes.
+ */
public Thread start() {
- Thread thread = new Thread(() -> this.checkConfigLoop());
+ Thread thread = new Thread(this::messageHandlingLoop);
thread.start();
return thread;
}
- private void checkConfigLoop() {
- while (!isStopped()) {
- if (isDmaapConfigured()) {
- messageHandlingLoop();
- } else {
- sleep(RefreshConfigTask.CONFIG_REFRESH_INTERVAL);
- }
- }
- }
-
private void messageHandlingLoop() {
- while (!isStopped() && isDmaapConfigured()) {
+ while (!isStopped()) {
try {
- Iterable dmaapMsgs = fetchAllMessages();
- if (dmaapMsgs != null && Iterables.size(dmaapMsgs) > 0) {
- logger.debug("Fetched all the messages from DMAAP and will start to process the messages");
- for (String msg : dmaapMsgs) {
- processMsg(msg);
+ if (isDmaapConfigured()) {
+ Iterable dmaapMsgs = fetchAllMessages();
+ if (dmaapMsgs != null && Iterables.size(dmaapMsgs) > 0) {
+ logger.debug("Fetched all the messages from DMAAP and will start to process the messages");
+ for (String msg : dmaapMsgs) {
+ processMsg(msg);
+ }
}
+ } else {
+ sleep(TIME_BETWEEN_DMAAP_RETRIES); // wait for configuration
}
} catch (Exception e) {
- logger.warn("Cannot fetch because of {}", e.getMessage());
+ logger.warn("{}", e.getMessage());
sleep(TIME_BETWEEN_DMAAP_RETRIES);
}
}
@@ -105,40 +109,53 @@ public class DmaapMessageConsumer {
}
protected boolean isDmaapConfigured() {
- Properties consumerCfg = applicationConfig.getDmaapConsumerConfig();
- Properties producerCfg = applicationConfig.getDmaapPublisherConfig();
- return (consumerCfg != null && consumerCfg.size() > 0 && producerCfg != null && producerCfg.size() > 0);
+ String producerTopicUrl = applicationConfig.getDmaapProducerTopicUrl();
+ String consumerTopicUrl = applicationConfig.getDmaapConsumerTopicUrl();
+ return (!producerTopicUrl.isEmpty() && !consumerTopicUrl.isEmpty());
}
- protected Iterable fetchAllMessages() throws ServiceException, IOException {
- Properties dmaapConsumerProperties = this.applicationConfig.getDmaapConsumerConfig();
- MRConsumer consumer = getMessageRouterConsumer(dmaapConsumerProperties);
- MRConsumerResponse response = consumer.fetchWithReturnConsumerResponse();
- if (response == null || !"200".equals(response.getResponseCode())) {
- String errorMessage = "DMaaP NULL response received";
- if (response != null) {
- errorMessage = "Error respons " + response.getResponseCode() + " " + response.getResponseMessage()
- + " from DMaaP.";
+ private static List parseMessages(String jsonString) {
+ JsonArray arrayOfMessages = JsonParser.parseString(jsonString).getAsJsonArray();
+ List result = new ArrayList<>();
+ for (JsonElement element : arrayOfMessages) {
+ if (element.isJsonPrimitive()) {
+ result.add(element.getAsString());
+ } else {
+ String messageAsString = element.toString();
+ result.add(messageAsString);
}
- throw new ServiceException(errorMessage);
+ }
+ return result;
+ }
+
+ protected Iterable fetchAllMessages() throws ServiceException {
+ String topicUrl = this.applicationConfig.getDmaapConsumerTopicUrl();
+ AsyncRestClient consumer = getMessageRouterConsumer();
+ ResponseEntity response = consumer.getForEntity(topicUrl).block();
+ logger.debug("DMaaP consumer received {} : {}", response.getStatusCode(), response.getBody());
+ if (response.getStatusCode().is2xxSuccessful()) {
+ return parseMessages(response.getBody());
} else {
- logger.debug("DMaaP consumer received {} : {}", response.getResponseCode(), response.getResponseMessage());
- return response.getActualMessages();
+ throw new ServiceException("Cannot fetch because of Error respons: " + response.getStatusCode().toString()
+ + " " + response.getBody());
}
}
- private void processMsg(String msg) throws IOException {
+ private void processMsg(String msg) {
logger.debug("Message Reveived from DMAAP : {}", msg);
getDmaapMessageHandler().handleDmaapMsg(msg);
}
- private DmaapMessageHandler getDmaapMessageHandler() throws IOException {
- String agentBaseUrl = "https://localhost:" + this.localServerPort;
- AsyncRestClient agentClient = createRestClient(agentBaseUrl);
- Properties dmaapPublisherProperties = applicationConfig.getDmaapPublisherConfig();
- MRBatchingPublisher producer = getMessageRouterPublisher(dmaapPublisherProperties);
-
- return createDmaapMessageHandler(agentClient, producer);
+ protected DmaapMessageHandler getDmaapMessageHandler() {
+ if (this.dmaapMessageHandler == null) {
+ String agentBaseUrl = "http://localhost:" + this.localServerHttpPort;
+ AsyncRestClient agentClient =
+ new AsyncRestClient(agentBaseUrl, this.applicationConfig.getWebClientConfig());
+ AsyncRestClient producer = new AsyncRestClient(this.applicationConfig.getDmaapProducerTopicUrl(),
+ this.applicationConfig.getWebClientConfig());
+ this.dmaapMessageHandler = new DmaapMessageHandler(producer, agentClient);
+ }
+ return this.dmaapMessageHandler;
}
protected void sleep(Duration duration) {
@@ -149,19 +166,8 @@ public class DmaapMessageConsumer {
}
}
- protected MRConsumer getMessageRouterConsumer(Properties dmaapConsumerProperties) throws IOException {
- return MRClientFactory.createConsumer(dmaapConsumerProperties);
+ protected AsyncRestClient getMessageRouterConsumer() {
+ return new AsyncRestClient("", this.applicationConfig.getWebClientConfig());
}
- protected DmaapMessageHandler createDmaapMessageHandler(AsyncRestClient agentClient, MRBatchingPublisher producer) {
- return new DmaapMessageHandler(producer, agentClient);
- }
-
- protected AsyncRestClient createRestClient(String agentBaseUrl) {
- return new AsyncRestClient(agentBaseUrl);
- }
-
- protected MRBatchingPublisher getMessageRouterPublisher(Properties dmaapPublisherProperties) throws IOException {
- return MRClientFactory.createBatchingPublisher(dmaapPublisherProperties);
- }
}