version 0.2.2.0 update

完成读锁开发，目前可基于注解动态生成读写锁和读锁

Author: ZongXR

README.md

@@ -14,13 +14,13 @@
 <code>public Consumer queryConsumerById(String id){...}</code><br />
 等同于<br />
 <code>public Consumer queryConsumerById(String id){</code><br />
-    <code>&nbsp;&nbsp;&nbsp;&nbsp;this.readLock.lock();</code><br />
-    <code>&nbsp;&nbsp;&nbsp;&nbsp;try{</code><br />
-    <code>    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;...</code><br />
-    <code>&nbsp;&nbsp;&nbsp;&nbsp;}finally{</code><br />
-    <code>    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;this.readLock.unlock();</code><br />
-    <code>&nbsp;&nbsp;&nbsp;&nbsp;}</code><br />
-    <code>&nbsp;&nbsp;&nbsp;&nbsp;return ...</code><br />
+<code>&nbsp;&nbsp;&nbsp;&nbsp;this.readLock.lock();</code><br />
+<code>&nbsp;&nbsp;&nbsp;&nbsp;try{</code><br />
+<code>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;...</code><br />
+<code>&nbsp;&nbsp;&nbsp;&nbsp;}finally{</code><br />
+<code>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;this.readLock.unlock();</code><br />
+<code>&nbsp;&nbsp;&nbsp;&nbsp;}</code><br />
+<code>&nbsp;&nbsp;&nbsp;&nbsp;return ...</code><br />
 <code>}</code><br />
 如何？看了上面的简介是不是觉得使用很方便呢？
 <h2>版本更新</h2>
@@ -37,4 +37,7 @@
 <tr>
 <td>0.2.1.0</td><td>开发读锁注解，目前已实现注解编译期间添加读写锁</td><td>2022年1月28日</td>
 </tr>
+<tr>
+<td>0.2.2.0</td><td>完成读锁开发，目前可基于注解动态生成读写锁和读锁</td><td>2022年1月28日</td>
+</tr>
 </table>

src/main/java/org/springframework/lock/aspect/ReadLockAspect.java

@@ -8,7 +8,6 @@
 
 import java.lang.reflect.Field;
 import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 
 @Aspect
@@ -22,16 +21,12 @@ public Object aroundReadLock(ProceedingJoinPoint jp) throws Throwable {
         Class<?> clz = obj.getClass();
         Lock readLock = null;
         for (Field field : clz.getDeclaredFields()) {
-            if (Lock.class.isAssignableFrom(field.getType())){
+            if ("$readLock".equals(field.getName())){
                 field.setAccessible(true);
                 Object unknownLock = field.get(obj);
-                if (unknownLock instanceof ReentrantReadWriteLock.ReadLock) {
-                    readLock = (Lock) unknownLock;
-                    break;
-                }
+                readLock = (Lock) unknownLock;
             }
         }
-        System.out.println(readLock);
         Object result = null;
         if (readLock != null) {
             readLock.lock();

src/main/java/org/springframework/lock/processor/ReadLockProcessor.java

@@ -79,9 +79,11 @@ public void visitClassDef(JCTree.JCClassDecl jcClassDecl) {
                         }
                         if (!foundLock){
                             messager.printMessage(Diagnostic.Kind.NOTE, "将为类" + clz.getQualifiedName() + "动态生成读锁");
-                            // TODO 修改语法树
+                            // 修改语法树
                             JCVariableDecl lock = makeReadWriteLock();
-                            jcClassDecl.defs = jcClassDecl.defs.prepend(lock);
+                            JCVariableDecl readLock = makeReadLock();
+                            jcClassDecl.defs = jcClassDecl.defs.append(lock);
+                            jcClassDecl.defs = jcClassDecl.defs.append(readLock);
                         }
                         super.visitClassDef(jcClassDecl);
                     }
@@ -93,16 +95,27 @@ public void visitClassDef(JCTree.JCClassDecl jcClassDecl) {
     }
 
     private JCVariableDecl makeReadWriteLock(){
-        JCModifiers modifiers = this.treeMaker.Modifiers(Flags.PRIVATE);
+        JCModifiers modifiers = this.treeMaker.Modifiers(Flags.PRIVATE + Flags.FINAL);
         JCVariableDecl var = this.treeMaker.VarDef(
                 modifiers,
-                this.names.fromString("lock"),
+                this.names.fromString("$lock"),
                 this.memberAccess("java.util.concurrent.locks.ReentrantReadWriteLock"),
                 this.treeMaker.NewClass(null, nil(), treeMaker.Ident(names.fromString("ReentrantReadWriteLock")), nil(), null)
         );
         return var;
     }
 
+    private JCVariableDecl makeReadLock(){
+        JCModifiers modifiers = this.treeMaker.Modifiers(Flags.PRIVATE + Flags.FINAL);
+        JCVariableDecl var = this.treeMaker.VarDef(
+                modifiers,
+                this.names.fromString("$readLock"),
+                this.memberAccess("java.util.concurrent.locks.Lock"),
+                treeMaker.Apply(nil(), treeMaker.Select(treeMaker.Ident(names.fromString("$lock")), names.fromString("readLock")), nil())
+        );
+        return var;
+    }
+
     private JCExpression memberAccess(String components) {
         String[] componentArray = components.split("\\.");
         JCTree.JCExpression expr = treeMaker.Ident(this.names.fromString(componentArray[0]));