3.2.6 代码更新

baoxingjie · baoxingjie · commit 33394597a38d · 2021-11-24T10:56:39.000+08:00
diff --git a/VERSIONS.md b/VERSIONS.md
@@ -128,4 +128,8 @@ public Object execute(InstructionSet[] instructionSets,IExpressContext<String,Ob
 ## 3.2.5版本[2021-8-23]
 (1)支持强大的数组符号访问属性功能（List,Map,Array）：ArrayPorpertyMixTest
 (2)支持lambda表达式，stream方式操作集合书写更高效（List,Map）：LambdaTest
-(3)解决数组类型的方法匹配bug：ArrayMisType
+(3)解决数组类型的方法匹配bug：ArrayMisType
+
+## 3.2.6版本[2021-11-24]
+(1)彻底解决ExpressRunner重入问题，可以嵌套使用：RecursivelyRunnerTest
+(2)重磅特性：通过@QLAlias对字段和方法上添加注解，实现中文字段和中文方法调用：QLAliasTest
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 	<groupId>com.alibaba</groupId>
 	<artifactId>QLExpress</artifactId>
 	<packaging>jar</packaging>
-	<version>3.2.5</version>
+	<version>3.2.6</version>
 	<name>QLExpress</name>
     <description>QLExpress is a powerful, lightweight, dynamic language for the Java platform aimed at improving developers’ productivity in different business scenes.</description>
     <url>https://github.com/alibaba/QLExpress</url>
diff --git a/src/main/java/com/ql/util/express/annotation/QLAlias.java b/src/main/java/com/ql/util/express/annotation/QLAlias.java
@@ -36,7 +36,7 @@
  *
  */
 @Inherited
-@Target({TYPE, FIELD, METHOD})
+@Target({TYPE, FIELD, METHOD, PARAMETER})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface QLAlias {
     /**
diff --git a/src/main/java/com/ql/util/express/annotation/QLAliasUtils.java b/src/main/java/com/ql/util/express/annotation/QLAliasUtils.java
@@ -57,14 +57,13 @@ private static Field findQLAliasFieldsWithCache(Class baseClass, String property
             if(result == null){
                 fieldsCache.put(key, void.class);
             }else{
-                ((Field)result).setAccessible(true);
                 fieldsCache.put(key,result);
             }
         }else if(result == void.class){
             result = null;
         }
         return (Field)result;
-    }
+    } 
 
     public static Field findQLAliasFields(Class baseClass, String propertyName) {
 
diff --git a/src/test/java/com/ql/util/express/annotation/QLAliasTest.java b/src/test/java/com/ql/util/express/annotation/QLAliasTest.java
@@ -12,7 +12,7 @@
  * @author tianqiao@come-future.com
  * 2021-11-15 5:51 下午
  */
-public class AnnotationTest {
+public class QLAliasTest {
 
     @Test
     public void testQLAlias() throws Exception {
@@ -27,6 +27,8 @@ public void testQLAlias() throws Exception {
                 "患者.生日()==患者.生日","true",//get方法和字段名字一样是不冲突的
                 "患者.患者姓名 + ' 今年 '+ 患者.获取年龄() +' 岁'","老王 今年 34 岁",//任意方法的注解
         };
+
+        //1、测试对象的方法，字段上的别名标签
         IExpressContext<String, Object> context = new DefaultContext<String, Object>();
         Person person = new Patient();
         person.setName("老王");
@@ -39,7 +41,7 @@ public void testQLAlias() throws Exception {
             assertTrue((""+result).equals(exps[i+1]));
         }
 
-        //业务调用也可以通过对象的QLAlias直接来自动产生系统变量
+        //2、外部业务调用方也可以利用类、参数的QLAlias注解，自动注入ExpressContext
         QLAliasContext context2 = new QLAliasContext();
         context2.putAutoParams(person);//等价于context2.put("患者", person);
         for (int i=0;i<exps.length;i+=2) {
diff --git a/src/test/java/com/ql/util/express/bugfix/RecursivelyRunnerTest.java b/src/test/java/com/ql/util/express/bugfix/RecursivelyRunnerTest.java
@@ -7,6 +7,9 @@
 
 import java.lang.reflect.Method;
 
+/**
+ * 可重入性单元测试
+ */
 public class RecursivelyRunnerTest {
 
     static ExpressRunner runner = new ExpressRunner();

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`*`
`37`	`37`	`*/`
`38`	`38`	`@Inherited`
`39`		`-@Target({TYPE, FIELD, METHOD})`
	`39`	`+@Target({TYPE, FIELD, METHOD, PARAMETER})`
`40`	`40`	`@Retention(RetentionPolicy.RUNTIME)`
`41`	`41`	`public @interface QLAlias {`
`42`	`42`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -57,14 +57,13 @@ private static Field findQLAliasFieldsWithCache(Class baseClass, String property`
`57`	`57`	`if(result == null){`
`58`	`58`	`fieldsCache.put(key, void.class);`
`59`	`59`	`}else{`
`60`		`- ((Field)result).setAccessible(true);`
`61`	`60`	`fieldsCache.put(key,result);`
`62`	`61`	`}`
`63`	`62`	`}else if(result == void.class){`
`64`	`63`	`result = null;`
`65`	`64`	`}`
`66`	`65`	`return (Field)result;`
`67`		`- }`
	`66`	`+ }`
`68`	`67`
`69`	`68`	`public static Field findQLAliasFields(Class baseClass, String propertyName) {`
`70`	`69`