mirror of
https://github.com/metosin/reitit.git
synced 2026-02-20 17:29:08 +00:00
encode -> decode
This commit is contained in:
parent
36f1df3867
commit
406386e0f6
2 changed files with 6 additions and 6 deletions
|
|
@ -23,7 +23,7 @@ public class SegmentTrie {
|
||||||
return segments;
|
return segments;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String encode(String s) {
|
private static String decode(String s) {
|
||||||
try {
|
try {
|
||||||
if (s.contains("%")) {
|
if (s.contains("%")) {
|
||||||
String _s = s;
|
String _s = s;
|
||||||
|
|
@ -173,7 +173,7 @@ public class SegmentTrie {
|
||||||
if (i < segments.size() && !segments.get(i).isEmpty()) {
|
if (i < segments.size() && !segments.get(i).isEmpty()) {
|
||||||
final Match m = child.match(i + 1, segments, match);
|
final Match m = child.match(i + 1, segments, match);
|
||||||
if (m != null) {
|
if (m != null) {
|
||||||
m.params.put(parameter, encode(segments.get(i)));
|
m.params.put(parameter, decode(segments.get(i)));
|
||||||
return m;
|
return m;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -197,7 +197,7 @@ public class SegmentTrie {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Match match(int i, List<String> segments, Match match) {
|
public Match match(int i, List<String> segments, Match match) {
|
||||||
match.params.put(parameter, encode(String.join("/", segments.subList(i, segments.size()))));
|
match.params.put(parameter, decode(String.join("/", segments.subList(i, segments.size()))));
|
||||||
match.data = data;
|
match.data = data;
|
||||||
return match;
|
return match;
|
||||||
}
|
}
|
||||||
|
|
@ -285,7 +285,7 @@ public class SegmentTrie {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return (data != null ? data.toString() : "null");
|
return (data != null ? data.toString() : "nil");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -113,6 +113,6 @@
|
||||||
(.matcher
|
(.matcher
|
||||||
(doto (SegmentTrie.)
|
(doto (SegmentTrie.)
|
||||||
(.add "/user" 1)
|
(.add "/user" 1)
|
||||||
#_(.add "/user/id/permissions" 2)
|
(.add "/user/id" 2)
|
||||||
(.add "/user/id/permissions2" 3))))))
|
(.add "/user/id/permissions2" nil))))))
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue