feat: support TSF unit (#645)

Co-authored-by: shedfreewu <[email protected]>

Author: shedfreewu

polaris-common/polaris-model/src/main/java/com/tencent/polaris/api/utils/StringUtils.java

@@ -571,4 +571,103 @@ public static boolean contains(String str, String searchStr) {
         }
         return str.indexOf(searchStr) >= 0;
     }
+
+    /**
+     * copy from commons-lang3.
+     * {@link org.apache.commons.lang3.StringUtils#split(java.lang.String, java.lang.String, int)}
+     */
+    public static String[] split(final String str, final String separatorChars, final int max) {
+        return splitWorker(str, separatorChars, max, false);
+    }
+
+    /**
+     * copy from commons-lang3.
+     * {@link org.apache.commons.lang3.StringUtils#splitWorker(java.lang.String, java.lang.String, int, boolean)}
+     */
+    private static String[] splitWorker(final String str, final String separatorChars, final int max, final boolean preserveAllTokens) {
+        // Performance tuned for 2.0 (JDK1.4)
+        // Direct code is quicker than StringTokenizer.
+        // Also, StringTokenizer uses isSpace() not isWhitespace()
+
+        if (str == null) {
+            return null;
+        }
+        final int len = str.length();
+        if (len == 0) {
+            return EMPTY_STRING_ARRAY;
+        }
+        final List<String> list = new ArrayList<>();
+        int sizePlus1 = 1;
+        int i = 0;
+        int start = 0;
+        boolean match = false;
+        boolean lastMatch = false;
+        if (separatorChars == null) {
+            // Null separator means use whitespace
+            while (i < len) {
+                if (Character.isWhitespace(str.charAt(i))) {
+                    if (match || preserveAllTokens) {
+                        lastMatch = true;
+                        if (sizePlus1++ == max) {
+                            i = len;
+                            lastMatch = false;
+                        }
+                        list.add(str.substring(start, i));
+                        match = false;
+                    }
+                    start = ++i;
+                    continue;
+                }
+                lastMatch = false;
+                match = true;
+                i++;
+            }
+        } else if (separatorChars.length() == 1) {
+            // Optimise 1 character case
+            final char sep = separatorChars.charAt(0);
+            while (i < len) {
+                if (str.charAt(i) == sep) {
+                    if (match || preserveAllTokens) {
+                        lastMatch = true;
+                        if (sizePlus1++ == max) {
+                            i = len;
+                            lastMatch = false;
+                        }
+                        list.add(str.substring(start, i));
+                        match = false;
+                    }
+                    start = ++i;
+                    continue;
+                }
+                lastMatch = false;
+                match = true;
+                i++;
+            }
+        } else {
+            // standard case
+            while (i < len) {
+                if (separatorChars.indexOf(str.charAt(i)) >= 0) {
+                    if (match || preserveAllTokens) {
+                        lastMatch = true;
+                        if (sizePlus1++ == max) {
+                            i = len;
+                            lastMatch = false;
+                        }
+                        list.add(str.substring(start, i));
+                        match = false;
+                    }
+                    start = ++i;
+                    continue;
+                }
+                lastMatch = false;
+                match = true;
+                i++;
+            }
+        }
+        if (match || preserveAllTokens && lastMatch) {
+            list.add(str.substring(start, i));
+        }
+        return list.toArray(EMPTY_STRING_ARRAY);
+    }
+
 }

polaris-plugins/polaris-plugins-connector/connector-common/src/main/java/com/tencent/polaris/plugins/connector/common/constant/ConsulConstant.java

