Merge changes Ibc78f5be,Id1a6e6d2

* changes:
  Fix code complexity
  Use diamond operator(<>)

1 files changed, 1 insertions, 6 deletions

diff --git a/status-control/src/main/java/org/openecomp/mso/HealthCheckUtils.java b/status-control/src/main/java/org/openecomp/mso/HealthCheckUtils.java
index 99635e936d..b098a8c852 100644
--- a/status-control/src/main/java/org/openecomp/mso/HealthCheckUtils.java
+++ b/status-control/src/main/java/org/openecomp/mso/HealthCheckUtils.java
@@ -25,17 +25,12 @@ import org.openecomp.mso.db.catalog.CatalogDatabase;
 import org.openecomp.mso.logger.MessageEnum;
 import org.openecomp.mso.logger.MsoLogger;
 import org.openecomp.mso.properties.MsoJavaProperties;
-import org.openecomp.mso.properties.MsoJsonProperties;
 import org.openecomp.mso.properties.MsoPropertiesFactory;
 import org.openecomp.mso.requestsdb.RequestsDatabase;
-import org.openecomp.mso.utils.UUIDChecker;
-import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 
@@ -288,7 +283,7 @@ public class HealthCheckUtils {
                 ip = ip.substring (0, length - 1);
             }
             return ip + url;
-        } else if (null != sslEnabled && "true".equals (sslEnabled.toLowerCase ())) {
+        } else if ("true".equalsIgnoreCase(sslEnabled)) {
             return "https://" + ip + ":" + port + url;
         } else {
             return "http://" + ip + ":" + port + url;