This is an automated email from the ASF dual-hosted git repository. andysch pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
commit dc56b450ecd4bb0529cc593b0ea02cf531ebe4f0 Merge: 4f48dee 3301e49 Author: Andreas Schaefer <[email protected]> AuthorDate: Tue Jan 28 14:43:53 2020 -0800 Merge pull request #15 from apache/feature/SLING-7768 Feature/sling 7768: String Interpolation for ETC Map README.md | 70 +++++ .../impl/CommonResourceResolverFactoryImpl.java | 2 +- .../impl/ResourceResolverFactoryActivator.java | 9 + .../impl/mapping/Interpolator.java | 157 ++++++++++ .../resourceresolver/impl/mapping/MapEntries.java | 26 +- .../impl/mapping/StringInterpolationProvider.java | 39 +++ .../StringInterpolationProviderConfiguration.java | 37 +++ .../mapping/StringInterpolationProviderImpl.java | 130 ++++++++ .../impl/EtcMappingResourceResolverTest.java | 48 ++- .../impl/MockedResourceResolverImplTest.java | 14 +- .../mapping/AbstractMappingMapEntriesTest.java | 9 +- .../impl/mapping/EtcMappingMapEntriesTest.java | 156 +++++++++- .../impl/mapping/InterpolatorTest.java | 90 ++++++ .../impl/mapping/MapEntriesTest.java | 8 +- .../impl/mapping/ResourceMapperImplTest.java | 3 +- .../mapping/StringInterpolationMapEntriesTest.java | 56 ++++ .../StringInterpolationProviderImplTest.java | 344 +++++++++++++++++++++ .../sling/resourceresolver/util/MockTestUtil.java | 20 ++ 18 files changed, 1184 insertions(+), 34 deletions(-)
