Skip to content

SLING-11352 - Fix parsing of path-only mappings #84

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

SLING-11352 - Fix parsing of path-only mappings #84

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/apache/sling/resourceresolver/impl/mapping/MapEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public static String fixUriPath(final String uriPath) {
public static String toURI(final String uriPath) {
for (int i = 0; i < PATH_TO_URL_MATCH.length; i++) {
final Matcher m = PATH_TO_URL_MATCH[i].matcher(uriPath);
if (m.find()) {
if (m.matches()) {
return m.replaceAll(PATH_TO_URL_REPLACEMENT[i]);
}
}
Expand Down
5 changes: 5 additions & 0 deletions src/test/java/org/apache/sling/resourceresolver/impl/mapping/MapEntryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@

public class MapEntryTest {

@Test public void test_regular_path() {
// regular paths should return null like the Javadoc says
assertNull(MapEntry.toURI("/the/path"));
}

@Test public void test_to_url_http_80() {
assertEqualUri("http://sling.apache.org", "http/sling.apache.org.80");
assertEqualUri("http://sling.apache.org/", "http/sling.apache.org.80/");
Expand Down