From fe5d78724f723a451ddc0d7cc41d6fc60092b314 Mon Sep 17 00:00:00 2001
From: Jim Hahn <jrh3@att.com>
Date: Thu, 13 Jun 2019 12:34:17 -0400
Subject: More sonar fixes in policy/common

Note: this does not increase code coverage, but should fix other
code issues.

Resolved cyclomatic complexity issue in ParameterValidationResult.
Refactored duplicate code in GroupValidationResult.
Removed IOException from NetworkUtil "throws".
Replaced null/empty string tests with StringUtils.isBlank().
Added @FunctionalInterface where needed.
Replaced anonymous classes with lambda expressions.
Replaced duplicate strings with a constant.
Added private constructors for utility classes.
Removed sleep() from tests.
Removed unused parameter from method call.
Made some protected methods private.
Compute integrity monitor's state-transition table once.
Use for-loop instead of iterator.
Moved constructors.
Fixed some checkstyle issues (tabs => spaces, trailing spaces).

Change-Id: I9a962ca45c4ff3f212c6014da799d06f07b232ef
Issue-ID: POLICY-1791
Signed-off-by: Jim Hahn <jrh3@att.com>
---
 .../main/java/org/onap/policy/common/utils/network/NetworkUtil.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'utils/src')

diff --git a/utils/src/main/java/org/onap/policy/common/utils/network/NetworkUtil.java b/utils/src/main/java/org/onap/policy/common/utils/network/NetworkUtil.java
index 3976c7a2..6014b581 100644
--- a/utils/src/main/java/org/onap/policy/common/utils/network/NetworkUtil.java
+++ b/utils/src/main/java/org/onap/policy/common/utils/network/NetworkUtil.java
@@ -21,7 +21,6 @@
 package org.onap.policy.common.utils.network;
 
 import java.io.IOException;
-import java.net.ConnectException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
@@ -132,13 +131,13 @@ public class NetworkUtil {
      * @throws InterruptedException if execution has been interrupted
      */
     public static boolean isTcpPortOpen(String host, int port, int retries, long interval)
-            throws InterruptedException, IOException {
+            throws InterruptedException {
         int retry = 0;
         while (retry < retries) {
             try (Socket s = new Socket(host, port)) {
                 logger.debug("{}:{} connected - retries={} interval={}", host, port, retries, interval);
                 return true;
-            } catch (final ConnectException e) {
+            } catch (final IOException e) {
                 retry++;
                 logger.trace("{}:{} connected - retries={} interval={}", host, port, retries, interval, e);
                 Thread.sleep(interval);
-- 
cgit 1.2.3-korg