This is an automated email from the ASF dual-hosted git repository.
andysch pushed a change to branch feature/SLING-7768
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git.
from f4aae98 SLING-7768 Added the String Interpolation tests to the
EtcMappingResourceResolverTest to make sure the Sling Interpolation works with
Resource Resolving
add 5ef614e Use released API 2.18.2
add 2e85a39 [maven-release-plugin] prepare release
org.apache.sling.resourceresolver-1.6.2
add 6f86f7d [maven-release-plugin] prepare for next development iteration
add c11a78e Revert "SLING-7544 - Make optimized alias lookup non-blocking"
add d36a97d [maven-release-plugin] prepare release
org.apache.sling.resourceresolver-1.6.4
add 2ceaa44 [maven-release-plugin] prepare for next development iteration
add 0512d26 SLING-7798 : Switch from JSR-305 annotations to Jetbrains
Nullable/NotNull Annotations
add 6d5f23f Added Tests for the Etc Mapping through Map Entries and
Resource Resolver
add 9271b58 Added an Etc Mapping Test to showcase the endless circular
mapping
add 384172e Merge branch 'master' of
github.com:apache/sling-org-apache-sling-resourceresolver
add 85c1913 SLING-7665 Use bnd Maven plugins
add 3efac62 remove some unused imports
add 8ee602c remove versions already defined in parent pom
add 78bb6e3 update to osgi-mock 2.3.10 restructure tests to avoid
registering multiple version of ResourceProviderTracker (no change in test
logic)
add 2e21a74 get service reference from service registration - getting the
first one from all service references for this path may return the wrong one
add b9e7429 do not register the same resource provider mock twice
add f2e87e4 fix unit test to desired behavior: register overlay resource
provider with higher service ranking with osgi-mock 1.4.0 it worked before
because this hat a flaw in comparing service references
add 8a88532 Merge branch 'feature/update-testing-deps'
add b01bea8 SLING-7792 - Resource Resolver should return more than one
resolved path if available
add bdfa9e3 SLING-7792 - Resource Resolver should return more than one
resolved path if available
add def05b6 SLING-7792 - Resource Resolver should return more than one
resolved path if available
add 9ff4836 SLING-7792 - Resource Resolver should return more than one
resolved path if available
add 69c3a3e SLING-7792 - Resource Resolver should return more than one
resolved path if available
add 59a452a Use released version of the maven-sling-plugin
add 3ad6de6 Use latest API bundle
add 296c5f3 [maven-release-plugin] prepare release
org.apache.sling.resourceresolver-1.6.6
add 38142f3 [maven-release-plugin] prepare for next development iteration
add 34f301b SLING-7881 Resource resolver may calculate incorrect map path
for an address that is a selector on the root resource
add 411817f SLING-7216 - [nice-to-have] Add a CODE_OF_CONDUCT file to
every module
add 72855c2 SLING-7215 - [nice-to-have] Add a CONTRIBUTING file to every
module
add e1587c2 trivial: added license header to *.md files
add bbccfed SLING-8006: Remove empty list of handlers if we removed the
last handler from a handler list for a given path because the handler didn't
activate.
add cbf85dd SLING-8006: Double check that the list is not used when empty
to make sure.
add fd5afba [maven-release-plugin] prepare release
org.apache.sling.resourceresolver-1.6.8
add e017ace [maven-release-plugin] prepare for next development iteration
add 92935ad SLING-7245 - Validate pull requests using Jenkins
add 4593aa9 Updating badges for org-apache-sling-resourceresolver
add 38f975e SLING-8341 : find extra slashes and ignore redundant
delimiteres
add fedf548 SLING-8341 : Added test case for extra slash delim in path
add 0ba947f SLING-8335 :StringIndexOutOfBoundsException from resolver.map
with non absolute path check for absolute path at the beginning of the method
add 03f2f1a SLING-8335 - test case to assert a relative path mapping
returns the original path itself
add f5e8226 Merge pull request #12 from ashokpanghal/issues/SLING-8335
add 6b7a8c8 Merge branch 'master' into issues/SLING-8341
add 25c97da Merge pull request #13 from ashokpanghal/issues/SLING-8341
add 7b8fefc [maven-release-plugin] prepare release
org.apache.sling.resourceresolver-1.6.10
add 87eb575 [maven-release-plugin] prepare for next development iteration
add 96bbbbb Merge pull request #1 from apache/master
add 54721c2 SLING-8349 : resolver.map - map empty path to root path
add 3ad934d Merge pull request #14 from ashokpanghal/issues/SLING-8349
add 3df077a [maven-release-plugin] prepare release
org.apache.sling.resourceresolver-1.6.12
add 5dcaacc [maven-release-plugin] prepare for next development iteration
new 903cbd8 Merge branch 'master' into feature/SLING-7768
new bdc07c8 Migrated the Sling Interplation to Lang3 StrSubtitutor,
adjusted the tests and fixed some merge problems
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CODE_OF_CONDUCT.md | 22 ++
CONTRIBUTING.md | 24 ++
.../providers/tree/Pathable.java => Jenkinsfile | 9 +-
README.md | 58 +++-
bnd.bnd | 17 +
pom.xml | 27 +-
.../impl/CommonResourceResolverFactoryImpl.java | 20 +-
.../impl/ResourceResolverFactoryActivator.java | 5 -
.../impl/ResourceResolverFactoryConfig.java | 6 -
.../impl/ResourceResolverImpl.java | 236 ++-----------
.../resourceresolver/impl/ResourceTypeUtil.java | 8 +-
.../console/ResourceResolverWebConsolePlugin.java | 34 +-
.../impl/helper/ResourceResolverContext.java | 4 +-
.../impl/helper/ResourceResolverControl.java | 20 +-
.../impl/legacy/LegacyResourceProviderAdapter.java | 28 +-
.../LegacyResourceProviderFactoryAdapter.java | 36 +-
.../impl/mapping/MapConfigurationProvider.java | 4 -
.../resourceresolver/impl/mapping/MapEntries.java | 92 +----
.../impl/mapping/MapEntriesHandler.java | 7 -
.../resourceresolver/impl/mapping/MapEntry.java | 20 +-
.../impl/mapping/ResourceMapperImpl.java | 382 +++++++++++++++++++++
.../impl/mapping/StringInterpolationProvider.java | 68 +---
.../StringInterpolationProviderConfiguration.java | 24 ++
.../mapping/StringInterpolationProviderImpl.java | 114 ++----
.../impl/providers/ResourceProviderTracker.java | 13 +-
.../stateful/AuthenticatedResourceProvider.java | 14 +-
.../providers/stateful/BasicResolveContext.java | 14 +-
.../impl/providers/stateful/ProviderManager.java | 28 +-
.../impl/EtcMappingResourceResolverTest.java | 52 ++-
.../sling/resourceresolver/impl/Fixture.java | 17 +-
.../impl/MockedResourceResolverImplTest.java | 16 +-
.../impl/ResourceResolverMangleNamespacesTest.java | 8 +-
.../resourceresolver/impl/SimpleValueMapImpl.java | 7 +-
.../mapping/AbstractMappingMapEntriesTest.java | 10 +-
.../impl/mapping/InMemoryResource.java | 96 ++++++
.../impl/mapping/InMemoryResourceProvider.java | 79 +++++
.../impl/mapping/MapEntriesTest.java | 286 +++++----------
.../impl/mapping/MapEntryTest.java | 60 ++++
.../impl/mapping/ResourceMapperImplTest.java | 285 +++++++++++++++
.../mapping/StringInterpolationMapEntriesTest.java | 4 +-
.../StringInterpolationProviderImplTest.java | 148 +++++---
.../providers/ResourceProviderTrackerTest.java | 51 ++-
.../sling/resourceresolver/util/MockTestUtil.java | 168 +++++++--
43 files changed, 1709 insertions(+), 912 deletions(-)
create mode 100644 CODE_OF_CONDUCT.md
create mode 100644 CONTRIBUTING.md
copy
src/main/java/org/apache/sling/resourceresolver/impl/providers/tree/Pathable.java
=> Jenkinsfile (87%)
create mode 100644 bnd.bnd
create mode 100644
src/main/java/org/apache/sling/resourceresolver/impl/mapping/ResourceMapperImpl.java
create mode 100644
src/test/java/org/apache/sling/resourceresolver/impl/mapping/InMemoryResource.java
create mode 100644
src/test/java/org/apache/sling/resourceresolver/impl/mapping/InMemoryResourceProvider.java
create mode 100644
src/test/java/org/apache/sling/resourceresolver/impl/mapping/ResourceMapperImplTest.java