@@ -24,6 +24,12 @@
  */
 public interface ConsulConstant {
 
+    String NAMESPACE_TYPE_KEY = "nsType";
+
+    String NAMESPACE_TYPE_DEFAULT = "DEF";
+
+    String NAMESPACE_TYPE_DEFAULT_AND_GLOBAL = "DEF_AND_GLOBAL";
+
     interface MetadataMapKey {
 
         String NAMESPACE_KEY = "NAMESPACE_KEY";

polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/ConsulAPIConnector.java

@@ -49,6 +49,7 @@
 import com.tencent.polaris.logging.LoggerFactory;
 import com.tencent.polaris.plugins.connector.common.DestroyableServerConnector;
 import com.tencent.polaris.plugins.connector.common.ServiceUpdateTask;
+import com.tencent.polaris.plugins.connector.common.constant.ConsulConstant;
 import com.tencent.polaris.plugins.connector.consul.service.ConsulService;
 import com.tencent.polaris.plugins.connector.consul.service.InstanceService;
 import com.tencent.polaris.plugins.connector.consul.service.ServiceService;
@@ -218,7 +219,7 @@ private void initActually(InitContext ctx, ServerConnectorConfig connectorConfig
         }
         // in gateway mode, namespace type is empty string
         if (!ClassUtils.isClassPresent("org.springframework.cloud.gateway.filter.GlobalFilter")) {
-            consulContext.setNamespaceType("DEF_AND_GLOBAL");
+            consulContext.setNamespaceType(ConsulConstant.NAMESPACE_TYPE_DEFAULT_AND_GLOBAL);
         }
         if (metadata.containsKey(TAGS_KEY) && StringUtils.isNotBlank(metadata.get(TAGS_KEY))) {
             try {

polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/service/InstanceService.java

@@ -41,7 +41,9 @@
 import com.tencent.polaris.api.utils.TimeUtils;
 import com.tencent.polaris.logging.LoggerFactory;
 import com.tencent.polaris.metadata.core.constant.TsfMetadataConstants;
+import com.tencent.polaris.metadata.core.manager.CalleeMetadataContainerGroup;
 import com.tencent.polaris.plugins.connector.common.ServiceUpdateTask;
+import com.tencent.polaris.plugins.connector.common.constant.ConsulConstant;
 import com.tencent.polaris.plugins.connector.consul.ConsulContext;
 import com.tencent.polaris.specification.api.v1.model.ModelProto;
 import com.tencent.polaris.specification.api.v1.service.manage.ResponseProto;
@@ -86,14 +88,18 @@ public void sendRequest(ServiceUpdateTask serviceUpdateTask) {
         UrlParameters tokenParam = StringUtils.isNotBlank(token) ? new SingleUrlParameters("token", token) : null;
         UrlParameters tagParams = StringUtils.isNotBlank(tag) ? new SingleUrlParameters("tag", tag) : null;
         UrlParameters passingParams = onlyPassing ? new SingleUrlParameters("passing") : null;
-        UrlParameters nsTypeParam = StringUtils.isNotBlank(consulContext.getNamespaceType()) ? new SingleUrlParameters("nsType", consulContext.getNamespaceType()) : null;;
+        String nsType = CalleeMetadataContainerGroup.getStaticApplicationMetadataContainer().getRawMetadataStringValue(ConsulConstant.NAMESPACE_TYPE_KEY);
+        if (StringUtils.isBlank(nsType)) {
+            nsType = consulContext.getNamespaceType();
+        }
+        UrlParameters nsTypeParam = StringUtils.isNotBlank(nsType) ? new SingleUrlParameters(ConsulConstant.NAMESPACE_TYPE_KEY, nsType) : null;;
         UrlParameters namespaceParameter = StringUtils.isNotBlank(namespace) ? new SingleUrlParameters("nid", namespace) : null;;
         Long currentIndex = getServersConsulIndex(serviceId);
         // in tsf consul, changes in instance status may not alter the index, requiring updates each time.
         int code = ServerCodes.EXECUTE_SUCCESS;
         QueryParams queryParams = new QueryParams(consulContext.getWaitTime(), currentIndex);
         try {
-            LOG.debug("Begin get service instances of :{}/{} sync", namespace, serviceId);
+            LOG.debug("Begin get service instances of :{}/{} sync, nsType:{}", namespace, serviceId, nsType);
             HttpResponse rawResponse = consulRawClient.makeGetRequest("/v1/health/service/" + serviceId, tagParams,
                     passingParams, tokenParam, nsTypeParam, namespaceParameter, queryParams);
             if (rawResponse != null) {