Fix intermittent unit test failures reseterquestor

When consumers and producers are paired as in the case of the REST
Rquestor, both sides must come up and be wired together in the
initiation phase of apex-pdp before the consumers and producers start
handling envents.

In the ApexActivator class, the consumers were started immediately after
they were initialized meaning that a consumer could return events to a
producer that had not started yet.

This change fixes the ApexActivator so that it waits until all consumers
and producers are initialized before starting event handling.

It also fixes the timings on RestRequestor tests and tidies up the unit
tests.

Issue-ID: POLICY-2469
Change-Id: Ib66d9531bf21f2a879ab33795aded4f48e7bfbc6
Signed-off-by: liamfallon <liam.fallon@est.tech>

2 files changed, 33 insertions, 52 deletions

diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumer.java
index 57560d2ef..80f8fa66e 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumer.java
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumer.java
@@ -34,9 +34,9 @@ import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
-
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.Entity;
@@ -103,39 +103,36 @@ public class ApexRestRequestorConsumer extends ApexPluginsEventConsumer {
 
     @Override
     public void init(final String consumerName, final EventHandlerParameters consumerParameters,
-            final ApexEventReceiver incomingEventReceiver) throws ApexEventException {
+        final ApexEventReceiver incomingEventReceiver) throws ApexEventException {
         this.eventReceiver = incomingEventReceiver;
         this.name = consumerName;
 
         // Check and get the REST Properties
         if (!(consumerParameters
-                .getCarrierTechnologyParameters() instanceof RestRequestorCarrierTechnologyParameters)) {
+            .getCarrierTechnologyParameters() instanceof RestRequestorCarrierTechnologyParameters)) {
             final String errorMessage =
-                    "specified consumer properties are not applicable to REST Requestor consumer (" + this.name + ")";
-            LOGGER.warn(errorMessage);
+                "specified consumer properties are not applicable to REST Requestor consumer (" + this.name + ")";
             throw new ApexEventException(errorMessage);
         }
         restConsumerProperties =
-                (RestRequestorCarrierTechnologyParameters) consumerParameters.getCarrierTechnologyParameters();
+            (RestRequestorCarrierTechnologyParameters) consumerParameters.getCarrierTechnologyParameters();
 
         // Check if we are in peered mode
         if (!consumerParameters.isPeeredMode(EventHandlerPeeredMode.REQUESTOR)) {
             final String errorMessage = "REST Requestor consumer (" + this.name
-                    + ") must run in peered requestor mode with a REST Requestor producer";
-            LOGGER.warn(errorMessage);
+                + ") must run in peered requestor mode with a REST Requestor producer";
             throw new ApexEventException(errorMessage);
         }
 
         // Check if the HTTP method has been set
         if (restConsumerProperties.getHttpMethod() == null) {
             restConsumerProperties
-                    .setHttpMethod(RestRequestorCarrierTechnologyParameters.DEFAULT_REQUESTOR_HTTP_METHOD);
+                .setHttpMethod(RestRequestorCarrierTechnologyParameters.DEFAULT_REQUESTOR_HTTP_METHOD);
         }
 
         // Check if the HTTP URL has been set
         if (restConsumerProperties.getUrl() == null) {
             final String errorMessage = "no URL has been specified on REST Requestor consumer (" + this.name + ")";
-            LOGGER.warn(errorMessage);
             throw new ApexEventException(errorMessage);
         }
 
@@ -144,7 +141,6 @@ public class ApexRestRequestorConsumer extends ApexPluginsEventConsumer {
             new URL(restConsumerProperties.getUrl());
         } catch (final Exception e) {
             final String errorMessage = "invalid URL has been specified on REST Requestor consumer (" + this.name + ")";
-            LOGGER.warn(errorMessage);
             throw new ApexEventException(errorMessage, e);
         }
 
@@ -157,8 +153,8 @@ public class ApexRestRequestorConsumer extends ApexPluginsEventConsumer {
 
         // Check if HTTP headers has been set
         if (restConsumerProperties.checkHttpHeadersSet()) {
-            LOGGER.debug("REST Requestor consumer has http headers ({}): {}", this.name,
-                    Arrays.deepToString(restConsumerProperties.getHttpHeaders()));
+            final String httpHeaderString = Arrays.deepToString(restConsumerProperties.getHttpHeaders());
+            LOGGER.debug("REST Requestor consumer has http headers ({}): {}", this.name, httpHeaderString);
         }
 
         // Initialize the HTTP client
@@ -177,8 +173,7 @@ public class ApexRestRequestorConsumer extends ApexPluginsEventConsumer {
             incomingRestRequestQueue.add(restRequest);
         } catch (final Exception requestException) {
             final String errorMessage =
-                    "could not queue request \"" + restRequest + "\" on REST Requestor consumer (" + this.name + ")";
-            LOGGER.warn(errorMessage, requestException);
+                "could not queue request \"" + restRequest + "\" on REST Requestor consumer (" + this.name + ")";
             throw new ApexEventRuntimeException(errorMessage);
         }
     }
@@ -202,7 +197,7 @@ public class ApexRestRequestorConsumer extends ApexPluginsEventConsumer {
             try {
                 // Take the next event from the queue
                 final ApexRestRequest restRequest =
-                        incomingRestRequestQueue.poll(REST_REQUESTOR_WAIT_SLEEP_TIME, TimeUnit.MILLISECONDS);
+                    incomingRestRequestQueue.poll(REST_REQUESTOR_WAIT_SLEEP_TIME, TimeUnit.MILLISECONDS);
                 if (restRequest == null) {
                     // Poll timed out, check for request timeouts
                     timeoutExpiredRequests();
@@ -215,11 +210,11 @@ public class ApexRestRequestorConsumer extends ApexPluginsEventConsumer {
                     Set<String> names = restConsumerProperties.getKeysFromUrl();
                     Set<String> inputProperty = inputExecutionProperties.stringPropertyNames();
 
-                    names.stream().map(Optional::of).forEach(op ->
-                        op.filter(inputProperty::contains)
-                                .orElseThrow(() -> new ApexEventRuntimeException(
-                                        "key\"" + op.get() + "\"specified on url \"" + restConsumerProperties.getUrl()
-                                                + "\"not found in execution properties passed by the current policy")));
+                    names.stream().map(Optional::of)
+                        .forEach(op -> op.filter(inputProperty::contains)
+                            .orElseThrow(() -> new ApexEventRuntimeException(
+                                "key\"" + op.get() + "\"specified on url \"" + restConsumerProperties.getUrl()
+                                    + "\"not found in execution properties passed by the current policy")));
 
                     untaggedUrl = names.stream().reduce(untaggedUrl,
                         (acc, str) -> acc.replace("{" + str + "}", (String) inputExecutionProperties.get(str)));
@@ -264,7 +259,7 @@ public class ApexRestRequestorConsumer extends ApexPluginsEventConsumer {
         // Interrupt timed out requests and remove them from the ongoing map
         for (final ApexRestRequest timedoutRequest : timedoutRequestList) {
             final String errorMessage =
-                    "REST Requestor consumer (" + this.name + "), REST request timed out: " + timedoutRequest;
+                "REST Requestor consumer (" + this.name + "), REST request timed out: " + timedoutRequest;
             LOGGER.warn(errorMessage);
 
             ongoingRestRequestMap.remove(timedoutRequest);
@@ -324,8 +319,8 @@ public class ApexRestRequestorConsumer extends ApexPluginsEventConsumer {
                 // Check that the request worked
                 if (!isPass.matches()) {
                     final String errorMessage = "reception of event from URL \"" + restConsumerProperties.getUrl()
-                            + "\" failed with status code " + response.getStatus() + " and message \""
-                            + response.readEntity(String.class) + "\"";
+                        + "\" failed with status code " + response.getStatus() + " and message \""
+                        + response.readEntity(String.class) + "\"";
                     throw new ApexEventRuntimeException(errorMessage);
                 }
 
@@ -335,7 +330,7 @@ public class ApexRestRequestorConsumer extends ApexPluginsEventConsumer {
                 // Check there is content
                 if (StringUtils.isBlank(eventJsonString)) {
                     final String errorMessage =
-                            "received an empty response to \"" + request + "\" from URL \"" + untaggedUrl + "\"";
+                        "received an empty response to \"" + request + "\" from URL \"" + untaggedUrl + "\"";
                     throw new ApexEventRuntimeException(errorMessage);
                 }
 
@@ -372,7 +367,7 @@ public class ApexRestRequestorConsumer extends ApexPluginsEventConsumer {
          */
         public Response sendEventAsRestRequest(String untaggedUrl) {
             Builder headers = client.target(untaggedUrl).request(APPLICATION_JSON)
-                    .headers(restConsumerProperties.getHttpHeadersAsMultivaluedMap());
+                .headers(restConsumerProperties.getHttpHeadersAsMultivaluedMap());
             switch (restConsumerProperties.getHttpMethod()) {
                 case GET:
                     return headers.get();
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorProducer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorProducer.java
index e166bdc1f..fe2f6c53b 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorProducer.java
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorProducer.java
@@ -30,8 +30,6 @@ import org.onap.policy.apex.service.engine.event.ApexPluginsEventProducer;
 import org.onap.policy.apex.service.engine.event.PeeredReference;
 import org.onap.policy.apex.service.parameters.eventhandler.EventHandlerParameters;
 import org.onap.policy.apex.service.parameters.eventhandler.EventHandlerPeeredMode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Concrete implementation of an Apex event requestor that manages the producer side of a REST request.
@@ -40,11 +38,6 @@ import org.slf4j.LoggerFactory;
  *
  */
 public class ApexRestRequestorProducer extends ApexPluginsEventProducer {
-    private static final Logger LOGGER = LoggerFactory.getLogger(ApexRestRequestorProducer.class);
-
-    // The REST carrier properties
-    private RestRequestorCarrierTechnologyParameters restProducerProperties;
-
     // The number of events sent
     private int eventsSent = 0;
 
@@ -53,40 +46,36 @@ public class ApexRestRequestorProducer extends ApexPluginsEventProducer {
      */
     @Override
     public void init(final String producerName, final EventHandlerParameters producerParameters)
-            throws ApexEventException {
+        throws ApexEventException {
         this.name = producerName;
 
         // Check and get the REST Properties
         if (!(producerParameters
-                .getCarrierTechnologyParameters() instanceof RestRequestorCarrierTechnologyParameters)) {
+            .getCarrierTechnologyParameters() instanceof RestRequestorCarrierTechnologyParameters)) {
             final String errorMessage =
-                    "specified producer properties are not applicable to REST requestor producer (" + this.name + ")";
-            LOGGER.warn(errorMessage);
+                "specified producer properties are not applicable to REST requestor producer (" + this.name + ")";
             throw new ApexEventException(errorMessage);
         }
-        restProducerProperties =
-                (RestRequestorCarrierTechnologyParameters) producerParameters.getCarrierTechnologyParameters();
+        RestRequestorCarrierTechnologyParameters restProducerProperties =
+            (RestRequestorCarrierTechnologyParameters) producerParameters.getCarrierTechnologyParameters();
 
         // Check if we are in peered mode
         if (!producerParameters.isPeeredMode(EventHandlerPeeredMode.REQUESTOR)) {
             final String errorMessage = "REST Requestor producer (" + this.name
-                    + ") must run in peered requestor mode with a REST Requestor consumer";
-            LOGGER.warn(errorMessage);
+                + ") must run in peered requestor mode with a REST Requestor consumer";
             throw new ApexEventException(errorMessage);
         }
 
         // Check if the HTTP URL has been set
         if (restProducerProperties.getUrl() != null) {
             final String errorMessage = "URL may not be specified on REST Requestor producer (" + this.name + ")";
-            LOGGER.warn(errorMessage);
             throw new ApexEventException(errorMessage);
         }
 
         // Check if the HTTP method has been set
         if (restProducerProperties.getHttpMethod() != null) {
             final String errorMessage =
-                    "HTTP method may not be specified on REST Requestor producer (" + this.name + ")";
-            LOGGER.warn(errorMessage);
+                "HTTP method may not be specified on REST Requestor producer (" + this.name + ")";
             throw new ApexEventException(errorMessage);
         }
     }
@@ -105,7 +94,7 @@ public class ApexRestRequestorProducer extends ApexPluginsEventProducer {
      */
     @Override
     public void sendEvent(final long executionId, final Properties executionProperties, final String eventName,
-            final Object event) {
+        final Object event) {
         super.sendEvent(executionId, executionProperties, eventName, event);
 
         // Find the peered consumer for this producer
@@ -114,23 +103,20 @@ public class ApexRestRequestorProducer extends ApexPluginsEventProducer {
             // Find the REST Response Consumer that will handle this request
             final ApexEventConsumer consumer = peeredRequestorReference.getPeeredConsumer();
             if (!(consumer instanceof ApexRestRequestorConsumer)) {
-                final String errorMessage = "send of event to URL \"" + restProducerProperties.getUrl() + "\" failed,"
-                        + " REST response consumer is not an instance of ApexRestRequestorConsumer\n" + event;
-                LOGGER.warn(errorMessage);
+                final String errorMessage = "send of event failed,"
+                    + " REST response consumer is not an instance of ApexRestRequestorConsumer\n" + event;
                 throw new ApexEventRuntimeException(errorMessage);
             }
 
             // Use the consumer to handle this event
             final ApexRestRequestorConsumer restRequstConsumer = (ApexRestRequestorConsumer) consumer;
             restRequstConsumer
-                    .processRestRequest(new ApexRestRequest(executionId, executionProperties, eventName, event));
+                .processRestRequest(new ApexRestRequest(executionId, executionProperties, eventName, event));
 
             eventsSent++;
         } else {
             // No peered consumer defined
-            final String errorMessage = "send of event to URL \"" + restProducerProperties.getUrl() + "\" failed,"
-                    + " REST response consumer is not defined\n" + event;
-            LOGGER.warn(errorMessage);
+            final String errorMessage = "send of event failed," + " REST response consumer is not defined\n" + event;
             throw new ApexEventRuntimeException(errorMessage);
         }
     }