diff options
| author |   kurczews <krzysztof.kurczewski@nokia.com> | 2017-12-12 15:47:55 +0100 |
|---|---|---|
| committer | kurczews <krzysztof.kurczewski@nokia.com> | 2017-12-13 08:42:33 +0100 |
| commit | d52d6366effdbbcb243c06c031fe9f324f16c4a9 (patch) | |
| tree | 93917b4e3b9d409ea358deff6dfd21045a5ce12f /mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp | |
| parent | 32c33b3a3ee9a76bf2a78662ee36e05ce53a8854 (diff) | |
Reduce complexity of HealthCheckUtils
* Split bulk conditionals
* Split health checks to separate methods
* Fix minor issues
Issue-ID: SO-353
Change-Id: Ib6298bc488a94aa4fbb253e3894532708547533d
Signed-off-by: kurczews <krzysztof.kurczewski@nokia.com>
Diffstat (limited to 'mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp')
3 files changed, 3 insertions, 3 deletions
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/GlobalHealthcheckHandler.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/GlobalHealthcheckHandler.java index af0fabc380..52256d91b9 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/GlobalHealthcheckHandler.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/GlobalHealthcheckHandler.java @@ -53,7 +53,7 @@ public class GlobalHealthcheckHandler { // Generate a Request Id
String requestId = UUIDChecker.generateUUID(msoLogger);
HealthCheckUtils healthCheck = new HealthCheckUtils ();
- if (!healthCheck.siteStatusCheck (msoLogger, startTime)) {
+ if (!healthCheck.siteStatusCheck (msoLogger)) {
return HealthCheckUtils.HEALTH_CHECK_NOK_RESPONSE;
}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/HealthcheckHandler.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/HealthcheckHandler.java index 291414bf10..55f44a7449 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/HealthcheckHandler.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/HealthcheckHandler.java @@ -51,7 +51,7 @@ public class HealthcheckHandler { MsoLogger.setServiceName ("Healthcheck"); UUIDChecker.verifyOldUUID(requestId, msoLogger); HealthCheckUtils healthCheck = new HealthCheckUtils (); - if (!healthCheck.siteStatusCheck(msoLogger, startTime)) { + if (!healthCheck.siteStatusCheck(msoLogger)) { return HealthCheckUtils.HEALTH_CHECK_NOK_RESPONSE; } diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/NodeHealthcheckHandler.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/NodeHealthcheckHandler.java index beb26af88b..0191b546e3 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/NodeHealthcheckHandler.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/NodeHealthcheckHandler.java @@ -51,7 +51,7 @@ public class NodeHealthcheckHandler { // Generate a Request Id
String requestId = UUIDChecker.generateUUID(msoLogger);
HealthCheckUtils healthCheck = new HealthCheckUtils ();
- if (!healthCheck.siteStatusCheck (msoLogger, startTime)) {
+ if (!healthCheck.siteStatusCheck (msoLogger)) {
return HealthCheckUtils.HEALTH_CHECK_NOK_RESPONSE;
}
|