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-testing-sling-mock.git
from 4ff35ad SLING-12265 - Improve node type registration in JCR_OAK (#37) new bf72c05 SLING-12284 Update to Parent 60, Java 11 Minimum Version new 74c1f1e SLING-12284 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 + core/pom.xml | 14 +- .../testing/mock/sling/MockAdapterManagerImpl.java | 127 ++--- .../mock/sling/MockDynamicClassLoaderManager.java | 1 - .../mock/sling/MockJcrResourceResolverAdapter.java | 1 - .../testing/mock/sling/MockJcrSlingRepository.java | 9 +- .../sling/MockNoneResourceResolverAdapter.java | 1 - .../testing/mock/sling/MockResourceBundle.java | 3 +- .../mock/sling/MockResourceBundleProvider.java | 4 +- .../apache/sling/testing/mock/sling/MockSling.java | 65 ++- .../testing/mock/sling/MockSlingScriptHelper.java | 12 +- .../sling/testing/mock/sling/MockXSSFilter.java | 1 - .../mock/sling/NodeTypeDefinitionScanner.java | 294 +++++++----- .../sling/testing/mock/sling/NodeTypeMode.java | 1 - .../sling/RPMockMockResourceResolverAdapter.java | 1 - .../sling/RRMockMockResourceResolverAdapter.java | 1 - .../sling/ResourceResolverFactoryInitializer.java | 114 +++-- .../testing/mock/sling/ResourceResolverType.java | 18 +- .../sling/ThreadsafeMockAdapterManagerWrapper.java | 25 +- .../testing/mock/sling/builder/ContentBuilder.java | 26 +- .../mock/sling/builder/ImmutableValueMap.java | 36 +- .../context/ContextResourceResolverFactory.java | 8 +- .../mock/sling/context/MockSlingBindings.java | 10 +- .../sling/context/ModelAdapterFactoryUtil.java | 30 +- .../mock/sling/context/SlingContextImpl.java | 92 ++-- .../testing/mock/sling/context/UniqueRoot.java | 18 +- .../testing/mock/sling/loader/ContentLoader.java | 192 +++++--- .../mock/sling/loader/LoaderContentHandler.java | 26 +- .../mock/sling/services/MockMimeTypeService.java | 60 +-- .../sling/services/MockSlingSettingService.java | 1 - .../mock/sling/servlet/MockHttpSession.java | 1 - .../mock/sling/servlet/MockRequestPathInfo.java | 1 - .../sling/servlet/MockSlingHttpServletRequest.java | 9 +- .../sling/spi/ResourceResolverTypeAdapter.java | 7 +- .../mock/sling/MockJcrSlingRepositoryTest.java | 5 +- .../mock/sling/MockResourceBundleProviderTest.java | 20 +- .../testing/mock/sling/MockResourceBundleTest.java | 11 +- .../mock/sling/MockSlingScriptHelperTest.java | 11 +- .../mock/sling/NodeTypeDefinitionScannerTest.java | 21 +- .../sling/testing/mock/sling/XSSAPIImplTest.java | 35 +- .../mock/sling/builder/ContentBuilderTest.java | 26 +- .../mock/sling/builder/ImmutableValueMapTest.java | 39 +- .../AbstractModelAdapterFactoryUtilTest.java | 9 +- .../context/AbstractSlingContextImplTest.java | 20 +- .../mock/sling/context/FeatureFlagsTest.java | 15 +- .../ModelAdapterFactoryUtilClassesTest.java | 13 +- .../ModelAdapterFactoryUtilPackagesTest.java | 5 +- .../sling/context/NoResourceResolverTypeTest.java | 8 +- .../context/NoSlingModelsRegistrationTest.java | 10 +- .../mock/sling/context/SlingBindingsTest.java | 29 +- .../sling/context/models/OsgiServiceModel.java | 1 - .../context/models/RequestAttributeModel.java | 1 - .../mock/sling/context/models/ResourceModel.java | 3 +- .../sling/context/models/ServiceInterface.java | 1 - .../sling/context/models/ServiceInterfaceImpl.java | 1 - .../sling/context/models/SlingBindingsModel.java | 1 - .../modelsautoreg/ClasspathRegisteredModel.java | 1 - .../jcrmock/context/SlingContextImplTest.java | 1 - .../loader/ContentLoaderAutoCommitTest.java | 3 +- .../jcrmock/loader/ContentLoaderBinaryTest.java | 1 - .../loader/ContentLoaderFileVaultXmlTest.java | 1 - .../ContentLoaderFolderFileVaultXmlTest.java | 1 - .../loader/ContentLoaderFolderJsonTest.java | 1 - .../jcrmock/loader/ContentLoaderJsonDamTest.java | 1 - .../jcrmock/loader/ContentLoaderJsonTest.java | 1 - .../sling/jcrmock/resource/FindResourcesTest.java | 52 +- .../sling/jcrmock/resource/JcrNamespaceTest.java | 1 - .../jcrmock/resource/JcrResourceResolverTest.java | 1 - .../resource/MultipleResourceResolverTest.java | 1 - .../resource/SlingCrudResourceResolverTest.java | 1 - .../sling/jcrmock/resource/UniqueRootTest.java | 1 - .../testing/mock/sling/junit/SlingContext.java | 17 +- .../mock/sling/junit/SlingContextBuilder.java | 27 +- .../AbstractContentLoaderAutoCommitTest.java | 10 +- .../loader/AbstractContentLoaderBinaryTest.java | 11 +- .../AbstractContentLoaderFileVaultXmlTest.java | 27 +- ...bstractContentLoaderFolderFileVaultXmlTest.java | 14 +- .../AbstractContentLoaderFolderJsonTest.java | 26 +- .../loader/AbstractContentLoaderJsonDamTest.java | 35 +- .../loader/AbstractContentLoaderJsonTest.java | 37 +- .../sling/resource/AbstractJcrNamespaceTest.java | 11 +- .../resource/AbstractJcrResourceResolverTest.java | 68 ++- .../AbstractMultipleResourceResolverTest.java | 21 +- .../AbstractSlingCrudResourceResolverTest.java | 110 +++-- .../sling/resource/AbstractUniqueRootTest.java | 7 +- .../sling/rpmock/context/SlingContextImplTest.java | 1 - .../rpmock/loader/ContentLoaderBinaryTest.java | 1 - .../loader/ContentLoaderFileVaultXmlTest.java | 1 - .../ContentLoaderFolderFileVaultXmlTest.java | 1 - .../rpmock/loader/ContentLoaderFolderJsonTest.java | 1 - .../rpmock/loader/ContentLoaderJsonDamTest.java | 1 - .../sling/rpmock/loader/ContentLoaderJsonTest.java | 1 - .../resource/MultipleResourceResolverTest.java | 1 - .../resource/SlingCrudResourceResolverTest.java | 12 +- .../mock/sling/rpmock/resource/UniqueRootTest.java | 1 - .../sling/rrmock/context/SlingContextImplTest.java | 1 - .../rrmock/loader/ContentLoaderBinaryTest.java | 1 - .../loader/ContentLoaderFileVaultXmlTest.java | 1 - .../rrmock/loader/ContentLoaderJsonDamTest.java | 1 - .../sling/rrmock/loader/ContentLoaderJsonTest.java | 1 - .../resource/MultipleResourceResolverTest.java | 1 - .../resource/SlingCrudResourceResolverTest.java | 12 +- .../mock/sling/rrmock/resource/UniqueRootTest.java | 1 - .../sling/services/MockMimeTypeServiceTest.java | 5 +- .../services/MockSlingSettingServiceTest.java | 9 +- .../mock/sling/servlet/MockHttpSessionTest.java | 7 +- .../servlet/MockSlingHttpServletRequestTest.java | 29 +- .../servlet/MockSlingHttpServletResponseTest.java | 5 +- junit4/pom.xml | 8 +- .../testing/mock/sling/junit/SlingContext.java | 17 +- .../mock/sling/junit/SlingContextBuilder.java | 27 +- .../testing/mock/sling/junit/SlingContextTest.java | 90 ++-- junit5/pom.xml | 38 +- .../testing/mock/sling/junit5/SlingContext.java | 6 +- .../mock/sling/junit5/SlingContextBuilder.java | 20 +- .../mock/sling/junit5/SlingContextExtension.java | 20 +- .../mock/sling/junit5/SlingContextStore.java | 4 +- .../junit5/NoSlingModelsRegistrationTest.java | 10 +- .../junit5/SlingContextMemberInstantiatedTest.java | 7 +- .../junit5/SlingContextMemberSuperClassTest.java | 5 +- .../mock/sling/junit5/SlingContextMemberTest.java | 5 +- .../mock/sling/junit5/SlingContextPluginTest.java | 28 +- .../mock/sling/junit5/SlingContextTest.java | 5 +- parent/pom.xml | 528 ++++++++++----------- pom.xml | 18 +- relocate/pom.xml | 4 +- 126 files changed, 1559 insertions(+), 1364 deletions(-) create mode 100644 .sling-module.json