From f5172ef42b36c4a7b4e7afffc00e6c07390e2c12 Mon Sep 17 00:00:00 2001
From: Looly <loolly@gmail.com>
Date: Sun, 7 Mar 2021 10:41:21 +0800
Subject: [PATCH] fix code

---
 .../java/cn/hutool/core/text/StrMatcher.java  | 19 ++++++++++++++++---
 .../cn/hutool/core/text/StrMatcherTest.java   | 19 +++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/hutool-core/src/main/java/cn/hutool/core/text/StrMatcher.java b/hutool-core/src/main/java/cn/hutool/core/text/StrMatcher.java
index f6ef39c98..e5bbc60ab 100644
--- a/hutool-core/src/main/java/cn/hutool/core/text/StrMatcher.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/StrMatcher.java
@@ -1,6 +1,5 @@
 package cn.hutool.core.text;
 
-import cn.hutool.core.lang.Console;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 
@@ -25,11 +24,20 @@ public class StrMatcher {
 
 	List<String> patterns;
 
+	/**
+	 * 构造
+	 *
+	 * @param pattern 模式，变量用${XXX}占位
+	 */
 	public StrMatcher(String pattern) {
 		this.patterns = parse(pattern);
-		Console.log(this.patterns);
 	}
 
+	/**
+	 * 匹配并提取匹配到的内容
+	 * @param text 被匹配的文本
+	 * @return 匹配的map，key为变量名，value为匹配到的值
+	 */
 	public Map<String, String> match(String text) {
 		final HashMap<String, String> result = MapUtil.newHashMap(true);
 		int from = 0;
@@ -41,11 +49,16 @@ public class StrMatcher {
 				key = StrUtil.sub(part, 2, part.length() - 1);
 			} else {
 				to = text.indexOf(part, from);
+				if(to < 0){
+					//普通字符串未匹配到，说明整个模式不能匹配，返回空
+					return MapUtil.empty();
+				}
 				if (null != key && to > from) {
 					// 变量对应部分有内容
 					result.put(key, text.substring(from, to));
 				}
-				from = to + 1;
+				// 下一个起始点是普通字符串的末尾
+				from = to + part.length();
 				key = null;
 			}
 		}
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/StrMatcherTest.java b/hutool-core/src/test/java/cn/hutool/core/text/StrMatcherTest.java
index 12c59c840..4ebf4ff9a 100644
--- a/hutool-core/src/test/java/cn/hutool/core/text/StrMatcherTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/StrMatcherTest.java
@@ -1,6 +1,7 @@
 package cn.hutool.core.text;
 
 import cn.hutool.core.lang.Console;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.Map;
@@ -13,4 +14,22 @@ public class StrMatcherTest {
 		final Map<String, String> match = strMatcher.match("小明-19-男-中国-河南-郑州-已婚");
 		Console.log(match);
 	}
+
+	@Test
+	public void matcherTest2(){
+		// 当有无匹配项的时候，按照全不匹配对待
+		final StrMatcher strMatcher = new StrMatcher("${name}-${age}-${gender}-${country}-${province}-${city}-${status}");
+		final Map<String, String> match = strMatcher.match("小明-19-男-中国-河南-郑州");
+		Assert.assertEquals(0, match.size());
+	}
+
+	@Test
+	public void matcherTest3(){
+		// 当有无匹配项的时候，按照全不匹配对待
+		final StrMatcher strMatcher = new StrMatcher("${name}经过${year}年");
+		final Map<String, String> match = strMatcher.match("小明经过20年，成长为一个大人。");
+		Console.log(match);
+		Assert.assertEquals("小明", match.get("name"));
+		Assert.assertEquals("20", match.get("year"));
+	}
 }