diff --git a/src/main/java/org/beetl/core/ResourceLoader.java b/src/main/java/org/beetl/core/ResourceLoader.java index 28c42ad358878eade6ead3409dba5d280aceedc8..f7076825d3a809ed12e5cf9bd1010e4b78cfb3c8 100644 --- a/src/main/java/org/beetl/core/ResourceLoader.java +++ b/src/main/java/org/beetl/core/ResourceLoader.java @@ -34,6 +34,23 @@ import java.io.Closeable; * 字符串,加密的文本,以及数据库Blob字段等 * * @author xiandafu + * + * @see org.beetl.core.resource.ClasspathResource + * @see org.beetl.core.resource.ClasspathResourceLoader 类路径资源加载器 + * + * @see org.beetl.core.resource.StringTemplateResource + * @see org.beetl.core.resource.StringTemplateResourceLoader 字符串模板资源加载器 + * + * @see org.beetl.core.resource.FileResource + * @see org.beetl.core.resource.FileResourceLoader 文件资源加载器 + * @see org.beetl.core.resource.WebAppResourceLoader web应用资源加载器 + * + * @see org.beetl.core.resource.Matcher + * @see org.beetl.core.resource.AllowAllMatcher + * @see org.beetl.core.resource.StartsWithMatcher + * @see org.beetl.core.resource.CompositeResourceLoader 混合形式的资源加载器 + * + * @see org.beetl.core.resource.MapResourceLoader 映射形式的资源加载器 */ public interface ResourceLoader extends Closeable { diff --git a/src/main/java/org/beetl/core/lab/BaseEntity.java b/src/main/java/org/beetl/core/lab/BaseEntity.java index 67b7619471c2b61b35968e8fa033f06c5c5a1ac2..1043dc8c773e416e2602b63b75ff2c37bb865eec 100644 --- a/src/main/java/org/beetl/core/lab/BaseEntity.java +++ b/src/main/java/org/beetl/core/lab/BaseEntity.java @@ -1,6 +1,6 @@ package org.beetl.core.lab; -public interface BaseEntity { +interface BaseEntity { default int getPage() { return 1; } diff --git a/src/main/java/org/beetl/core/lab/ColTag.java b/src/main/java/org/beetl/core/lab/ColTag.java index b98870ba5302967bf7912fda8ad276c257b1b084..f390be93cd78cb489f3b323922b5c937edfc1f32 100644 --- a/src/main/java/org/beetl/core/lab/ColTag.java +++ b/src/main/java/org/beetl/core/lab/ColTag.java @@ -5,7 +5,7 @@ import org.beetl.core.tag.Tag; import java.io.IOException; import java.util.Map; -public class ColTag extends Tag { +class ColTag extends Tag { @Override public void render() { Tag parent = this.getParent(); @@ -15,9 +15,8 @@ public class ColTag extends Tag { String showName = map.get(colName).toString(); String td = "" + showName + ""; this.bw.writeString(td); - } catch (IOException e) { - // ignore - } + } catch (IOException ignored) { + } } } diff --git a/src/main/java/org/beetl/core/lab/MyTestObject.java b/src/main/java/org/beetl/core/lab/MyTestObject.java index aa6002d01bd6d53c405bed5b85e83a383650624b..db9f654f5b44b6658fcfea4949f6acb6da6102cb 100644 --- a/src/main/java/org/beetl/core/lab/MyTestObject.java +++ b/src/main/java/org/beetl/core/lab/MyTestObject.java @@ -1,8 +1,8 @@ package org.beetl.core.lab; -public class MyTestObject { +class MyTestObject { String name; - int age =12; + int age = 12; public MyTestObject() { } @@ -12,23 +12,23 @@ public class MyTestObject { this.name = name; } - public String getName() { - return name; - } + public String getName() { + return name; + } - public void setName(String name) { - this.name = name; - } + public void setName(String name) { + this.name = name; + } - public int getAge() { - return age; - } + public int getAge() { + return age; + } - public void setAge(int age) { - this.age = age; - } + public void setAge(int age) { + this.age = age; + } - public MyTestObject self() { + public MyTestObject self() { return this; } } diff --git a/src/main/java/org/beetl/core/lab/TableTag.java b/src/main/java/org/beetl/core/lab/TableTag.java index 439072982450eddbab73b34d1654cd96aa76ddaa..d2c71abcbb9649787dad98fadbc357f16fd8759d 100644 --- a/src/main/java/org/beetl/core/lab/TableTag.java +++ b/src/main/java/org/beetl/core/lab/TableTag.java @@ -2,9 +2,7 @@ package org.beetl.core.lab; import org.beetl.core.tag.Tag; -import java.util.Map; - -public class TableTag extends Tag { +class TableTag extends Tag { @Override public void render() { this.doBodyRender(); diff --git a/src/main/java/org/beetl/core/lab/TailBean.java b/src/main/java/org/beetl/core/lab/TailBean.java index 33f44fa186b4a7cdb18250d4d8837d8f69191109..87e656d5cfc28354abc92f3230de5ba26cdfefa5 100644 --- a/src/main/java/org/beetl/core/lab/TailBean.java +++ b/src/main/java/org/beetl/core/lab/TailBean.java @@ -3,25 +3,20 @@ package org.beetl.core.lab; import java.util.HashMap; import java.util.Map; -public class TailBean { - protected Map extMap = new HashMap(); +class TailBean { + protected Map extMap = new HashMap<>(); boolean hasLazy = false; public Object get(String key) { return extMap.get(key); - } public void set(String key, Object value) { - this.extMap.put(key, value); - } public Map getTails() { - return extMap; - } } diff --git a/src/main/java/org/beetl/core/lab/Test.java b/src/main/java/org/beetl/core/lab/Test.java index 8118133a07b4cff4632b74ce196f20a9e05c875b..ef5a73f6f30fc03b2dce6119ee5c7d40b87e1223 100644 --- a/src/main/java/org/beetl/core/lab/Test.java +++ b/src/main/java/org/beetl/core/lab/Test.java @@ -10,7 +10,7 @@ import org.beetl.core.resource.ClasspathResourceLoader; /** * @author xiandafu */ -public class Test { +class Test { /** DEBUG flag */ private static final boolean DEBUG = BeetlConfig.DEBUG; @@ -31,12 +31,12 @@ public class Test { MyTestObject obj = new MyTestObject("abc"); t.binding("user", obj); t.binding("abc", 1234); - String str = t.render(); - // 调试时输入: + String str = t.render(); + // 调试时输入: // ((AsmAAFactory) AABuilder.defalutAAFactory).asmBeanFactory.beanMap.get(MyTestObject.class) System.out.println(str); - } - int a =1; + } + int a = 1; } diff --git a/src/main/java/org/beetl/core/lab/TestUser.java b/src/main/java/org/beetl/core/lab/TestUser.java index 0e920e660ecc6202072745184bc353c9433dda54..cb2f39f1791ef817fc97d0c0449eff310f4af0fa 100644 --- a/src/main/java/org/beetl/core/lab/TestUser.java +++ b/src/main/java/org/beetl/core/lab/TestUser.java @@ -7,7 +7,7 @@ import java.util.*; /** * @author 所有测试类采用的Pojo类 */ -public class TestUser implements BaseEntity { +class TestUser implements BaseEntity { /** Log TAG */ private static final String TAG = "org.beetl.core.lab.TestUser"; diff --git a/src/main/java/org/beetl/core/resource/StringTemplateResource.java b/src/main/java/org/beetl/core/resource/StringTemplateResource.java index dbd4357637d4ee7163f6d334972c6683964cffd5..ed9d570332a7eee5daee213cb46cd19afe991469 100644 --- a/src/main/java/org/beetl/core/resource/StringTemplateResource.java +++ b/src/main/java/org/beetl/core/resource/StringTemplateResource.java @@ -33,6 +33,9 @@ import java.io.StringReader; import org.beetl.core.Resource; import org.beetl.core.ResourceLoader; +/** + * 字符模板资源 + */ public class StringTemplateResource extends Resource { public StringTemplateResource(String template, ResourceLoader resourceLoader) {