Fix bug with Apex rejecting HTTP 2xx responses

APEX rejects all HTTP responses except 200. This change accepts
any HTTP 2xx response code as a valid response.

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

diff --git a/examples/examples-decisionmaker/src/main/resources/examples/config/DecisionMaker/ApexConfigHealthCheckRESTClient.json b/examples/examples-decisionmaker/src/main/resources/examples/config/DecisionMaker/ApexConfigHealthCheckRESTClient.json
index ec7391a..ed90282 100644 (file)
--- a/examples/examples-decisionmaker/src/main/resources/examples/config/DecisionMaker/ApexConfigHealthCheckRESTClient.json
+++ b/examples/examples-decisionmaker/src/main/resources/examples/config/DecisionMaker/ApexConfigHealthCheckRESTClient.json
@@ -1,6 +1,6 @@
 {
     "javaProperties" : [
-        ["javax.net.ssl.trustStore", "/home/liam/tmp/distribution/etc/ssl/policy-truststore"],
+        ["javax.net.ssl.trustStore", "etc/ssl/policy-truststore"],
         ["javax.net.ssl.trustStorePassword", "UG9sMWN5XzBuYXA="]
     ],
     "engineServiceParameters": {

diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/main/java/org/onap/policy/apex/plugins/event/carrier/restclient/ApexRestClientConsumer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/main/java/org/onap/policy/apex/plugins/event/carrier/restclient/ApexRestClientConsumer.java
index 5591777..ddd000d 100644 (file)
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/main/java/org/onap/policy/apex/plugins/event/carrier/restclient/ApexRestClientConsumer.java
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/main/java/org/onap/policy/apex/plugins/event/carrier/restclient/ApexRestClientConsumer.java
@@ -205,7 +205,7 @@ public class ApexRestClientConsumer implements ApexEventConsumer, Runnable {
                     .headers(restConsumerProperties.getHttpHeadersAsMultivaluedMap()).get();
 
                 // Check that the event request worked
-                if (response.getStatus() != Response.Status.OK.getStatusCode()) {
+                if (!Response.Status.Family.familyOf(response.getStatus()).equals(Response.Status.Family.SUCCESSFUL)) {
                     final String errorMessage = "reception of event from URL \"" + restConsumerProperties.getUrl()
                         + "\" failed with status code " + response.getStatus() + " and message \""
                         + response.readEntity(String.class) + "\"";

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 746fc85..57c14b9 100644 (file)
--- 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
@@ -351,7 +351,7 @@ public class ApexRestRequestorConsumer implements ApexEventConsumer, Runnable {
                 final Response response = sendEventAsRestRequest();
 
                 // Check that the event request worked
-                if (response.getStatus() != Response.Status.OK.getStatusCode()) {
+                if (!Response.Status.Family.familyOf(response.getStatus()).equals(Response.Status.Family.SUCCESSFUL)) {
                     final String errorMessage = "reception of response to \"" + request + "\" from URL \""
                                     + restConsumerProperties.getUrl() + "\" failed with status code "
                                     + response.getStatus() + " and message \"" + response.readEntity(String.class)