Divide the MSB source codes into two repos

[msb/apigateway.git] / apiroute / apiroute-service / src / main / java / org / onap / msb / apiroute / wrapper / util / MicroServiceUtil.java

diff --git a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/MicroServiceUtil.java b/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/util/MicroServiceUtil.java
similarity index 61%
rename from msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/MicroServiceUtil.java
rename to apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/util/MicroServiceUtil.java
index 3da82ed..1081579 100644 (file)
--- a/msb-core/apiroute/apiroute-service/src/main/java/org/openo/msb/wrapper/util/MicroServiceUtil.java
+++ b/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/util/MicroServiceUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 ZTE Corporation.
+ * Copyright 2016 ZTE, Inc. and others.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,61 +13,44 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.msb.wrapper.util;
 
-import java.util.regex.Pattern;
-
-import javax.servlet.http.HttpServletRequest;
+package org.onap.msb.apiroute.wrapper.util;
 
 import org.apache.commons.lang3.StringUtils;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.regex.Pattern;
+
 
 public class MicroServiceUtil {
     public static final String PREFIX_PATH = "discover:microservices";
     
-    public static final String PREFIX_PATH_PORT = "discover:";
-
-    public static final String SUFFIX_PATH_INFO = "info";
-
-    public static final String REDIS_KEY_PATTERN =
-            "discover:microservices:(?<servicename>[^:]+)(:(?<version>[^:]*))?:info";
-
-    public static final String REQUEST_SUCCESS = "SUCCESS";
-
-    public static final String REQUEST_FAIL = "FAIL";
-
-    public static final String ROUTE_PATH_LOADBALANCE = "lb"; // 负载均衡路径名
+    private static final Pattern SERVICE_KEY_REGEX_PATTERN =
+            Pattern.compile("discover:microservices:(?<servicename>[^:]+)(:(?<version>[^:]*))");
 
    
     public static String getPrefixedKey(String... paths) {
         StringBuffer sb = new StringBuffer();
         
-        if(paths[0].trim().equals("") || paths[0].equals(String.valueOf(JedisUtil.serverPort))){
-            sb.append(PREFIX_PATH);
-        }
-        else{
-           sb.append(PREFIX_PATH_PORT).append(paths[0]); 
-        }
-        
-        for (int i = 1; i < paths.length; i++) {
+        sb.append(PREFIX_PATH);
+       
+        for (int i = 0; i < paths.length; i++) {
             sb.append(":");
             sb.append(paths[i]);
         }
         return sb.toString();
     }
-
     
-    public static String getServiceInfoKey(String serverPort,String serviceName, String version) {
-        return getPrefixedKey(serverPort,serviceName, version, SUFFIX_PATH_INFO);
+   
+    public static String getServiceKey(String serviceName, String version) {
+        return getPrefixedKey(serviceName, version);
     }
 
- 
-    
-    
-    
-    public static Pattern getRedisKeyPattern() {
-        return Pattern.compile(REDIS_KEY_PATTERN);
+    public static Pattern getServiceKeyRegexPattern(){
+        return SERVICE_KEY_REGEX_PATTERN;
     }
+   
+    
 
     public static String getRealIp(HttpServletRequest request) {
         String ip = request.getHeader("X-Forwarded-For");