[Dubbo-3069]Use regular expressions to judge fix #3069

dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java

@@ -97,7 +97,10 @@ public class Constants {
 
     public static final String DEFAULT_PROXY = "javassist";
 
-    public static final int DEFAULT_PAYLOAD = 8 * 1024 * 1024;                      // 8M
+    /**
+     * 8M
+     */
+    public static final int DEFAULT_PAYLOAD = 8 * 1024 * 1024;
 
     public static final String DEFAULT_CLUSTER = "failover";
 
@@ -155,15 +158,18 @@ public class Constants {
 
     public static final int DEFAULT_CONNECT_TIMEOUT = 3000;
 
-//    public static final int DEFAULT_REGISTRY_CONNECT_TIMEOUT = 5000;
-
+    /**
+     * public static final int DEFAULT_REGISTRY_CONNECT_TIMEOUT = 5000;
+     */
     public static final int DEFAULT_RETRIES = 2;
 
     public static final int DEFAULT_FAILBACK_TASKS = 100;
 
     public static final int DEFAULT_FAILBACK_TIMES = 3;
 
-    // default buffer size is 8k.
+    /**
+     * default buffer size is 8k.
+     */
     public static final int DEFAULT_BUFFER_SIZE = 8 * 1024;
 
     public static final Integer DEFAULT_METADATA_REPORT_RETRY_TIMES = 100;
@@ -184,7 +190,9 @@ public class Constants {
 
     public static final String LOADBALANCE_KEY = "loadbalance";
 
-    // key for router type, for e.g., "script"/"file",  corresponding to ScriptRouterFactory.NAME, FileRouterFactory.NAME
+    /**
+     * key for router type, for e.g., "script"/"file",  corresponding to ScriptRouterFactory.NAME, FileRouterFactory.NAME
+     */
     public static final String ROUTER_KEY = "router";
 
     public static final String CLUSTER_KEY = "cluster";
@@ -474,18 +482,26 @@ public class Constants {
 
     public static final String MERGER_KEY = "merger";
 
+    /**
+     * Numerical regular expression
+     */
+    public static final String NUMBER_REGULAR_EXPRESSION = "^[0-9]+(.[0-9]+)?$";
+
     /**
      * simple the registry for provider.
+     *
      * @since 2.7.0
      */
     public static final String SIMPLE_PROVIDER_CONFIG_KEY = "simple.provider.config";
     /**
      * simple the registry for consumer.
+     *
      * @since 2.7.0
      */
     public static final String SIMPLE_CONSUMER_CONFIG_KEY = "simple.consumer.config";
     /**
      * After simplify the registry, should add some paramter individually for provider.
+     *
      * @since 2.7.0
      */
     public static final String EXTRA_PROVIDER_CONFIG_KEYS_KEY = "extra.provider.keys";
@@ -752,7 +768,9 @@ public class Constants {
     public static final String CONFIG_VERSION_KEY = "configVersion";
 
     public static final String COMPATIBLE_CONFIG_KEY = "compatible_config";
-    // package version in the manifest
+    /**
+     * package version in the manifest
+     */
     public static final String SPECIFICATION_VERSION_KEY = "specVersion";
 
     public static final String OVERRIDE_PROVIDERS_KEY = "providerAddreses";
@@ -763,10 +781,13 @@ public class Constants {
 
     public static final String REGISTRIES_SUFFIX = "dubbo.registries.";
 
-    public static final String[] DEFAULT_REGISTER_PROVIDER_KEYS = {APPLICATION_KEY, CODEC_KEY, EXCHANGER_KEY, SERIALIZATION_KEY, CLUSTER_KEY, CONNECTIONS_KEY, DEPRECATED_KEY,
-            GROUP_KEY, LOADBALANCE_KEY, MOCK_KEY, PATH_KEY, TIMEOUT_KEY, TOKEN_KEY, VERSION_KEY, WARMUP_KEY, WEIGHT_KEY, TIMESTAMP_KEY, DUBBO_VERSION_KEY, SPECIFICATION_VERSION_KEY};
+    public static final String[] DEFAULT_REGISTER_PROVIDER_KEYS = {APPLICATION_KEY, CODEC_KEY, EXCHANGER_KEY,
+            SERIALIZATION_KEY, CLUSTER_KEY, CONNECTIONS_KEY, DEPRECATED_KEY,
+            GROUP_KEY, LOADBALANCE_KEY, MOCK_KEY, PATH_KEY, TIMEOUT_KEY, TOKEN_KEY, VERSION_KEY, WARMUP_KEY,
+            WEIGHT_KEY, TIMESTAMP_KEY, DUBBO_VERSION_KEY, SPECIFICATION_VERSION_KEY};
 
-    public static final String[] DEFAULT_REGISTER_CONSUMER_KEYS = {APPLICATION_KEY, VERSION_KEY, GROUP_KEY, DUBBO_VERSION_KEY, SPECIFICATION_VERSION_KEY};
+    public static final String[] DEFAULT_REGISTER_CONSUMER_KEYS = {APPLICATION_KEY, VERSION_KEY, GROUP_KEY,
+            DUBBO_VERSION_KEY, SPECIFICATION_VERSION_KEY};
 
     public static final String TELNET = "telnet";
     /*

dubbo-common/src/main/java/org/apache/dubbo/common/utils/ClassHelper.java

@@ -16,6 +16,8 @@
  */
 package org.apache.dubbo.common.utils;
 
+import org.apache.dubbo.common.Constants;
+
 import java.lang.reflect.Array;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -104,8 +106,7 @@ public static ClassLoader getClassLoader(Class<?> clazz) {
                 // getClassLoader() returning null indicates the bootstrap ClassLoader
                 try {
                     cl = ClassLoader.getSystemClassLoader();
-                }
-                catch (Throwable ex) {
+                } catch (Throwable ex) {
                     // Cannot access system ClassLoader - oh well, maybe the caller can live with null...
                 }
             }
@@ -265,26 +266,38 @@ public static boolean isPrimitive(Class<?> type) {
     }
 
     public static Object convertPrimitive(Class<?> type, String value) {
-        if (type == char.class || type == Character.class) {
+        if (value == null) {
+            return null;
+        } else if (type == char.class || type == Character.class) {
             return value.length() > 0 ? value.charAt(0) : '\0';
         } else if (type == boolean.class || type == Boolean.class) {
             return Boolean.valueOf(value);
         } else if (type == byte.class || type == Byte.class) {
-            return Byte.valueOf(value);
+            return isNumber(value) ? Byte.valueOf(value) : null;
         } else if (type == short.class || type == Short.class) {
-            return Short.valueOf(value);
+            return isNumber(value) ? Short.valueOf(value) : null;
         } else if (type == int.class || type == Integer.class) {
-            return Integer.valueOf(value);
+            return isNumber(value) ? Integer.valueOf(value) : null;
         } else if (type == long.class || type == Long.class) {
-            return Long.valueOf(value);
+            return isNumber(value) ? Long.valueOf(value) : null;
         } else if (type == float.class || type == Float.class) {
-            return Float.valueOf(value);
+            return isNumber(value) ? Float.valueOf(value) : null;
         } else if (type == double.class || type == Double.class) {
-            return Double.valueOf(value);
+            return isNumber(value) ? Double.valueOf(value) : null;
         }
         return value;
     }
 
+    /**
+     * Check if it is a number
+     *
+     * @param str
+     * @return
+     */
+    public static boolean isNumber(String str) {
+        return str.matches(Constants.NUMBER_REGULAR_EXPRESSION);
+    }
+
     /**
      * We only check boolean value at this moment.
      *

dubbo-common/src/test/java/org/apache/dubbo/common/utils/ClassHelperTest.java

@@ -25,6 +25,8 @@
 import static org.apache.dubbo.common.utils.ClassHelper.getClassLoader;
 import static org.apache.dubbo.common.utils.ClassHelper.resolvePrimitiveClassName;
 import static org.apache.dubbo.common.utils.ClassHelper.toShortString;
+import static org.apache.dubbo.common.utils.ClassHelper.convertPrimitive;
+import static org.apache.dubbo.common.utils.ClassHelper.isNumber;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.sameInstance;
@@ -118,4 +120,52 @@ public void testToShortString() throws Exception {
         assertThat(toShortString(null), equalTo("null"));
         assertThat(toShortString(new ClassHelperTest()), startsWith("ClassHelperTest@"));
     }
+
+    @Test
+    public void testConvertPrimitive() throws Exception {
+
+        assertThat(convertPrimitive(char.class, ""), equalTo('\0'));
+        assertThat(convertPrimitive(char.class, null), equalTo(null));
+        assertThat(convertPrimitive(char.class, "6"), equalTo('6'));
+
+        assertThat(convertPrimitive(boolean.class, ""), equalTo(Boolean.FALSE));
+        assertThat(convertPrimitive(boolean.class, null), equalTo(null));
+        assertThat(convertPrimitive(boolean.class, "true"), equalTo(Boolean.TRUE));
+
+
+        assertThat(convertPrimitive(byte.class, ""), equalTo(null));
+        assertThat(convertPrimitive(byte.class, null), equalTo(null));
+        assertThat(convertPrimitive(byte.class, "127"), equalTo(Byte.MAX_VALUE));
+
+
+        assertThat(convertPrimitive(short.class, ""), equalTo(null));
+        assertThat(convertPrimitive(short.class, null), equalTo(null));
+        assertThat(convertPrimitive(short.class, "32767"), equalTo(Short.MAX_VALUE));
+
+        assertThat(convertPrimitive(int.class, ""), equalTo(null));
+        assertThat(convertPrimitive(int.class, null), equalTo(null));
+        assertThat(convertPrimitive(int.class, "6"), equalTo(6));
+
+        assertThat(convertPrimitive(long.class, ""), equalTo(null));
+        assertThat(convertPrimitive(long.class, null), equalTo(null));
+        assertThat(convertPrimitive(long.class, "6"), equalTo(new Long(6)));
+
+        assertThat(convertPrimitive(float.class, ""), equalTo(null));
+        assertThat(convertPrimitive(float.class, null), equalTo(null));
+        assertThat(convertPrimitive(float.class, "1.1"), equalTo(new Float(1.1)));
+
+        assertThat(convertPrimitive(double.class, ""), equalTo(null));
+        assertThat(convertPrimitive(double.class, null), equalTo(null));
+        assertThat(convertPrimitive(double.class, "10.1"), equalTo(new Double(10.1)));
+    }
+
+    @Test
+    public void testIsNumber() throws Exception {
+        assertThat(isNumber("0"), is(true));
+        assertThat(isNumber("0.1"), is(true));
+        assertThat(isNumber("DUBBO"), is(false));
+        assertThat(isNumber(""), is(false));
+        assertThat(isNumber(" "), is(false));
+        assertThat(isNumber("   "), is(false));
+    }
 }