Merge "50% Code Coverage-MSB Java SDK"

[msb/java-sdk.git] / src / main / java / org / onap / msb / sdk / discovery / util / MsbUtil.java

diff --git a/src/main/java/org/onap/msb/sdk/discovery/util/MsbUtil.java b/src/main/java/org/onap/msb/sdk/discovery/util/MsbUtil.java
index 2361d9f..c54a51c 100644 (file)
--- a/src/main/java/org/onap/msb/sdk/discovery/util/MsbUtil.java
+++ b/src/main/java/org/onap/msb/sdk/discovery/util/MsbUtil.java
@@ -17,6 +17,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.apache.commons.lang3.StringUtils;
+import org.onap.msb.sdk.discovery.common.RouteException;
 import org.onap.msb.sdk.discovery.entity.Node;
 import org.onap.msb.sdk.discovery.entity.NodeInfo;
 
@@ -54,5 +55,38 @@ public class MsbUtil {
 
     return nodes;
   }
+  
+  public static void checkServiceName(String serviceName) throws RouteException{
+       
+           if (StringUtils.isBlank(serviceName)) {
+             throw new RouteException("ServiceName  can't be empty", "DATA_FORMAT_ERROR");
+           }
+  }
+  
+  public static String checkVersion(String version) throws RouteException{
+       // 版本号格式检查
+           if (StringUtils.isNotBlank(version)) {
+             if (!RegExpTestUtil.versionRegExpTest(version)) {
+               throw new RouteException("version is not a valid  format", "DATA_FORMAT_ERROR");
+             }
+           } else {
+             version = "null";
+           }
+           
+           return version;
+  }
+  
+  public static void checkHost(String ip,String port) throws RouteException{
+       // HOST空值和格式检查
+           if (StringUtils.isBlank(ip)) {
+             throw new RouteException("ip can't be empty", "DATA_FORMAT_ERROR");
+
+           }
+
+           if (StringUtils.isBlank(port)) {
+             throw new RouteException("port can't be empty", "DATA_FORMAT_ERROR");
+
+           }
+  }
 
 }