X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=inline;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fdmaap%2FDmaapMessageConsumer.java;h=f13ffebdcd45aeff2e4a533b058768a9a04fe96f;hb=4db5e7d262aaa8ccf18feaa4bd93a6a925801333;hp=dd60d3947a2845e54a19d90c6422e3aa3861f99c;hpb=9c5cb8dff7e04d10141ce2b2d1c7fab2cf8ef508;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..f13ffebd 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,16 @@ 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}.
*/
@Component
@@ -59,6 +61,9 @@ public class DmaapMessageConsumer {
private final ApplicationConfig applicationConfig;
+ private DmaapMessageHandler dmaapMessageHandler = null;
+ private MRConsumer messageRouterConsumer = null;
+
@Value("${server.port}")
private int localServerPort;
@@ -67,31 +72,31 @@ public class DmaapMessageConsumer {
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