Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14521 from DevOrc:fixes-14348

Browse Source 
* pr/14521:
  Support escaped characters in BasicJsonParser
This commit is contained in:
Stephane Nicoll 2018-09-20 10:24:42 +02:00
commit ccbbe0f0f3
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot/src/main/java/org/springframework/boot/json/BasicJsonParser.java
View File

@ -125,9 +125,16 @@ public class BasicJsonParser implements JsonParser {
int inObject = 0;
int inList = 0;
boolean inValue = false;
boolean inEscape = false;
StringBuilder build = new StringBuilder();
while (index < json.length()) {
char current = json.charAt(index);
if (inEscape) {
build.append(current);
index++;
inEscape = false;
continue;
}
if (current == '{') {
inObject++;
}
@ -147,6 +154,9 @@ public class BasicJsonParser implements JsonParser {
list.add(build.toString());
build.setLength(0);
}
else if (current == '\\') {
inEscape = true;
}
else {
build.append(current);
}

7
spring-boot/src/test/java/org/springframework/boot/json/AbstractJsonParserTests.java
View File

@ -170,4 +170,11 @@ public abstract class AbstractJsonParserTests {
this.parser.parseList("\n\t{}");
}
@Test
public void escapeQuote() {
String input = "{\"foo\": \"\\\"bar\\\"\"}";
Map<String, Object> map = this.parser.parseMap(input);
assertThat(map.get("foo")).isEqualTo("\"bar\"");
}
}