This is an automated email from the ASF dual-hosted git repository.
ghenzler pushed a change to branch
feature/SLING-9662-Introduce-SlingUri-Mapping-SPI-v3
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-api.git.
discard f149adc SLING-9745 Sling Uri Mapping SPI
add ebe211f SLING-9774 The ValueMapUtil#merge behavior is different from
the deprecated CompositeValueMap
add 99af984 SLING-9774 Use a simpler fix that also passes the tests.
add 8615ff5 SLING-9777 Better handling for invalid URIs when using
SlingUri (special characters, spaces)
add 02088d2 Merge pull request #24 from
apache/feature/SLING-9777-SlingUri-better-encoding-handling
add 3e9cf18 SLING-9777 unit test for well-known URI
add 610bae1 SLING-9745 Sling Uri Mapping SPI
add 43f5804 SLING-9745 Use IntermediateMapping tuple instead of map
add 855191c SLING-9745 Using unique SNAPSHOT version
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (f149adc)
\
N -- N -- N
refs/heads/feature/SLING-9662-Introduce-SlingUri-Mapping-SPI-v3 (855191c)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
pom.xml | 2 +-
.../resource/mapping/PathToUriMappingService.java | 58 +--
.../java/org/apache/sling/api/uri/SlingUri.java | 7 +-
.../org/apache/sling/api/uri/SlingUriBuilder.java | 394 ++++++++++++++++-----
.../org/apache/sling/api/uri/package-info.java | 2 +-
.../sling/api/wrappers/impl/MergingValueMap.java | 12 +-
.../api/resource/impl/ValueMapUtilMergeTest.java | 19 +
.../apache/sling/api/uri/SlingUriBuilderTest.java | 38 ++
.../apache/sling/api/uri/SlingUriEncodingTest.java | 109 ++++++
.../sling/api/uri/SlingUriInvalidUrisTest.java | 43 ++-
.../org/apache/sling/api/uri/SlingUriTest.java | 304 +++++++++++++++-
11 files changed, 849 insertions(+), 139 deletions(-)
create mode 100644
src/test/java/org/apache/sling/api/uri/SlingUriEncodingTest.java
