Fix Chinese and add ReUtilDemo

zacfeng · Sep 10, 2014 · 1f76ed7 · 1f76ed7
1 parent a2e0aaa
commit 1f76ed7
Show file tree

Hide file tree

Showing 2 changed files with 91 additions and 6 deletions.
diff --git a/src/main/java/com/xiaoleilu/hutool/ReUtil.java b/src/main/java/com/xiaoleilu/hutool/ReUtil.java
@@ -14,7 +14,7 @@
 public class ReUtil {
 
 	/** 正则表达式匹配中文 */
-	public final static String RE_CHINESE = "[u4e00-u9fa5]";
+	public final static String RE_CHINESE = "[\u4E00-\u9FFF]";
 
 	public final static Pattern NUMBER =  Pattern.compile("\\d+", Pattern.DOTALL);
 	public final static Pattern GROUP_VAR =  Pattern.compile("\\$(\\d+)", Pattern.DOTALL);
@@ -168,11 +168,10 @@ public static String delFirst(String regex, String content) {
 	 * @param content 被查找的内容
 	 * @return 删除前缀后的新内容
 	 */
-	public static String delPreLocation(String regex, String content) {
+	public static String delPre(String regex, String content) {
 		Matcher matcher = Pattern.compile(regex, Pattern.DOTALL).matcher(content);
 		if (matcher.find()) {
 			return StrUtil.sub(content, matcher.end(), content.length());
-//			return content.substring(matcher.end(), content.length());
 		}
 		return content;
 	}
@@ -214,8 +213,8 @@ public static <T extends Collection<String>> T findAll(Pattern pattern, String c
 	 * @param StringWithNumber 带数字的字符串
 	 * @return 整数
 	 */
-	public static int getFirstNumber(String StringWithNumber) {
-		return Integer.parseInt(get(NUMBER, StringWithNumber, 0));
+	public static Integer getFirstNumber(String StringWithNumber) {
+		return Conver.toInt(get(NUMBER, StringWithNumber, 0), null);
 	}
 
 	/**
@@ -252,7 +251,8 @@ public static boolean isMatch(String regex, String content) {
 	}
 
 	/**
-	 * 正则替换指定值
+	 * 正则替换指定值<br>
+	 * 通过正则查找到字符串，然后把匹配到的字符串加入到replacementTemplate中，$1表示分组1的字符串
 	 * @param content 文本
 	 * @param regex 正则
 	 * @param replacementTemplate 替换的文本模板，可以使用$1类似的变量提取正则匹配出的内容

diff --git a/src/test/java/com/xiaoleilu/hutool/demo/ReUtilDemo.java b/src/test/java/com/xiaoleilu/hutool/demo/ReUtilDemo.java
@@ -0,0 +1,85 @@
+package com.xiaoleilu.hutool.demo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+
+import com.xiaoleilu.hutool.Log;
+import com.xiaoleilu.hutool.ReUtil;
+
+/**
+ * 正则表达式工具类Demo
+ * @author Looly
+ *
+ */
+public class ReUtilDemo {
+	private final static Logger log = Log.get();
+
+	public static void main(String[] args) {
+		String content = "ZZZaaabbbccc中文1234";
+
+		//get demo 正则查找匹配的第一个字符串
+		String resultGet = ReUtil.get("\\w{2}", content, 0);
+		log.debug("get: {}", resultGet);
+
+		log.debug("---------------------------------------------------------");
+
+		//抽取多个分组然后把它们拼接起来
+		String resultExtractMulti = ReUtil.extractMulti("(\\w)aa(\\w)", content, "$1-$2");
+		log.debug("extractMulti: {}", resultExtractMulti);
+
+		log.debug("---------------------------------------------------------");
+
+		//抽取多个分组然后把原文匹配到位置之前的内容都删除
+		String[] contents = new String[]{content};
+		String resultExtractMultiAndDelPre = ReUtil.extractMultiAndDelPre("(\\w)aa(\\w)", contents, "$1-$2");
+		log.debug("extractMultiAndDelPre: content: {}, extract: {}", contents[0], resultExtractMultiAndDelPre);
+
+		log.debug("---------------------------------------------------------");
+
+		//删除第一个匹配到的内容
+		String resultDelFirst = ReUtil.delFirst("(\\w)aa(\\w)", content);
+		log.debug("delFirst: {}", resultDelFirst);
+
+		log.debug("---------------------------------------------------------");
+
+		//删除第一个匹配到的内容以及之前的文本
+		String resultDelPre = ReUtil.delPre("(\\w)aa(\\w)", content);
+		log.debug("delPre: {}", resultDelPre);
+
+		log.debug("---------------------------------------------------------");
+
+		//查找所有匹配文本
+		List<String> resultFindAll = ReUtil.findAll("\\w{2}", content, 0, new ArrayList<String>());
+		log.debug("findAll: {}", resultFindAll);
+
+		log.debug("---------------------------------------------------------");
+
+		//找到匹配的第一个数字
+		Integer resultGetFirstNumber= ReUtil.getFirstNumber(content);
+		log.debug("getFirstNumber: {}", resultGetFirstNumber);
+
+		log.debug("---------------------------------------------------------");
+
+		//格式是否符合Ipv4格式
+		log.debug("isIpv4: {}", ReUtil.isIpv4("127.0.0.1"));
+
+		log.debug("---------------------------------------------------------");
+
+		//给定字符串是否匹配给定正则
+		log.debug("isMatch: {}", ReUtil.isMatch("\\w+[\u4E00-\u9FFF]+\\d+", content));
+
+		log.debug("---------------------------------------------------------");
+
+		//通过正则查找到字符串，然后把匹配到的字符串加入到replacementTemplate中，$1表示分组1的字符串
+		log.debug("replaceAll: {}", ReUtil.replaceAll(content, "(\\d+)", "->$1<-"));
+
+		log.debug("---------------------------------------------------------");
+
+		//转义给定字符串，为正则相关的特殊符号转义
+		log.debug("replaceAll: {}", ReUtil.escape("我有个$符号{}"));
+
+		log.debug("---------------------------------------------------------");
+	}
+}