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 /adapters/mso-sdnc-adapter/src/main | |
| 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 'adapters/mso-sdnc-adapter/src/main')
2 files changed, 4 insertions, 4 deletions
diff --git a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/impl/SDNCAdapterRestImpl.java b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/impl/SDNCAdapterRestImpl.java index c69aee52da..f6a3e36a71 100644 --- a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/impl/SDNCAdapterRestImpl.java +++ b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/impl/SDNCAdapterRestImpl.java @@ -131,7 +131,7 @@ public class SDNCAdapterRestImpl { 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; } @@ -152,7 +152,7 @@ public class SDNCAdapterRestImpl { // 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; } @@ -175,7 +175,7 @@ public class SDNCAdapterRestImpl { // 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/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCAdapterRest.java b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCAdapterRest.java index 0c787cac83..f7a37fc202 100644 --- a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCAdapterRest.java +++ b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCAdapterRest.java @@ -58,7 +58,7 @@ public class SDNCAdapterRest { UUIDChecker.verifyOldUUID(requestId, LOGGER); HealthCheckUtils healthCheck = new HealthCheckUtils(); - if (!healthCheck.siteStatusCheck(LOGGER, startTime)) { + if (!healthCheck.siteStatusCheck(LOGGER)) { return HealthCheckUtils.HEALTH_CHECK_NOK_RESPONSE; } |