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=6312e375aaccc7bd55a4c1f9c6f0cccb1fd57a4f;hb=0b10c7fa768f05ae5146ce2f3a69998bb8f97a9f;hp=889dfafaaee5c8bdec2d24aa1e751145f2e3d534;hpb=d1b7bb42fe20c8c0131959f3e96668d8e6669d04;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 889dfafa..6312e375 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 @@ -1,9 +1,8 @@ - /*- * ========================LICENSE_START================================= * O-RAN-SC * %% - * Copyright (C) 2019 Nordix Foundation + * Copyright (C) 2020 Nordix Foundation * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,43 +20,156 @@ package org.oransc.policyagent.dmaap; +import com.google.common.collect.Iterables; + +import java.io.IOException; +import java.time.Duration; +import java.util.Properties; + +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.stereotype.Component; + /** - * The Dmaap consumer which has the base methods to be implemented by any class which implements this interface + * 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. + * + *
+ * Each received request is processed by {@link DmaapMessageHandler}.
*/
-public interface DmaapMessageConsumer {
+@Component
+public class DmaapMessageConsumer {
- /**
- * The init method creates the MRConsumer with the properties passed from the Application Config
- *
- * @param properties
- */
- public void init();
+ protected static final Duration TIME_BETWEEN_DMAAP_RETRIES = Duration.ofSeconds(10);
- /**
- * This method process the message and call the respective Controller
- *
- * @param msg
- * @throws Exception
- */
- public abstract void processMsg(String msg) throws Exception;
+ private static final Logger logger = LoggerFactory.getLogger(DmaapMessageConsumer.class);
+
+ private final ApplicationConfig applicationConfig;
+
+ @Value("${server.port}")
+ private int localServerPort;
+
+ @Autowired
+ public DmaapMessageConsumer(ApplicationConfig applicationConfig) {
+ this.applicationConfig = applicationConfig;
+ }
/**
- * To check whether the DMAAP Listner is alive
+ * Starts the consumer. If there is a DMaaP configuration, it will start polling for messages. Otherwise it will
+ * check regularly for the configuration.
*
- * @return boolean
+ * @return the running thread, for test purposes.
*/
- public boolean isAlive();
+ public Thread start() {
+ Thread thread = new Thread(this::checkConfigLoop);
+ thread.start();
+ return thread;
+ }
- /**
- * To Stop the DMAAP Listener
- */
- public void stopConsumer();
+ private void checkConfigLoop() {
+ while (!isStopped()) {
+ if (isDmaapConfigured()) {
+ messageHandlingLoop();
+ } else {
+ sleep(RefreshConfigTask.CONFIG_REFRESH_INTERVAL);
+ }
+ }
+ }
- /**
- * It's a infinite loop run every configured seconds to fetch the message from DMAAP. This method can be stop by
- * setting the alive flag to false
- */
- public void run();
+ private void messageHandlingLoop() {
+ while (!isStopped() && isDmaapConfigured()) {
+ try {
+ Iterable