Skip to content

Commit e189048

Browse files
LiZhenNetralf0131
LiZhenNet
authored and
ralf0131
committed
rename ClassHelper to ClassUtils, add MethodUtils (apache#3806)
* rename ClassHelper to ClassUtils, add MethodUtils * remove import with '*' * ClassUtils add apache license
1 parent d54633e commit e189048

File tree

24 files changed

+633
-405
lines changed

24 files changed

+633
-405
lines changed

‎dubbo-common/src/main/java/org/apache/dubbo/common/Version.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import org.apache.dubbo.common.logger.Logger;
2020
import org.apache.dubbo.common.logger.LoggerFactory;
21-
import org.apache.dubbo.common.utils.ClassHelper;
21+
import org.apache.dubbo.common.utils.ClassUtils;
2222
import org.apache.dubbo.common.utils.StringUtils;
2323

2424
import java.io.IOException;
@@ -240,7 +240,7 @@ public static void checkDuplicate(String path, boolean failOnError) {
240240
* search resources in caller's classloader
241241
*/
242242
private static Set<String> getResources(String path) throws IOException {
243-
Enumeration<URL> urls = ClassHelper.getCallerClassLoader(Version.class).getResources(path);
243+
Enumeration<URL> urls = ClassUtils.getCallerClassLoader(Version.class).getResources(path);
244244
Set<String> files = new HashSet<String>();
245245
while (urls.hasMoreElements()) {
246246
URL url = urls.nextElement();

‎dubbo-common/src/main/java/org/apache/dubbo/common/bytecode/ClassGenerator.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
*/
1717
package org.apache.dubbo.common.bytecode;
1818

19-
import org.apache.dubbo.common.utils.ArrayUtils;
20-
import org.apache.dubbo.common.utils.ClassHelper;
21-
import org.apache.dubbo.common.utils.ReflectUtils;
22-
2319
import javassist.CannotCompileException;
2420
import javassist.ClassPool;
2521
import javassist.CtClass;
@@ -30,6 +26,9 @@
3026
import javassist.CtNewMethod;
3127
import javassist.LoaderClassPath;
3228
import javassist.NotFoundException;
29+
import org.apache.dubbo.common.utils.ArrayUtils;
30+
import org.apache.dubbo.common.utils.ClassUtils;
31+
import org.apache.dubbo.common.utils.ReflectUtils;
3332
import org.apache.dubbo.common.utils.StringUtils;
3433

3534
import java.lang.reflect.Constructor;
@@ -285,7 +284,7 @@ public ClassPool getClassPool() {
285284
}
286285

287286
public Class<?> toClass() {
288-
return toClass(ClassHelper.getClassLoader(ClassGenerator.class),
287+
return toClass(ClassUtils.getClassLoader(ClassGenerator.class),
289288
getClass().getProtectionDomain());
290289
}
291290

‎dubbo-common/src/main/java/org/apache/dubbo/common/bytecode/Mixin.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package org.apache.dubbo.common.bytecode;
1818

19-
import org.apache.dubbo.common.utils.ClassHelper;
19+
import org.apache.dubbo.common.utils.ClassUtils;
2020
import org.apache.dubbo.common.utils.ReflectUtils;
2121

2222
import java.lang.reflect.Method;
@@ -69,7 +69,7 @@ public static Mixin mixin(Class<?>[] ics, Class<?> dc, ClassLoader cl) {
6969
* @return Mixin instance.
7070
*/
7171
public static Mixin mixin(Class<?>[] ics, Class<?>[] dcs) {
72-
return mixin(ics, dcs, ClassHelper.getCallerClassLoader(Mixin.class));
72+
return mixin(ics, dcs, ClassUtils.getCallerClassLoader(Mixin.class));
7373
}
7474

7575
/**

‎dubbo-common/src/main/java/org/apache/dubbo/common/bytecode/Proxy.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package org.apache.dubbo.common.bytecode;
1818

1919
import org.apache.dubbo.common.Constants;
20-
import org.apache.dubbo.common.utils.ClassHelper;
20+
import org.apache.dubbo.common.utils.ClassUtils;
2121
import org.apache.dubbo.common.utils.ReflectUtils;
2222

2323
import java.lang.ref.Reference;
@@ -62,7 +62,7 @@ protected Proxy() {
6262
* @return Proxy instance.
6363
*/
6464
public static Proxy getProxy(Class<?>... ics) {
65-
return getProxy(ClassHelper.getClassLoader(Proxy.class), ics);
65+
return getProxy(ClassUtils.getClassLoader(Proxy.class), ics);
6666
}
6767

6868
/**

‎dubbo-common/src/main/java/org/apache/dubbo/common/bytecode/Wrapper.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package org.apache.dubbo.common.bytecode;
1818

19-
import org.apache.dubbo.common.utils.ClassHelper;
19+
import org.apache.dubbo.common.utils.ClassUtils;
2020
import org.apache.dubbo.common.utils.ReflectUtils;
2121

2222
import java.lang.reflect.Field;
@@ -127,7 +127,7 @@ private static Wrapper makeWrapper(Class<?> c) {
127127
}
128128

129129
String name = c.getName();
130-
ClassLoader cl = ClassHelper.getClassLoader(c);
130+
ClassLoader cl = ClassUtils.getClassLoader(c);
131131

132132
StringBuilder c1 = new StringBuilder("public void setPropertyValue(Object o, String n, Object v){ ");
133133
StringBuilder c2 = new StringBuilder("public Object getPropertyValue(Object o, String n){ ");

‎dubbo-common/src/main/java/org/apache/dubbo/common/compiler/support/AbstractCompiler.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package org.apache.dubbo.common.compiler.support;
1818

1919
import org.apache.dubbo.common.compiler.Compiler;
20-
import org.apache.dubbo.common.utils.ClassHelper;
2120

2221
import java.util.regex.Matcher;
2322
import java.util.regex.Pattern;
@@ -50,7 +49,7 @@ public Class<?> compile(String code, ClassLoader classLoader) {
5049
}
5150
String className = pkg != null && pkg.length() > 0 ? pkg + "." + cls : cls;
5251
try {
53-
return Class.forName(className, true, ClassHelper.getCallerClassLoader(getClass()));
52+
return Class.forName(className, true, org.apache.dubbo.common.utils.ClassUtils.getCallerClassLoader(getClass()));
5453
} catch (ClassNotFoundException e) {
5554
if (!code.endsWith("}")) {
5655
throw new IllegalStateException("The java code not endsWith \"}\", code: \n" + code + "\n");

‎dubbo-common/src/main/java/org/apache/dubbo/common/compiler/support/JavassistCompiler.java

+6-7
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717
package org.apache.dubbo.common.compiler.support;
1818

19-
import org.apache.dubbo.common.utils.ClassHelper;
2019

2120
import javassist.CtClass;
2221

@@ -49,25 +48,25 @@ public Class<?> doCompile(String name, String source) throws Throwable {
4948
while (matcher.find()) {
5049
builder.addImports(matcher.group(1).trim());
5150
}
52-
51+
5352
// process extended super class
5453
matcher = EXTENDS_PATTERN.matcher(source);
5554
if (matcher.find()) {
5655
builder.setSuperClassName(matcher.group(1).trim());
5756
}
58-
57+
5958
// process implemented interfaces
6059
matcher = IMPLEMENTS_PATTERN.matcher(source);
6160
if (matcher.find()) {
6261
String[] ifaces = matcher.group(1).trim().split("\\,");
6362
Arrays.stream(ifaces).forEach(i -> builder.addInterface(i.trim()));
6463
}
65-
64+
6665
// process constructors, fields, methods
6766
String body = source.substring(source.indexOf('{') + 1, source.length() - 1);
6867
String[] methods = METHODS_PATTERN.split(body);
6968
String className = ClassUtils.getSimpleClassName(name);
70-
Arrays.stream(methods).map(String::trim).filter(m -> !m.isEmpty()).forEach(method-> {
69+
Arrays.stream(methods).map(String::trim).filter(m -> !m.isEmpty()).forEach(method -> {
7170
if (method.startsWith(className)) {
7271
builder.addConstructor("public " + method);
7372
} else if (FIELD_PATTERN.matcher(method).matches()) {
@@ -76,9 +75,9 @@ public Class<?> doCompile(String name, String source) throws Throwable {
7675
builder.addMethod("public " + method);
7776
}
7877
});
79-
78+
8079
// compile
81-
ClassLoader classLoader = ClassHelper.getCallerClassLoader(getClass());
80+
ClassLoader classLoader = org.apache.dubbo.common.utils.ClassUtils.getCallerClassLoader(getClass());
8281
CtClass cls = builder.build(classLoader);
8382
return cls.toClass(classLoader, JavassistCompiler.class.getProtectionDomain());
8483
}

‎dubbo-common/src/main/java/org/apache/dubbo/common/compiler/support/JdkCompiler.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717
package org.apache.dubbo.common.compiler.support;
1818

19-
import org.apache.dubbo.common.utils.ClassHelper;
2019

2120
import javax.tools.DiagnosticCollector;
2221
import javax.tools.FileObject;
@@ -261,7 +260,7 @@ protected Class<?> findClass(final String qualifiedClassName) throws ClassNotFou
261260
return defineClass(qualifiedClassName, bytes, 0, bytes.length);
262261
}
263262
try {
264-
return ClassHelper.forNameWithCallerClassLoader(qualifiedClassName, getClass());
263+
return org.apache.dubbo.common.utils.ClassUtils.forNameWithCallerClassLoader(qualifiedClassName, getClass());
265264
} catch (ClassNotFoundException nf) {
266265
return super.findClass(qualifiedClassName);
267266
}

‎dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@
2222
import org.apache.dubbo.common.logger.Logger;
2323
import org.apache.dubbo.common.logger.LoggerFactory;
2424
import org.apache.dubbo.common.utils.ArrayUtils;
25-
import org.apache.dubbo.common.utils.ClassHelper;
25+
import org.apache.dubbo.common.utils.ClassUtils;
26+
import org.apache.dubbo.common.utils.CollectionUtils;
2627
import org.apache.dubbo.common.utils.ConcurrentHashSet;
2728
import org.apache.dubbo.common.utils.ConfigUtils;
2829
import org.apache.dubbo.common.utils.Holder;
2930
import org.apache.dubbo.common.utils.ReflectUtils;
3031
import org.apache.dubbo.common.utils.StringUtils;
31-
import org.apache.dubbo.common.utils.CollectionUtils;
32+
3233
import java.io.BufferedReader;
3334
import java.io.InputStreamReader;
3435
import java.lang.reflect.Method;
@@ -142,7 +143,7 @@ public static void resetExtensionLoader(Class type) {
142143
}
143144

144145
private static ClassLoader findClassLoader() {
145-
return ClassHelper.getClassLoader(ExtensionLoader.class);
146+
return ClassUtils.getClassLoader(ExtensionLoader.class);
146147
}
147148

148149
public String getExtensionName(T extensionInstance) {

‎dubbo-common/src/main/java/org/apache/dubbo/common/timer/HashedWheelTimer.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import org.apache.dubbo.common.logger.Logger;
2020
import org.apache.dubbo.common.logger.LoggerFactory;
21-
import org.apache.dubbo.common.utils.ClassHelper;
21+
import org.apache.dubbo.common.utils.ClassUtils;
2222

2323
import java.util.Collections;
2424
import java.util.HashSet;
@@ -415,7 +415,7 @@ public long pendingTimeouts() {
415415
}
416416

417417
private static void reportTooManyInstances() {
418-
String resourceType = ClassHelper.simpleClassName(HashedWheelTimer.class);
418+
String resourceType = ClassUtils.simpleClassName(HashedWheelTimer.class);
419419
logger.error("You are creating too many " + resourceType + " instances. " +
420420
resourceType + " is a shared resource that must be reused across the JVM," +
421421
"so that only a few instances are created.");
@@ -657,7 +657,7 @@ public void expire() {
657657
public String toString() {
658658
final long currentTime = System.nanoTime();
659659
long remaining = deadline - currentTime + timer.startTime;
660-
String simpleClassName = ClassHelper.simpleClassName(this.getClass());
660+
String simpleClassName = ClassUtils.simpleClassName(this.getClass());
661661

662662
StringBuilder buf = new StringBuilder(192)
663663
.append(simpleClassName)

0 commit comments

Comments
 (0)