Skip to content

Commit 3f7a7b9

Browse files
Alice52Alice52
committed
action: format
1 parent 8714aba commit 3f7a7b9

File tree

112 files changed

+713
-807
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+713
-807
lines changed

‎java/javase/javase-agent/src/main/java/cn/edu/ntu/java/javase/agent/Assist.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ public static class TraceInfo {
8989
private long begin;
9090
private Object[] args;
9191

92-
public TraceInfo() {
93-
}
92+
public TraceInfo() {}
9493

9594
public TraceInfo(long begin, Object[] args) {
9695
this.begin = begin;

‎java/javase/javase-agent/src/main/java/cn/edu/ntu/java/javase/agent/ServerAgent.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,7 @@ public static class TraceInfo {
131131
private long begin;
132132
private Object[] args;
133133

134-
public TraceInfo() {
135-
}
134+
public TraceInfo() {}
136135

137136
public TraceInfo(long begin, Object[] args) {
138137
this.begin = begin;

‎java/javase/javase-agent/src/main/java/cn/edu/ntu/java/javase/agent/WebAgent.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ public static byte[] build(ClassLoader loader, String className)
5555
ctClass.getDeclaredMethod(
5656
"service",
5757
pool.get(
58-
new String[]{
59-
"javax.servlet.http.HttpServletRequest",
60-
"javax.servlet.http.HttpServletResponse"
58+
new String[] {
59+
"javax.servlet.http.HttpServletRequest",
60+
"javax.servlet.http.HttpServletResponse"
6161
}));
6262

6363
CtMethod copyMethod = CtNewMethod.copy(method, ctClass, new ClassMap());
@@ -126,8 +126,7 @@ private static class WebTraceInfo {
126126
private String header;
127127
private long userTime;
128128

129-
public WebTraceInfo() {
130-
}
129+
public WebTraceInfo() {}
131130

132131
public WebTraceInfo(
133132
long begin,

‎java/javase/javase-annotation/annotation-processor/src/main/java/cn/edu/ntu/java/annotations/SeData.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
import java.lang.annotation.Target;
77

88
/**
9-
* @author zack <br/>
10-
* @create 2022-12-14 00:11 <br/>
11-
* @project annotation <br/>
9+
* @author zack <br>
10+
* @create 2022-12-14 00:11 <br>
11+
* @project annotation <br>
1212
*/
1313
@Target({ElementType.TYPE})
1414
@Retention(RetentionPolicy.SOURCE)
15-
public @interface SeData {
16-
}
15+
public @interface SeData {}

‎java/javase/javase-annotation/annotation-processor/src/main/java/cn/edu/ntu/java/annotations/SeDataV2.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package cn.edu.ntu.java.annotations;
2+
3+
import java.lang.annotation.ElementType;
4+
import java.lang.annotation.Retention;
5+
import java.lang.annotation.RetentionPolicy;
6+
import java.lang.annotation.Target;
7+
8+
/**
9+
* @author zack <br>
10+
* @create 2022-12-14 00:11 <br>
11+
* @project annotation <br>
12+
*/
13+
@Target({ElementType.TYPE})
14+
@Retention(RetentionPolicy.SOURCE)
15+
public @interface SeDataV2 {}

‎java/javase/javase-annotation/annotation-processor/src/main/java/cn/edu/ntu/java/annotations/TrisceliVersion.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@
88
@Documented
99
@Retention(RetentionPolicy.SOURCE) // 只在编译期有效, 最终不会打进 class 文件中
1010
@Target({ElementType.FIELD}) // 仅允许作用于类属性之上
11-
public @interface TrisceliVersion {
12-
}
11+
public @interface TrisceliVersion {}

‎java/javase/javase-annotation/annotation-processor/src/main/java/cn/edu/ntu/java/processor/BaseProcessor.java‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,15 @@ public abstract class BaseProcessor extends AbstractProcessor {
3434
public TreeMaker treeMaker;
3535
public Names names;
3636

37-
public List<Function<JCTree.JCVariableDecl, JCTree.JCMethodDecl>> customs = new ArrayList<>();
37+
public List<Function<JCTree.JCVariableDecl, JCTree.JCMethodDecl>> c = new ArrayList<>();
3838

3939
protected abstract Class<? extends Annotation> anno();
4040

4141
protected abstract void initCustom();
4242

4343
@Override
4444
public synchronized void init(ProcessingEnvironment processingEnv) {
45+
initCustom();
4546
super.init(processingEnv);
4647
this.trees = JavacTrees.instance(processingEnv);
4748
Context context = ((JavacProcessingEnvironment) processingEnv).getContext();
@@ -55,26 +56,14 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
5556
TreeTranslator translator =
5657
new TreeTranslator() {
5758
@Override
58-
public void visitClassDef(JCTree.JCClassDecl jcClassDecl) {
59-
60-
jcClassDecl.defs.stream()
59+
public void visitClassDef(JCTree.JCClassDecl f) {
60+
f.defs.stream()
6161
.filter(jcTree1 -> jcTree1.getKind().equals(Tree.Kind.VARIABLE))
6262
.map(jcTree2 -> (JCTree.JCVariableDecl) jcTree2)
6363
.forEach(
64-
jcVariableDecl -> {
65-
customs.forEach(
66-
x -> {
67-
jcClassDecl.defs =
68-
jcClassDecl.defs.prepend(
69-
x.apply(
70-
jcVariableDecl));
71-
72-
log.info("aaa: {}", x);
73-
}
74-
);
75-
});
64+
fi -> c.forEach(x -> f.defs = f.defs.prepend(x.apply(fi))));
7665

77-
super.visitClassDef(jcClassDecl);
66+
super.visitClassDef(f);
7867
}
7968
};
8069

‎java/javase/javase-annotation/annotation-processor/src/main/java/cn/edu/ntu/java/processor/DataProcessor.java‎

Lines changed: 94 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package cn.edu.ntu.java.processor;
22

3-
43
import cn.edu.ntu.java.annotations.SeData;
54
import com.sun.source.tree.Tree;
65
import com.sun.tools.javac.api.JavacTrees;
@@ -32,6 +31,7 @@ public class DataProcessor extends AbstractProcessor {
3231

3332
@Override
3433
public synchronized void init(ProcessingEnvironment processingEnv) {
34+
3535
super.init(processingEnv);
3636
this.trees = JavacTrees.instance(processingEnv);
3737
Context context = ((JavacProcessingEnvironment) processingEnv).getContext();
@@ -43,48 +43,79 @@ public synchronized void init(ProcessingEnvironment processingEnv) {
4343
public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
4444
roundEnv.getElementsAnnotatedWith(SeData.class).stream()
4545
.map(element -> trees.getTree(element))
46-
.forEach(jcTree -> jcTree.accept(new TreeTranslator() {
47-
@Override
48-
public void visitClassDef(JCTree.JCClassDecl jcClassDecl) {
49-
jcClassDecl.defs.stream().filter(tree -> tree.getKind().equals(Tree.Kind.VARIABLE))
50-
.map(tree -> (JCTree.JCVariableDecl) tree)
51-
//.filter(x -> !x.getModifiers().getTree().toString().contains("final"))
52-
.forEach(jcVariableDecl -> {
53-
//添加get方法
54-
jcClassDecl.defs = jcClassDecl.defs.prepend(addGetterMethod(jcVariableDecl));
55-
//添加set方法
56-
jcClassDecl.defs = jcClassDecl.defs.prepend(addSetterMethod(jcVariableDecl));
57-
});
46+
.forEach(
47+
jcTree ->
48+
jcTree.accept(
49+
new TreeTranslator() {
50+
@Override
51+
public void visitClassDef(
52+
JCTree.JCClassDecl jcClassDecl) {
53+
jcClassDecl.defs.stream()
54+
.filter(
55+
tree ->
56+
tree.getKind()
57+
.equals(
58+
Tree.Kind
59+
.VARIABLE))
60+
.map(tree -> (JCTree.JCVariableDecl) tree)
61+
// .filter(x ->
62+
// !x.getModifiers().getTree().toString().contains("final"))
63+
.forEach(
64+
jcVariableDecl -> {
65+
// 添加get方法
66+
jcClassDecl.defs =
67+
jcClassDecl.defs
68+
.prepend(
69+
addGetterMethod(
70+
jcVariableDecl));
71+
// 添加set方法
72+
jcClassDecl.defs =
73+
jcClassDecl.defs
74+
.prepend(
75+
addSetterMethod(
76+
jcVariableDecl));
77+
});
5878

59-
super.visitClassDef(jcClassDecl);
60-
}
61-
}));
79+
super.visitClassDef(jcClassDecl);
80+
}
81+
}));
6282
return true;
6383
}
6484

65-
6685
/**
6786
* 创建get方法
6887
*
6988
* @param jcVariableDecl
7089
* @return
7190
*/
7291
private JCTree.JCMethodDecl addGetterMethod(JCTree.JCVariableDecl jcVariableDecl) {
73-
//方法的访问级别
92+
// 方法的访问级别
7493
JCTree.JCModifiers modifiers = treeMaker.Modifiers(Flags.PUBLIC);
75-
//方法名称
94+
// 方法名称
7695
Name methodName = getMethodName(jcVariableDecl.getName());
77-
//设置返回值类型
96+
// 设置返回值类型
7897
JCTree.JCExpression returnMethodType = jcVariableDecl.vartype;
7998
ListBuffer<JCTree.JCStatement> statements = new ListBuffer<>();
80-
statements.append(treeMaker.Return(treeMaker.Select(treeMaker.Ident(names.fromString("this")), jcVariableDecl.getName())));
81-
//设置方法体
99+
statements.append(
100+
treeMaker.Return(
101+
treeMaker.Select(
102+
treeMaker.Ident(names.fromString("this")),
103+
jcVariableDecl.getName())));
104+
// 设置方法体
82105
JCTree.JCBlock methodBody = treeMaker.Block(0, statements.toList());
83106
List<JCTree.JCTypeParameter> methodGenericParams = List.nil();
84107
List<JCTree.JCVariableDecl> parameters = List.nil();
85108
List<JCTree.JCExpression> throwsClauses = List.nil();
86-
//构建方法
87-
return treeMaker.MethodDef(modifiers, methodName, returnMethodType, methodGenericParams, parameters, throwsClauses, methodBody, null);
109+
// 构建方法
110+
return treeMaker.MethodDef(
111+
modifiers,
112+
methodName,
113+
returnMethodType,
114+
methodGenericParams,
115+
parameters,
116+
throwsClauses,
117+
methodBody,
118+
null);
88119
}
89120

90121
/**
@@ -95,24 +126,47 @@ private JCTree.JCMethodDecl addGetterMethod(JCTree.JCVariableDecl jcVariableDecl
95126
*/
96127
private JCTree.JCMethodDecl addSetterMethod(JCTree.JCVariableDecl jcVariableDecl) {
97128
try {
98-
//方法的访问级别
129+
// 方法的访问级别
99130
JCTree.JCModifiers modifiers = treeMaker.Modifiers(Flags.PUBLIC);
100-
//定义方法名
131+
// 定义方法名
101132
Name methodName = setMethodName(jcVariableDecl.getName());
102-
//定义返回值类型
103-
JCTree.JCExpression returnMethodType = treeMaker.Type((Type) (Class.forName("com.sun.tools.javac.code.Type$JCVoidType").newInstance()));
133+
// 定义返回值类型
134+
JCTree.JCExpression returnMethodType =
135+
treeMaker.Type(
136+
(Type)
137+
(Class.forName("com.sun.tools.javac.code.Type$JCVoidType")
138+
.newInstance()));
104139
ListBuffer<JCTree.JCStatement> statements = new ListBuffer<>();
105-
statements.append(treeMaker.Exec(treeMaker.Assign(treeMaker.Select(treeMaker.Ident(names.fromString("this")), jcVariableDecl.getName()), treeMaker.Ident(jcVariableDecl.getName()))));
106-
//定义方法体
140+
statements.append(
141+
treeMaker.Exec(
142+
treeMaker.Assign(
143+
treeMaker.Select(
144+
treeMaker.Ident(names.fromString("this")),
145+
jcVariableDecl.getName()),
146+
treeMaker.Ident(jcVariableDecl.getName()))));
147+
// 定义方法体
107148
JCTree.JCBlock methodBody = treeMaker.Block(0, statements.toList());
108149
List<JCTree.JCTypeParameter> methodGenericParams = List.nil();
109-
//定义入参
110-
JCTree.JCVariableDecl param = treeMaker.VarDef(treeMaker.Modifiers(Flags.PARAMETER, List.nil()), jcVariableDecl.name, jcVariableDecl.vartype, null);
111-
//设置入参
150+
// 定义入参
151+
JCTree.JCVariableDecl param =
152+
treeMaker.VarDef(
153+
treeMaker.Modifiers(Flags.PARAMETER, List.nil()),
154+
jcVariableDecl.name,
155+
jcVariableDecl.vartype,
156+
null);
157+
// 设置入参
112158
List<JCTree.JCVariableDecl> parameters = List.of(param);
113159
List<JCTree.JCExpression> throwsClauses = List.nil();
114-
//构建新方法
115-
return treeMaker.MethodDef(modifiers, methodName, returnMethodType, methodGenericParams, parameters, throwsClauses, methodBody, null);
160+
// 构建新方法
161+
return treeMaker.MethodDef(
162+
modifiers,
163+
methodName,
164+
returnMethodType,
165+
methodGenericParams,
166+
parameters,
167+
throwsClauses,
168+
methodBody,
169+
null);
116170
} catch (IllegalAccessException e) {
117171
e.printStackTrace();
118172
} catch (InstantiationException e) {
@@ -125,12 +179,13 @@ private JCTree.JCMethodDecl addSetterMethod(JCTree.JCVariableDecl jcVariableDecl
125179

126180
private Name getMethodName(Name name) {
127181
String s = name.toString();
128-
return names.fromString("get" + s.substring(0, 1).toUpperCase() + s.substring(1, name.length()));
182+
return names.fromString(
183+
"get" + s.substring(0, 1).toUpperCase() + s.substring(1, name.length()));
129184
}
130185

131-
132186
private Name setMethodName(Name name) {
133187
String s = name.toString();
134-
return names.fromString("set" + s.substring(0, 1).toUpperCase() + s.substring(1, name.length()));
188+
return names.fromString(
189+
"set" + s.substring(0, 1).toUpperCase() + s.substring(1, name.length()));
135190
}
136-
}
191+
}

0 commit comments

Comments
 (0)