This is an automated email from the ASF dual-hosted git repository. sseifert pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-impl.git
from 6d87c0a SLING-12147 Replace Sling XSS with OWASP Encoder new 9c31071 SLING-12361 Update to Parent 60, Java 11 Minimum Version new 91dd7cb SLING-12361 apply spotless code formatting 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: .sling-module.json | 5 + pom.xml | 89 +-- .../impl/ConfigurationBindingsValueProvider.java | 37 +- .../impl/ConfigurationBuilderAdapterFactory.java | 11 +- .../caconfig/impl/ConfigurationBuilderImpl.java | 187 ++++--- ...gurationInheritanceStrategyMultiplexerImpl.java | 35 +- ...ctResourceDetectionStrategyMultiplexerImpl.java | 32 +- .../caconfig/impl/ConfigurationNameConstants.java | 1 - .../sling/caconfig/impl/ConfigurationProxy.java | 32 +- .../caconfig/impl/ConfigurationResolverImpl.java | 44 +- .../impl/ConfigurationResourceWrapper.java | 13 +- .../impl/def/ConfigurationDefNameConstants.java | 1 - .../DefaultConfigurationInheritanceStrategy.java | 42 +- ...nfigurationInjectResourceDetectionStrategy.java | 4 +- .../DefaultConfigurationPersistenceStrategy.java | 46 +- ...notationClassConfigurationMetadataProvider.java | 17 +- .../impl/metadata/AnnotationClassParser.java | 58 +- .../impl/metadata/BundleConfigurationMapping.java | 33 +- .../ConfigClassBundleTackerCustomizer.java | 7 +- .../impl/metadata/ConfigurationMapping.java | 1 - ...nfigurationMetadataProviderMultiplexerImpl.java | 26 +- .../ConfigurationOverrideMultiplexerImpl.java | 48 +- .../OsgiConfigurationOverrideProvider.java | 25 +- .../sling/caconfig/impl/override/OverrideItem.java | 9 +- .../impl/override/OverrideStringParser.java | 81 +-- ...ystemPropertyConfigurationOverrideProvider.java | 14 +- .../management/ConfigurationCollectionData.java | 13 +- .../caconfig/management/ConfigurationData.java | 22 +- .../ConfigurationManagementSettings.java | 1 - .../caconfig/management/ConfigurationManager.java | 27 +- .../ConfigurationResourceResolverConfig.java | 4 +- .../sling/caconfig/management/ValueInfo.java | 16 +- .../impl/ConfigurationCollectionDataImpl.java | 18 +- .../management/impl/ConfigurationDataImpl.java | 110 ++-- .../impl/ConfigurationManagementSettingsImpl.java | 51 +- .../management/impl/ConfigurationManagerImpl.java | 309 +++++++---- .../ConfigurationPersistenceStrategyBridge.java | 53 +- ...gurationPersistenceStrategyMultiplexerImpl.java | 34 +- .../impl/ContextPathStrategyMultiplexerImpl.java | 30 +- .../management/impl/PropertiesFilterUtil.java | 3 +- .../caconfig/management/impl/ValueInfoImpl.java | 43 +- .../impl/console/CAConfigInventoryPrinter.java | 63 ++- .../impl/console/ConfigurationMetadataPrinter.java | 11 +- .../impl/console/ConfigurationOverridePrinter.java | 6 +- .../ConfigurationPersistenceStrategyPrinter.java | 11 +- .../console/ConfigurationWebConsolePlugin.java | 82 +-- .../impl/console/ServiceConfigurationPrinter.java | 1 - ...InjectResourceDetectionStrategyMultiplexer.java | 3 +- .../ConfigurationOverrideMultiplexer.java | 15 +- ...onfigurationPersistenceStrategyMultiplexer.java | 10 +- .../impl/ConfigurationResourceResolverImpl.java | 16 +- ...onResourceResolvingStrategyMultiplexerImpl.java | 48 +- .../def/ConfigurationResourceNameConstants.java | 1 - ...aultConfigurationResourceResolvingStrategy.java | 239 ++++---- .../impl/def/DefaultContextPathStrategy.java | 45 +- .../resource/impl/util/ConfigNameUtil.java | 1 - .../sling/caconfig/resource/impl/util/MapUtil.java | 12 +- .../impl/util/PathEliminateDuplicatesIterator.java | 2 - .../impl/util/PathParentExpandIterator.java | 1 - .../caconfig/resource/impl/util/PropertyUtil.java | 10 +- .../util/ResourceEliminateDuplicatesIterator.java | 5 +- .../impl/util/ResourcePathCollatingIterator.java | 6 +- .../sling/caconfig/example/AllTypesConfig.java | 15 +- .../sling/caconfig/example/AllTypesDefaults.java | 1 - .../sling/caconfig/example/IllegalTypesConfig.java | 1 - .../apache/sling/caconfig/example/ListConfig.java | 1 - .../caconfig/example/ListDoubleNestedConfig.java | 1 - .../sling/caconfig/example/ListNestedConfig.java | 1 - .../caconfig/example/MetadataSimpleConfig.java | 13 +- .../sling/caconfig/example/NestedConfig.java | 1 - .../sling/caconfig/example/SimpleConfig.java | 1 - .../sling/caconfig/example/SimpleSlingModel.java | 7 +- .../sling/caconfig/example/SpecialNamesConfig.java | 1 - .../caconfig/example/WithoutAnnotationConfig.java | 1 - .../ConfigurationBindingsValueProviderTest.java | 49 +- .../ConfigurationBuilderAdapterFactoryTest.java | 20 +- ...tionInheritanceStrategyMultiplexerImplTest.java | 31 +- ...sourceDetectionStrategyMultiplexerImplTest.java | 34 +- ...igurationProxyCachingInvocationHandlerTest.java | 14 +- .../caconfig/impl/ConfigurationProxyTest.java | 133 +++-- .../impl/ConfigurationResolverAdaptableTest.java | 87 +-- .../ConfigurationResolverAnnotationClassTest.java | 232 +++++--- ...onfigurationResolverCustomPersistence2Test.java | 165 +++--- ...onfigurationResolverCustomPersistence3Test.java | 163 +++--- ...ConfigurationResolverCustomPersistenceTest.java | 163 +++--- .../impl/ConfigurationResolverValueMapTest.java | 149 ++--- .../caconfig/impl/ConfigurationTestUtils.java | 4 +- .../impl/DummyConfigurationMetadataProvider.java | 9 +- ...nfigurationResolverPropertyInheritanceTest.java | 285 ++++++---- ...efaultConfigurationInheritanceStrategyTest.java | 92 +++- ...urationInjectResourceDetectionStrategyTest.java | 13 +- ...efaultConfigurationPersistenceStrategyTest.java | 136 +++-- ...tionClassConfigurationMetadataProviderTest.java | 50 +- .../impl/metadata/AnnotationClassParserTest.java | 46 +- .../caconfig/impl/metadata/BundleEventUtil.java | 21 +- ...urationMetadataProviderMultiplexerImplTest.java | 15 +- .../ConfigurationOverrideMultiplexerImplTest.java | 81 +-- .../DummyConfigurationOverrideProvider.java | 4 +- .../OsgiConfigurationOverrideProviderTest.java | 19 +- .../caconfig/impl/override/OverrideItemTest.java | 14 +- .../impl/override/OverrideStringParserTest.java | 51 +- ...mPropertyConfigurationOverrideProviderTest.java | 13 +- .../impl/ConfigurationCollectionDataImplTest.java | 31 +- .../management/impl/ConfigurationDataImplTest.java | 118 ++-- .../ConfigurationManagementSettingsImplTest.java | 35 +- ...igurationManagerImplCustomPersistence2Test.java | 31 +- ...igurationManagerImplCustomPersistence3Test.java | 31 +- ...figurationManagerImplCustomPersistenceTest.java | 10 +- .../ConfigurationManagerImplNoDefaultTest.java | 71 ++- .../impl/ConfigurationManagerImplTest.java | 610 ++++++++++++++------- ...tionPersistenceStrategyMultiplexerImplTest.java | 257 +++++---- .../ContextPathStrategyMultiplexerImplTest.java | 53 +- .../CustomConfigurationPersistenceStrategy.java | 39 +- .../CustomConfigurationPersistenceStrategy2.java | 63 ++- .../CustomConfigurationPersistenceStrategy3.java | 45 +- .../impl/console/CAConfigInventoryPrinterTest.java | 27 +- .../ConfigurationResourceResolverImplTest.java | 60 +- ...sourceResolvingStrategyMultiplexerImplTest.java | 282 ++++++---- .../impl/ConfigurationResourceTestUtils.java | 4 +- ...tionResourceResolvingStrategyHierarchyTest.java | 306 +++++++---- ...ConfigurationResourceResolvingStrategyTest.java | 240 ++++---- .../impl/def/DefaultContextPathStrategyTest.java | 91 ++- .../resource/impl/util/ConfigNameUtilTest.java | 19 +- .../impl/util/ContextResourceTestUtil.java | 7 +- .../caconfig/resource/impl/util/MapUtilTest.java | 33 +- .../util/PathEliminateDuplicatesIteratorTest.java | 17 +- .../impl/util/PathParentExpandIteratorTest.java | 31 +- .../ResourceEliminateDuplicatesIteratorTest.java | 20 +- .../util/ResourcePathCollatingIteratorTest.java | 76 ++- 129 files changed, 4053 insertions(+), 2911 deletions(-) create mode 100644 .sling-module.json