发布1.3.1版本

lyg888 · May 2, 2018 · a7a4e31 · a7a4e31
1 parent 89252b6
commit a7a4e31
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -1186,6 +1186,9 @@ Zealot类库遵守[Apache License 2.0][6] 许可证
 
 ## 十二、版本更新记录
 
+- v1.3.1(2018-05-03)
+  - 修复了扫描xml路径始终为zealot的问题
+  - 修改了阿里规约插件检查出的一些代码坏味道问题
 - v1.3.0(2018-05-02)
   - 新增完善各种动态SQL操作符和XML标签的`与`、`或`、`非`的逻辑
   - 新增了根据自定义模式构建模糊匹配的likePattern标签，新增了isNull、isNotNull等情况

diff --git a/docs/change-log.md b/docs/change-log.md
@@ -1,3 +1,6 @@
+- v1.3.1(2018-05-03)
+  - 修复了扫描xml路径始终为zealot的问题
+  - 修改了阿里规约插件检查出的一些代码坏味道问题
 - v1.3.0(2018-05-02)
   - 新增完善各种动态SQL操作符和XML标签的`与`、`或`、`非`的逻辑
   - 新增了根据自定义模式构建模糊匹配的likePattern标签，新增了isNull、isNotNull等情况

diff --git a/docs/start-use.md b/docs/start-use.md
@@ -12,12 +12,12 @@
 <dependency>
     <groupId>com.blinkfox</groupId>
     <artifactId>zealot</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
 </dependency>
 ```
 
 ### Gradle
 
 ```bash
-compile 'com.blinkfox:zealot:1.3.0'
+compile 'com.blinkfox:zealot:1.3.1'
 ```
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.blinkfox</groupId>
     <artifactId>zealot</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
     <packaging>jar</packaging>
 
     <name>zealot</name>

diff --git a/src/main/java/com/blinkfox/zealot/config/ZealotConfigManager.java b/src/main/java/com/blinkfox/zealot/config/ZealotConfigManager.java
@@ -52,6 +52,22 @@ public static ZealotConfigManager getInstance() {
         return confManager;
     }
 
+    /**
+     * 获取配置的zealot的XML文件所在的位置字符串.
+     * @return xmlLocations
+     */
+    public String getXmlLocations() {
+        return xmlLocations;
+    }
+
+    /**
+     * 获取配置的zealot的自定义handler处理器所在的位置字符串.
+     * @return handlerLocations
+     */
+    public String getHandlerLocations() {
+        return handlerLocations;
+    }
+
     /**
      * 初始化加载Zealot的配置信息到缓存中.
      *
@@ -137,9 +153,8 @@ private void scanLocations(String xmlLocations, String handlerLocations) {
      * @return ZealotConfigManager的全局唯一实例
      */
     public ZealotConfigManager initLoadXmlLocations(String xmlLocations) {
-        this.xmlLocations = xmlLocations;
-        this.xmlLocations = StringHelper.isBlank(this.xmlLocations) ? "zealot" : this.xmlLocations;
-        XmlScanner.newInstance().scan(xmlLocations);
+        this.xmlLocations = StringHelper.isBlank(xmlLocations) ? "zealot" : xmlLocations;
+        XmlScanner.newInstance().scan(this.xmlLocations);
         this.cachingXmlAndEval();
         return this;
     }

diff --git a/src/test/java/com/blinkfox/zealot/config/ZealotConfigManagerTest.java b/src/test/java/com/blinkfox/zealot/config/ZealotConfigManagerTest.java
@@ -15,22 +15,25 @@
  */
 public class ZealotConfigManagerTest {
 
+    private static final String XML_LOCATIONS = "zealot";
+
+    private static final String HANDLER_LOCATIONS = "com.blinkfox.zealot.test.handler";
+
     /**
      * 测试扫描和配置xml文件.
      */
     @Test
-    public void initLoadXmlLocations() {
-        ZealotConfigManager.getInstance().initLoadXmlLocations("zealot");
+    public void initLoadLocations() {
+        ZealotConfigManager zealotConfigManager = ZealotConfigManager.getInstance()
+                .initLoadXmlLocations(XML_LOCATIONS)
+                .initLoadHandlerLocations(HANDLER_LOCATIONS);
+
+        Assert.assertEquals(XML_LOCATIONS, zealotConfigManager.getXmlLocations());
+        Assert.assertEquals(HANDLER_LOCATIONS, zealotConfigManager.getHandlerLocations());
+
         Map<String, String> xmlMaps = XmlContext.INSTANCE.getXmlPathMap();
         Assert.assertTrue(xmlMaps.size() >= 2);
-    }
 
-    /**
-     * 测试扫描和配置handler文件.
-     */
-    @Test
-    public void initLoadHandlerLocations() {
-        ZealotConfigManager.getInstance().initLoadHandlerLocations("com.blinkfox.zealot.test.handler");
         Map<String, TagHandler> tagHandlerMap = AbstractZealotConfig.getTagHandlerMap();
         Assert.assertTrue(tagHandlerMap.size() >= 46);
     }