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=011b9779bb5d626d4e0550c1e7e4b3f946b78ecb;hb=4916d96ee10a9f351356b026c84a3cd7ee8165e6;hp=6312e375aaccc7bd55a4c1f9c6f0cccb1fd57a4f;hpb=2b05f15336c57960af51e3a6cbf5705b6b88c4fd;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 6312e375..011b9779 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 @@ -33,7 +33,6 @@ 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; @@ -41,13 +40,14 @@ import org.springframework.beans.factory.annotation.Value; 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}.
@@ -61,8 +61,11 @@ public class DmaapMessageConsumer {
private final ApplicationConfig applicationConfig;
- @Value("${server.port}")
- private int localServerPort;
+ private DmaapMessageHandler dmaapMessageHandler = null;
+ private MRConsumer messageRouterConsumer = null;
+
+ @Value("${server.http-port}")
+ private int localServerHttpPort;
@Autowired
public DmaapMessageConsumer(ApplicationConfig applicationConfig) {
@@ -70,36 +73,30 @@ public class DmaapMessageConsumer {
}
/**
- * Starts the consumer. If there is a DMaaP configuration, it will start polling for messages. Otherwise it will
- * check regularly for the configuration.
+ * 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