浏览代码

变量名 filter 更名为 classFilter

James 5 年之前
父节点
当前提交
a8eb5f7fe4
共有 2 个文件被更改,包括 7 次插入7 次删除
  1. 3 3
      src/main/java/com/jfinal/config/Routes.java
  2. 4 4
      src/main/java/com/jfinal/core/PathScanner.java

+ 3 - 3
src/main/java/com/jfinal/config/Routes.java

@@ -109,10 +109,10 @@ public abstract class Routes {
 	 * </pre>
 	 * 
 	 * @param basePackage 进行扫描的基础 package,仅扫描该包及其子包下面的路由
-	 * @param filter 用于过滤不需要被扫描的目标
+	 * @param classFilter 过滤不需要被扫描的类
 	 */
-	public Routes scan(String basePackage, Predicate<String> filter) {
-		new PathScanner(basePackage, this, filter).scan();
+	public Routes scan(String basePackage, Predicate<String> classFilter) {
+		new PathScanner(basePackage, this, classFilter).scan();
 		return this;
 	}
 	

+ 4 - 4
src/main/java/com/jfinal/core/PathScanner.java

@@ -46,14 +46,14 @@ public class PathScanner {
 	private String basePackage;
 	
 	// 过滤不需要被扫描的类
-	private Predicate<String> filter;
+	private Predicate<String> classFilter;
 	
 	// 调用 Routes.add(...) 添加扫描结果
 	private Routes routes;
 	
 	private ClassLoader classLoader;
 	
-	public PathScanner(String basePackage, Routes routes, Predicate<String> filter) {
+	public PathScanner(String basePackage, Routes routes, Predicate<String> classFilter) {
 		if (StrKit.isBlank(basePackage)) {
 			throw new IllegalArgumentException("basePackage can not be blank");
 		}
@@ -67,7 +67,7 @@ public class PathScanner {
 		
 		this.basePackage = bp;
 		this.routes = routes;
-		this.filter = filter;
+		this.classFilter = classFilter;
 	}
 	
 	public PathScanner(String basePackage, Routes routes) {
@@ -183,7 +183,7 @@ public class PathScanner {
 	@SuppressWarnings("unchecked")
 	private void scanController(String className) {
 		// 过滤不需要扫描的 className
-		if (filter != null && filter.test(className)) {
+		if (classFilter != null && classFilter.test(className)) {
 			return ;
 		}