diecui1202 closed pull request #2554: code format
URL: https://github.com/apache/incubator-dubbo/pull/2554
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/bytecode/ClassGenerator.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/bytecode/ClassGenerator.java
index 685ad177cb..d9cee452a9 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/common/bytecode/ClassGenerator.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/common/bytecode/ClassGenerator.java
@@ -16,6 +16,9 @@
*/
package org.apache.dubbo.common.bytecode;
+import org.apache.dubbo.common.utils.ClassHelper;
+import org.apache.dubbo.common.utils.ReflectUtils;
+
import javassist.CannotCompileException;
import javassist.ClassPool;
import javassist.CtClass;
@@ -26,8 +29,6 @@
import javassist.CtNewMethod;
import javassist.LoaderClassPath;
import javassist.NotFoundException;
-import org.apache.dubbo.common.utils.ClassHelper;
-import org.apache.dubbo.common.utils.ReflectUtils;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
@@ -46,14 +47,18 @@
* ClassGenerator
*/
public final class ClassGenerator {
+
private static final AtomicLong CLASS_NAME_COUNTER = new AtomicLong(0);
private static final String SIMPLE_NAME_TAG = "<init>";
private static final Map<ClassLoader, ClassPool> POOL_MAP = new
ConcurrentHashMap<ClassLoader, ClassPool>(); //ClassLoader - ClassPool
private ClassPool mPool;
private CtClass mCtc;
- private String mClassName, mSuperClass;
+ private String mClassName;
+ private String mSuperClass;
private Set<String> mInterfaces;
- private List<String> mFields, mConstructors, mMethods;
+ private List<String> mFields;
+ private List<String> mConstructors;
+ private List<String> mMethods;
private Map<String, Method> mCopyMethods; // <method desc,method instance>
private Map<String, Constructor<?>> mCopyConstructors; // <constructor
desc,constructor instance>
private boolean mDefaultConstructor = false;
@@ -78,8 +83,9 @@ public static boolean isDynamicClass(Class<?> cl) {
}
public static ClassPool getClassPool(ClassLoader loader) {
- if (loader == null)
+ if (loader == null) {
return ClassPool.getDefault();
+ }
ClassPool pool = POOL_MAP.get(loader);
if (pool == null) {
@@ -92,12 +98,22 @@ public static ClassPool getClassPool(ClassLoader loader) {
private static String modifier(int mod) {
StringBuilder modifier = new StringBuilder();
- if (Modifier.isPublic(mod)) modifier.append("public");
- if (Modifier.isProtected(mod)) modifier.append("protected");
- if (Modifier.isPrivate(mod)) modifier.append("private");
+ if (Modifier.isPublic(mod)) {
+ modifier.append("public");
+ }
+ if (Modifier.isProtected(mod)) {
+ modifier.append("protected");
+ }
+ if (Modifier.isPrivate(mod)) {
+ modifier.append("private");
+ }
- if (Modifier.isStatic(mod)) modifier.append(" static");
- if (Modifier.isVolatile(mod)) modifier.append(" volatile");
+ if (Modifier.isStatic(mod)) {
+ modifier.append(" static");
+ }
+ if (Modifier.isVolatile(mod)) {
+ modifier.append(" volatile");
+ }
return modifier.toString();
}
@@ -112,8 +128,9 @@ public ClassGenerator setClassName(String name) {
}
public ClassGenerator addInterface(String cn) {
- if (mInterfaces == null)
+ if (mInterfaces == null) {
mInterfaces = new HashSet<String>();
+ }
mInterfaces.add(cn);
return this;
}
@@ -133,8 +150,9 @@ public ClassGenerator setSuperClass(Class<?> cl) {
}
public ClassGenerator addField(String code) {
- if (mFields == null)
+ if (mFields == null) {
mFields = new ArrayList<String>();
+ }
mFields.add(code);
return this;
}
@@ -156,8 +174,9 @@ public ClassGenerator addField(String name, int mod,
Class<?> type, String def)
}
public ClassGenerator addMethod(String code) {
- if (mMethods == null)
+ if (mMethods == null) {
mMethods = new ArrayList<String>();
+ }
mMethods.add(code);
return this;
}
@@ -166,13 +185,15 @@ public ClassGenerator addMethod(String name, int mod,
Class<?> rt, Class<?>[] pt
return addMethod(name, mod, rt, pts, null, body);
}
- public ClassGenerator addMethod(String name, int mod, Class<?> rt,
Class<?>[] pts, Class<?>[] ets, String body) {
+ public ClassGenerator addMethod(String name, int mod, Class<?> rt,
Class<?>[] pts, Class<?>[] ets,
+ String body) {
StringBuilder sb = new StringBuilder();
sb.append(modifier(mod)).append('
').append(ReflectUtils.getName(rt)).append(' ').append(name);
sb.append('(');
for (int i = 0; i < pts.length; i++) {
- if (i > 0)
+ if (i > 0) {
sb.append(',');
+ }
sb.append(ReflectUtils.getName(pts[i]));
sb.append(" arg").append(i);
}
@@ -180,8 +201,9 @@ public ClassGenerator addMethod(String name, int mod,
Class<?> rt, Class<?>[] pt
if (ets != null && ets.length > 0) {
sb.append(" throws ");
for (int i = 0; i < ets.length; i++) {
- if (i > 0)
+ if (i > 0) {
sb.append(',');
+ }
sb.append(ReflectUtils.getName(ets[i]));
}
}
@@ -197,15 +219,17 @@ public ClassGenerator addMethod(Method m) {
public ClassGenerator addMethod(String name, Method m) {
String desc = name + ReflectUtils.getDescWithoutMethodName(m);
addMethod(':' + desc);
- if (mCopyMethods == null)
+ if (mCopyMethods == null) {
mCopyMethods = new ConcurrentHashMap<String, Method>(8);
+ }
mCopyMethods.put(desc, m);
return this;
}
public ClassGenerator addConstructor(String code) {
- if (mConstructors == null)
+ if (mConstructors == null) {
mConstructors = new LinkedList<String>();
+ }
mConstructors.add(code);
return this;
}
@@ -219,8 +243,9 @@ public ClassGenerator addConstructor(int mod, Class<?>[]
pts, Class<?>[] ets, St
sb.append(modifier(mod)).append(' ').append(SIMPLE_NAME_TAG);
sb.append('(');
for (int i = 0; i < pts.length; i++) {
- if (i > 0)
+ if (i > 0) {
sb.append(',');
+ }
sb.append(ReflectUtils.getName(pts[i]));
sb.append(" arg").append(i);
}
@@ -228,8 +253,9 @@ public ClassGenerator addConstructor(int mod, Class<?>[]
pts, Class<?>[] ets, St
if (ets != null && ets.length > 0) {
sb.append(" throws ");
for (int i = 0; i < ets.length; i++) {
- if (i > 0)
+ if (i > 0) {
sb.append(',');
+ }
sb.append(ReflectUtils.getName(ets[i]));
}
}
@@ -240,8 +266,9 @@ public ClassGenerator addConstructor(int mod, Class<?>[]
pts, Class<?>[] ets, St
public ClassGenerator addConstructor(Constructor<?> c) {
String desc = ReflectUtils.getDesc(c);
addConstructor(":" + desc);
- if (mCopyConstructors == null)
+ if (mCopyConstructors == null) {
mCopyConstructors = new ConcurrentHashMap<String,
Constructor<?>>(4);
+ }
mCopyConstructors.put(desc, c);
return this;
}
@@ -256,43 +283,58 @@ public ClassPool getClassPool() {
}
public Class<?> toClass() {
- return toClass(ClassHelper.getClassLoader(ClassGenerator.class),
getClass().getProtectionDomain());
+ return toClass(ClassHelper.getClassLoader(ClassGenerator.class),
+ getClass().getProtectionDomain());
}
public Class<?> toClass(ClassLoader loader, ProtectionDomain pd) {
- if (mCtc != null)
+ if (mCtc != null) {
mCtc.detach();
+ }
long id = CLASS_NAME_COUNTER.getAndIncrement();
try {
CtClass ctcs = mSuperClass == null ? null : mPool.get(mSuperClass);
- if (mClassName == null)
+ if (mClassName == null) {
mClassName = (mSuperClass == null ||
javassist.Modifier.isPublic(ctcs.getModifiers())
? ClassGenerator.class.getName() : mSuperClass +
"$sc") + id;
+ }
mCtc = mPool.makeClass(mClassName);
- if (mSuperClass != null)
+ if (mSuperClass != null) {
mCtc.setSuperclass(ctcs);
+ }
mCtc.addInterface(mPool.get(DC.class.getName())); // add dynamic
class tag.
- if (mInterfaces != null)
- for (String cl : mInterfaces) mCtc.addInterface(mPool.get(cl));
- if (mFields != null)
- for (String code : mFields) mCtc.addField(CtField.make(code,
mCtc));
+ if (mInterfaces != null) {
+ for (String cl : mInterfaces) {
+ mCtc.addInterface(mPool.get(cl));
+ }
+ }
+ if (mFields != null) {
+ for (String code : mFields) {
+ mCtc.addField(CtField.make(code, mCtc));
+ }
+ }
if (mMethods != null) {
for (String code : mMethods) {
- if (code.charAt(0) == ':')
-
mCtc.addMethod(CtNewMethod.copy(getCtMethod(mCopyMethods.get(code.substring(1))),
code.substring(1, code.indexOf('(')), mCtc, null));
- else
+ if (code.charAt(0) == ':') {
+
mCtc.addMethod(CtNewMethod.copy(getCtMethod(mCopyMethods.get(code.substring(1))),
+ code.substring(1, code.indexOf('(')), mCtc,
null));
+ } else {
mCtc.addMethod(CtNewMethod.make(code, mCtc));
+ }
}
}
- if (mDefaultConstructor)
+ if (mDefaultConstructor) {
mCtc.addConstructor(CtNewConstructor.defaultConstructor(mCtc));
+ }
if (mConstructors != null) {
for (String code : mConstructors) {
if (code.charAt(0) == ':') {
-
mCtc.addConstructor(CtNewConstructor.copy(getCtConstructor(mCopyConstructors.get(code.substring(1))),
mCtc, null));
+ mCtc.addConstructor(CtNewConstructor
+
.copy(getCtConstructor(mCopyConstructors.get(code.substring(1))), mCtc, null));
} else {
String[] sn = mCtc.getSimpleName().split("\\$+"); //
inner class name include $.
-
mCtc.addConstructor(CtNewConstructor.make(code.replaceFirst(SIMPLE_NAME_TAG,
sn[sn.length - 1]), mCtc));
+ mCtc.addConstructor(
+
CtNewConstructor.make(code.replaceFirst(SIMPLE_NAME_TAG, sn[sn.length - 1]),
mCtc));
}
}
}
@@ -307,13 +349,27 @@ public ClassPool getClassPool() {
}
public void release() {
- if (mCtc != null) mCtc.detach();
- if (mInterfaces != null) mInterfaces.clear();
- if (mFields != null) mFields.clear();
- if (mMethods != null) mMethods.clear();
- if (mConstructors != null) mConstructors.clear();
- if (mCopyMethods != null) mCopyMethods.clear();
- if (mCopyConstructors != null) mCopyConstructors.clear();
+ if (mCtc != null) {
+ mCtc.detach();
+ }
+ if (mInterfaces != null) {
+ mInterfaces.clear();
+ }
+ if (mFields != null) {
+ mFields.clear();
+ }
+ if (mMethods != null) {
+ mMethods.clear();
+ }
+ if (mConstructors != null) {
+ mConstructors.clear();
+ }
+ if (mCopyMethods != null) {
+ mCopyMethods.clear();
+ }
+ if (mCopyConstructors != null) {
+ mCopyConstructors.clear();
+ }
}
private CtClass getCtClass(Class<?> c) throws NotFoundException {
@@ -321,7 +377,8 @@ private CtClass getCtClass(Class<?> c) throws
NotFoundException {
}
private CtMethod getCtMethod(Method m) throws NotFoundException {
- return getCtClass(m.getDeclaringClass()).getMethod(m.getName(),
ReflectUtils.getDescWithoutMethodName(m));
+ return getCtClass(m.getDeclaringClass())
+ .getMethod(m.getName(),
ReflectUtils.getDescWithoutMethodName(m));
}
private CtConstructor getCtConstructor(Constructor<?> c) throws
NotFoundException {
@@ -329,5 +386,6 @@ private CtConstructor getCtConstructor(Constructor<?> c)
throws NotFoundExceptio
}
public static interface DC {
+
} // dynamic class tag interface.
}
\ No newline at end of file
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
