Merge pull request #4 from shootercheng/main

update readme

Author: shootercheng

README.md

@@ -7,8 +7,11 @@
 [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
 [![Maven central](https://maven-badges.herokuapp.com/maven-central/com.github.catdou/param-validator/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.catdou/param-validator)
 
-demo project
+## demo project
+### SpringBoot
 [https://github.com/shootercheng/param-validator-demo](https://github.com/shootercheng/param-validator-demo)
+### web.xml
+[https://github.com/shootercheng/ssm_shiro_blog](https://github.com/shootercheng/ssm_shiro_blog)
 
 ## Maven
 ```xml

src/main/java/org/catdou/validate/cache/ValidatorCache.java

@@ -28,7 +28,7 @@
  * @author James
  */
 public class ValidatorCache {
-    private Map<String, ParamValidator> paramValidatorMap = new ConcurrentHashMap<>();
+    private Map<String, ParamValidator> paramValidatorMap = new ConcurrentHashMap<>(256);
 
     public ValidatorCache() {
         add(ValidatorType.REGEXP.name(), new RegexpValidator());

src/main/java/org/catdou/validate/factory/JsonConfigLoader.java

@@ -17,9 +17,7 @@
 package org.catdou.validate.factory;
 
 import com.alibaba.fastjson.JSONObject;
-import org.apache.commons.io.FileUtils;
 import org.catdou.validate.constant.ParamValidatorConstants;
-import org.catdou.validate.exception.ConfigException;
 import org.catdou.validate.exception.ParseException;
 import org.catdou.validate.io.FileResourcesUtils;
 import org.catdou.validate.log.ValidatorLog;
@@ -29,9 +27,7 @@
 import org.catdou.validate.model.config.UrlRuleBean;
 import org.springframework.core.io.Resource;
 
-import java.io.File;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.List;
 
 /**

src/main/java/org/catdou/validate/util/HttpUtil.java

@@ -18,7 +18,6 @@
 
 import com.alibaba.fastjson.JSON;
 import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.catdou.validate.constant.ParamValidatorConstants;
 import org.catdou.validate.log.ValidatorLog;
 import org.catdou.validate.log.ValidatorLogFactory;
 import org.catdou.validate.model.url.UrlPath;
@@ -61,19 +60,18 @@ public static UrlPath getUrlPath(String url) {
         int moveIndex = 0;
         UrlPath urlPath = new UrlPath();
         while (moveIndex < lenu && moveIndex != -1) {
-            int temp = moveIndex;
             int next = -1;
-            if (urlArr[temp] == ParamValidatorConstants.URL_SLASH) {
-                next = findNext(temp + 1, urlArr, lenu);
+            if (urlArr[moveIndex] == URL_SLASH) {
+                next = findNext(moveIndex + 1, urlArr, lenu);
             }
-            if (temp + 1 == next) {
+            if (moveIndex + 1 == next) {
                 LOGGER.debug("find two slash //");
             } else {
                 String pathItem;
                 if (next != -1) {
-                    pathItem = url.substring(temp + 1, next);
+                    pathItem = url.substring(moveIndex + 1, next);
                 } else {
-                    pathItem = url.substring(temp + 1);
+                    pathItem = url.substring(moveIndex + 1);
                 }
                 urlPath.getPaths().add(pathItem);
                 if (pathItem.startsWith(PATH_LEFT) && pathItem.endsWith(PATH_RIGHT)) {

src/test/java/scd/cache/ValidatorCacheTest.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2021 catdou
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package scd.cache;
+
+import org.catdou.validate.cache.ValidatorCache;
+import org.junit.Assert;
+import org.junit.Test;
+import scd.util.define.DefineParamValidator;
+
+/**
+ * @author James
+ */
+public class ValidatorCacheTest {
+    private ValidatorCache validatorCache = new ValidatorCache();
+
+    @Test
+    public void testAdd() {
+        validatorCache.add(DefineParamValidator.class.getName(), new DefineParamValidator());
+        Assert.assertTrue(validatorCache.getParamValidatorMap().size() > 0);
+        Object defineParamValidator = validatorCache.getParamValidatorMap().get(DefineParamValidator.class.getName());
+        Assert.assertTrue(defineParamValidator instanceof DefineParamValidator);
+    }
+}

…st/java/scd/str/pattern/PathUrlTest.java …/test/java/scd/logger/JdkLoggerTest.javasrc/test/java/scd/str/pattern/PathUrlTest.java renamed to src/test/java/scd/logger/JdkLoggerTest.java src/test/java/scd/str/pattern/PathUrlTest.java renamed to src/test/java/scd/logger/JdkLoggerTest.java

@@ -14,16 +14,28 @@
  * limitations under the License.
  */
 
-package scd.str.pattern;
+package scd.logger;
 
-import org.catdou.validate.model.url.UrlPath;
-import org.catdou.validate.util.HttpUtil;
-import org.junit.Assert;
+import org.catdou.validate.log.jdk.JdkLogger;
+import org.junit.Before;
 import org.junit.Test;
 
 /**
  * @author James
  */
-public class PathUrlTest {
+public class JdkLoggerTest {
+    private JdkLogger jdkLogger;
 
+    @Before
+    public void before() {
+        jdkLogger = new JdkLogger(JdkLoggerTest.class);
+    }
+
+    @Test
+    public void testLog() {
+        jdkLogger.debug("hello ");
+        jdkLogger.warn("hello ");
+        jdkLogger.info("hello ");
+        jdkLogger.error("hello ");
+    }
 }

src/test/java/scd/logger/Slf4jLoggerTest.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2021 catdou
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package scd.logger;
+
+import org.catdou.validate.log.ValidatorLogFactory;
+import org.catdou.validate.log.slf4j.Slf4jLogger;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @author James
+ */
+public class Slf4jLoggerTest {
+    private Slf4jLogger slf4jLogger;
+
+    @Before
+    public void before() {
+        slf4jLogger = new Slf4jLogger(Slf4jLoggerTest.class);
+    }
+
+    @Test
+    public void testLog() {
+        slf4jLogger.debug("hello ");
+        slf4jLogger.warn("hello ");
+        slf4jLogger.info("hello ");
+        slf4jLogger.error("hello ");
+    }
+}