diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/URL.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/URL.java index 2f40c73309..7827af3bda 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/URL.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/URL.java @@ -116,7 +116,7 @@ public final class URL implements Serializable { this(protocol, null, null, host, port, null, (Map) null); } - public URL(String protocol, String host, int port, String[] pairs) { // 变长参数...与下面的path参数冲突,改为数组 + public URL(String protocol, String host, int port, String[] pairs) { // varargs ... confilict with the following path argument, use array instead. this(protocol, null, null, host, port, null, CollectionUtils.toStringMap(pairs)); } diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/beanutil/JavaBeanSerializeUtil.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/beanutil/JavaBeanSerializeUtil.java index 284a1e2ef5..d89f4c0603 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/beanutil/JavaBeanSerializeUtil.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/beanutil/JavaBeanSerializeUtil.java @@ -413,7 +413,7 @@ public final class JavaBeanSerializeUtil { } /** - * 把 Class.forName 的返回值转换为 Class. + * Transform the Class.forName String to Class Object. * * @param name Class.getName() * @return Class diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/support/MemoryStatusChecker.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/support/MemoryStatusChecker.java index 05ff77b6c6..c8ea8f37ac 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/support/MemoryStatusChecker.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/support/MemoryStatusChecker.java @@ -31,7 +31,7 @@ public class MemoryStatusChecker implements StatusChecker { long freeMemory = runtime.freeMemory(); long totalMemory = runtime.totalMemory(); long maxMemory = runtime.maxMemory(); - boolean ok = (maxMemory - (totalMemory - freeMemory) > 2048); // 剩余空间小于2M报警 + boolean ok = (maxMemory - (totalMemory - freeMemory) > 2048); // Alarm when spare memory < 2M String msg = "max:" + (maxMemory / 1024 / 1024) + "M,total:" + (totalMemory / 1024 / 1024) + "M,used:" + ((totalMemory / 1024 / 1024) - (freeMemory / 1024 / 1024)) + "M,free:" + (freeMemory / 1024 / 1024) + "M"; return new Status(ok ? Status.Level.OK : Status.Level.WARN, msg); diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/AbortPolicyWithReport.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/AbortPolicyWithReport.java index eb414e2cec..9246d96a8f 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/AbortPolicyWithReport.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/AbortPolicyWithReport.java @@ -69,7 +69,7 @@ public class AbortPolicyWithReport extends ThreadPoolExecutor.AbortPolicy { private void dumpJStack() { long now = System.currentTimeMillis(); - //十分钟打一次 + //dump every 10 minutes if (now - lastPrintTime < 10 * 60 * 1000) { return; } diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/ReflectUtils.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/ReflectUtils.java index 2a00d55491..88f4516a00 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/ReflectUtils.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/ReflectUtils.java @@ -252,12 +252,12 @@ public final class ReflectUtils { try { ParameterizedType parameterizedType = ((ParameterizedType) cls.getGenericInterfaces()[0]); Object genericClass = parameterizedType.getActualTypeArguments()[i]; - if (genericClass instanceof ParameterizedType) { // 处理多级泛型 + if (genericClass instanceof ParameterizedType) { // handle nested generic type return (Class) ((ParameterizedType) genericClass).getRawType(); - } else if (genericClass instanceof GenericArrayType) { // 处理数组泛型 + } else if (genericClass instanceof GenericArrayType) { // handle array generic type return (Class) ((GenericArrayType) genericClass).getGenericComponentType(); } else if (((Class) genericClass).isArray()) { - // 在 JDK 7 以上的版本, Foo 不再是 GenericArrayType + // Requires JDK 7 or higher, Foo is no longer GenericArrayType return ((Class) genericClass).getComponentType(); } else { return (Class) genericClass; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/URLTest.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/URLTest.java index ec9258215d..a670c3c405 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/URLTest.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/URLTest.java @@ -17,6 +17,7 @@ package com.alibaba.dubbo.common; import com.alibaba.dubbo.common.utils.CollectionUtils; + import org.junit.Test; import java.io.File; @@ -243,7 +244,7 @@ public class URLTest { assertEquals("noValue", url.getParameter("noValue")); } - // TODO 不希望空格? 详见: DUBBO-502 URL类对特殊字符处理统一约定 + // TODO Do not want to use spaces? See: DUBBO-502, URL class handles special conventions for special characters. @Test public void test_valueOf_spaceSafe() throws Exception { URL url = URL.valueOf("http://1.2.3.4:8080/path?key=value1 value2"); @@ -257,7 +258,7 @@ public class URLTest { assertTrue(url.hasParameter("k0")); - // 没有Value的Key,生成的Value值使用Key值!! -_-!!! + // If a Key has no corresponding Value, then the Key also used as the Value. assertEquals("k0", url.getParameter("k0")); } diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/SimpleExt.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/SimpleExt.java index 0c7460f129..1d5c263fe6 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/SimpleExt.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/SimpleExt.java @@ -25,13 +25,13 @@ import com.alibaba.dubbo.common.extension.SPI; */ @SPI("impl1") public interface SimpleExt { - // 没有使用key的@Adaptive ! + // @Adaptive example, do not specify a explicit key. @Adaptive String echo(URL url, String s); @Adaptive({"key1", "key2"}) String yell(URL url, String s); - // 无@Adaptive ! + // no @Adaptive String bang(URL url, int i); } \ No newline at end of file diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/Ext2.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/Ext2.java index bae8ea7c5d..db6723e865 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/Ext2.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/Ext2.java @@ -25,7 +25,7 @@ import com.alibaba.dubbo.common.extension.SPI; */ @SPI public interface Ext2 { - // 方法参数的属性是URL! + // one of the properties of an argument is an instance of URL. @Adaptive String echo(UrlHolder holder, String s); diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/ConfigUtilsTest.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/ConfigUtilsTest.java index f265daa246..3969b01168 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/ConfigUtilsTest.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/ConfigUtilsTest.java @@ -66,7 +66,7 @@ public class ConfigUtilsTest { } /** - * 测试点1:用户配置-default,会删除所有默认参数 + * Test Point 1: The user configures -default, which will delete all the default parameters */ @Test public void testMergeValuesDelete() {