Skip to content

Escape ~ and / in JSONPointer.toURIFragment() #1083

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DarkLight606 wants to merge 1 commit into
base: master
Choose a base branch
from
+23 −3
Open

Escape ~ and / in JSONPointer.toURIFragment() #1083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/json/JSONPointer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ public String toURIFragment() {
try {
StringBuilder rval = new StringBuilder("#");
for (String token : this.refTokens) {
rval.append('/').append(URLEncoder.encode(token, ENCODING));
rval.append('/').append(URLEncoder.encode(escape(token), ENCODING));
}
return rval.toString();
} catch (UnsupportedEncodingException e) {
Expand Down
24 changes: 22 additions & 2 deletions src/test/java/org/json/junit/JSONPointerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,29 @@ public void toURIFragment() {
assertEquals("#/c%25d", new JSONPointer("/c%d").toURIFragment());
assertEquals("#/e%5Ef", new JSONPointer("/e^f").toURIFragment());
assertEquals("#/g%7Ch", new JSONPointer("/g|h").toURIFragment());
assertEquals("#/m%7En", new JSONPointer("/m~n").toURIFragment());
assertEquals("#/m%7E0n", new JSONPointer("/m~n").toURIFragment());
}


@Test
public void toURIFragmentEscaping() {
JSONPointer pointer = JSONPointer.builder()
.append("obj")
.append("other~key").append("another/key")
.append(0)
.build();
assertEquals("#/obj/other%7E0key/another%7E1key/0", pointer.toURIFragment());
assertEquals("val", new JSONPointer(pointer.toURIFragment()).queryFrom(document));
}

@Test
public void toURIFragmentRoundTrip() {
JSONObject object = new JSONObject().put("~1", "tilde one").put("/", "slash");
JSONPointer tildeOne = JSONPointer.builder().append("~1").build();
JSONPointer slash = JSONPointer.builder().append("/").build();
assertEquals("tilde one", object.query(tildeOne.toURIFragment()));
assertEquals("slash", object.query(slash.toURIFragment()));
}

@Test
public void tokenListIsCopiedInConstructor() {
JSONPointer.Builder b = JSONPointer.builder().append("key1");
Expand Down
Loading