1 files changed, 40 insertions, 35 deletions
diff --git a/src/main/java/org/onap/msb/sdk/discovery/util/RegExpTestUtil.java b/src/main/java/org/onap/msb/sdk/discovery/util/RegExpTestUtil.java
index 9afeb7c..363c8c4 100644
--- a/src/main/java/org/onap/msb/sdk/discovery/util/RegExpTestUtil.java
+++ b/src/main/java/org/onap/msb/sdk/discovery/util/RegExpTestUtil.java
@@ -17,59 +17,64 @@ import java.util.regex.Pattern;
 
 public class RegExpTestUtil {
 
-  public static boolean serviceNameRegExpTest(String serviceName) {
+    public static boolean serviceNameRegExpTest(String serviceName) {
 
-    String serviceNameReg = "^([0-9a-zA-Z]|-|_)*$";
-    return Pattern.matches(serviceNameReg, serviceName);
+        String serviceNameReg = "^([0-9a-zA-Z]|-|_)*$";
+        return Pattern.matches(serviceNameReg, serviceName);
 
-  }
+    }
 
 
-  public static boolean hostRegExpTest(String host) {
+    public static boolean hostRegExpTest(String host) {
 
-    String hostReg = "^(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\."
-        + "(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\."
-        + "(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\."
-        + "(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)" + ":(\\d{1,5})$";
-    return Pattern.matches(hostReg, host);
+        String hostReg = "^(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\."
+                        + "(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\."
+                        + "(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\."
+                        + "(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)" + ":(\\d{1,5})$";
+        return Pattern.matches(hostReg, host);
 
-  }
+    }
 
-  public static boolean ipRegExpTest(String ip) {
+    public static boolean ipRegExpTest(String ip) {
 
-    String hostReg = "^(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\."
-        + "(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\."
-        + "(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\."
-        + "(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$";
-    return Pattern.matches(hostReg, ip);
+        String hostReg = "^(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\."
+                        + "(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\."
+                        + "(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\."
+                        + "(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$";
+        return Pattern.matches(hostReg, ip);
 
-  }
+    }
 
-  public static boolean portRegExpTest(String port) {
+    public static boolean portRegExpTest(String port) {
+        String hostReg = "^\\d{1,5}$";
+        if (Pattern.matches(hostReg, port)) {
+            int iport = Integer.parseInt(port);
+            if (iport >= 1 && iport <= 65535)
+                return true;
+        }
 
-    String hostReg = "^\\d{1,5}$";
-    return Pattern.matches(hostReg, port);
+        return false;
 
-  }
+    }
 
-  public static boolean versionRegExpTest(String version) {
+    public static boolean versionRegExpTest(String version) {
 
-    String versionReg = "^v\\d+(\\.\\d+)?$";
-    return Pattern.matches(versionReg, version);
+        String versionReg = "^v\\d+(\\.\\d+)?$";
+        return Pattern.matches(versionReg, version);
 
-  }
+    }
 
-  public static boolean urlRegExpTest(String url) {
-    if (url.equals("/"))
-      return true;
-    String urlReg = "^\\/.*((?!\\/).)$";
-    return Pattern.matches(urlReg, url);
+    public static boolean urlRegExpTest(String url) {
+        if (url.equals("/"))
+            return true;
+        String urlReg = "^\\/.*((?!\\/).)$";
+        return Pattern.matches(urlReg, url);
 
-  }
+    }
 
 
 
-  public static void main(String[] args) {
-    System.out.println(urlRegExpTest("/"));
-  }
+    public static void main(String[] args) {
+        System.out.println(urlRegExpTest("/"));
+    }
 }