Skip to content

Commit 18e8ef6

Browse files
authored
Merge pull request #1083 from DarkLight606/fix/1082
Fix a parsing error in JSONPointer.toURIFragment()
2 parents b55c69e + f875ab2 commit 18e8ef6

2 files changed

Lines changed: 23 additions & 3 deletions

File tree

‎src/main/java/org/json/JSONPointer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ public String toURIFragment() {
276276
try {
277277
StringBuilder rval = new StringBuilder("#");
278278
for (String token : this.refTokens) {
279-
rval.append('/').append(URLEncoder.encode(token, ENCODING));
279+
rval.append('/').append(URLEncoder.encode(escape(token), ENCODING));
280280
}
281281
return rval.toString();
282282
} catch (UnsupportedEncodingException e) {

‎src/test/java/org/json/junit/JSONPointerTest.java‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,29 @@ public void toURIFragment() {
219219
assertEquals("#/c%25d", new JSONPointer("/c%d").toURIFragment());
220220
assertEquals("#/e%5Ef", new JSONPointer("/e^f").toURIFragment());
221221
assertEquals("#/g%7Ch", new JSONPointer("/g|h").toURIFragment());
222-
assertEquals("#/m%7En", new JSONPointer("/m~n").toURIFragment());
222+
assertEquals("#/m%7E0n", new JSONPointer("/m~n").toURIFragment());
223223
}
224-
224+
225+
@Test
226+
public void toURIFragmentEscaping() {
227+
JSONPointer pointer = JSONPointer.builder()
228+
.append("obj")
229+
.append("other~key").append("another/key")
230+
.append(0)
231+
.build();
232+
assertEquals("#/obj/other%7E0key/another%7E1key/0", pointer.toURIFragment());
233+
assertEquals("val", new JSONPointer(pointer.toURIFragment()).queryFrom(document));
234+
}
235+
236+
@Test
237+
public void toURIFragmentRoundTrip() {
238+
JSONObject object = new JSONObject().put("~1", "tilde one").put("/", "slash");
239+
JSONPointer tildeOne = JSONPointer.builder().append("~1").build();
240+
JSONPointer slash = JSONPointer.builder().append("/").build();
241+
assertEquals("tilde one", object.query(tildeOne.toURIFragment()));
242+
assertEquals("slash", object.query(slash.toURIFragment()));
243+
}
244+
225245
@Test
226246
public void tokenListIsCopiedInConstructor() {
227247
JSONPointer.Builder b = JSONPointer.builder().append("key1");

0 commit comments

Comments
 (0)