You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by an...@apache.org on 2020/01/28 22:44:01 UTC
[sling-org-apache-sling-resourceresolver] branch master updated
(4f48dee -> dc56b45)
This is an automated email from the ASF dual-hosted git repository.
andysch pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git.
from 4f48dee SLING-8946 implement consistent shadowing of observation
add 028427b Initial development of the etc-map placeholder provider
add 92bd020 Fix minor type
add 511d33d Rename the PlaceHolderProvider to StringInterpolationProvider and created a test suite to test the String Interpolation Provider with Map Entries
add 7e03737 Adding Resource Resolver based path resolution tests and revamping some of the unit tests to consolidate them
add f3b9a00 SLING-7768: Added /etc/map tests to the resource resolver and extracted some common test code into MockTestUtil class
add f4aae98 SLING-7768 Added the String Interpolation tests to the EtcMappingResourceResolverTest to make sure the Sling Interpolation works with Resource Resolving
add 903cbd8 Merge branch 'master' into feature/SLING-7768
add bdc07c8 Migrated the Sling Interplation to Lang3 StrSubtitutor, adjusted the tests and fixed some merge problems
add 323b7d8 SLING-7768 - Fixed all the issues reported by SonarCube and improved code coverage
add 96ebac4 SLING-7768 - Some more adjustments for SonarCube review
add 9b5bc80 Merge branch 'master' into feature/SLING-7768
add 980943d Replaced the StrSubstitutor with the Interpolator from Felix and adjsuted the StringInterpolationProviderImpl to make it work
add 4e7c2ef Changes requested by Carsten’s Code Review or PR 15
add 81e2bc9 Added Interpolator tests for additional jacoco test coverage requested by Betrand
add 3301e49 Fixed two code smells. Ignored the ones of the Interpolator as this is not my code
new dc56b45 Merge pull request #15 from apache/feature/SLING-7768
The 1 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:
README.md | 70 +++++
.../impl/CommonResourceResolverFactoryImpl.java | 2 +-
.../impl/ResourceResolverFactoryActivator.java | 9 +
.../impl/mapping/Interpolator.java | 157 ++++++++++
.../resourceresolver/impl/mapping/MapEntries.java | 26 +-
.../StringInterpolationProvider.java} | 23 +-
.../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, 1162 insertions(+), 40 deletions(-)
create mode 100755 src/main/java/org/apache/sling/resourceresolver/impl/mapping/Interpolator.java
copy src/main/java/org/apache/sling/resourceresolver/impl/{providers/ResourceProviderStorageProvider.java => mapping/StringInterpolationProvider.java} (54%)
create mode 100644 src/main/java/org/apache/sling/resourceresolver/impl/mapping/StringInterpolationProviderConfiguration.java
create mode 100644 src/main/java/org/apache/sling/resourceresolver/impl/mapping/StringInterpolationProviderImpl.java
create mode 100644 src/test/java/org/apache/sling/resourceresolver/impl/mapping/InterpolatorTest.java
create mode 100644 src/test/java/org/apache/sling/resourceresolver/impl/mapping/StringInterpolationMapEntriesTest.java
create mode 100644 src/test/java/org/apache/sling/resourceresolver/impl/mapping/StringInterpolationProviderImplTest.java
[sling-org-apache-sling-resourceresolver] 01/01: Merge pull request
#15 from apache/feature/SLING-7768
Posted by an...@apache.org.
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 <sc...@me.com>
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(-)