lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MultiHashKey

Browse Source
This commit is contained in:
redkale
2024-01-30 23:15:06 +08:00
parent 54d629155b
commit 5ce226edd7
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/redkale/util/MultiHashKeys.java
View File

@@ -29,7 +29,7 @@ class MultiHashKeys {
for (int i = 0; i < chars.length; i++) {
char ch = chars[i];
if (ch == '{') {
if (paraming || i < 1) {
if (paraming) {
throw new RedkaleException(MultiHashKey.class.getSimpleName() + " parse error, key: " + key);
}
if (last == '#') {
@@ -43,15 +43,12 @@ class MultiHashKeys {
sb.deleteCharAt(sb.length() - 1);
sb.append(ch);
} else {
throw new RedkaleException(MultiHashKey.class.getSimpleName() + " parse error, key: " + key);
sb.append(ch);
}
} else if (last == '\\' && ch == '}') {
} else if (ch == '}' && last == '\\') {
sb.deleteCharAt(sb.length() - 1);
sb.append(ch);
} else if (ch == '}') {
if (!paraming) {
throw new RedkaleException(MultiHashKey.class.getSimpleName() + " parse error, key: " + key);
}
} else if (ch == '}' && paraming) {
String name = sb.toString();
sb.delete(0, sb.length());
if (name.indexOf('.') > 0) {
@@ -65,6 +62,9 @@ class MultiHashKeys {
}
last = ch;
}
if (sb.length() > 0) {
list.add(new StringKey(sb.toString()));
}
if (list.size() == 1) {
return list.get(0);
}

6
src/test/java/org/redkale/test/util/MultiHashKeyTest.java
View File

@@ -86,7 +86,11 @@ public class MultiHashKeyTest {
@Test
public void run6() throws Exception {
String[] paramNames = {"map", "id"};
String key = "{key_#{map.name}_#{id}_#{map.index}}";
MultiHashKey rs = MultiHashKey.create(paramNames, key);
Map<String, Object> map = Utility.ofMap("name", "me", "index", 123);
Assertions.assertEquals("{key_me_123_123}", rs.keyFor(map, 123));
}
@Test