This is an automated email from the ASF dual-hosted git repository.
enorman pushed a change to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git
from 0d0b3e5 SLING-12866 - Restrict force pushes, auto-delete branches on
merge
add 3aead79 SLING-12875 - migrate to Sling API 3.x and Jakarta Servlet
(#67)
No new revisions were added by this update.
Summary of changes:
bnd.bnd | 2 +-
pom.xml | 27 +-
.../sling/models/impl/AdapterImplementations.java | 20 +-
.../apache/sling/models/impl/ExportServlet.java | 34 ++-
.../sling/models/impl/ModelAdapterFactory.java | 176 ++++++++---
.../models/impl/ModelConfigurationPrinter.java | 3 +-
.../models/impl/ModelPackageBundleListener.java | 9 +-
...> ResourceOverridingJakartaRequestWrapper.java} | 18 +-
.../impl/ResourceOverridingRequestWrapper.java | 2 +
.../impl/ResourceTypeBasedResourcePicker.java | 13 +-
.../impl/SlingModelsScriptEngineFactory.java | 5 +-
.../models/impl/injectors/AbstractInjector.java | 52 ++--
.../models/impl/injectors/BindingsInjector.java | 14 +-
.../impl/injectors/ChildResourceInjector.java | 10 +-
.../impl/injectors/RequestAttributeInjector.java | 11 +-
.../models/impl/injectors/SlingObjectInjector.java | 72 +++--
.../impl/via/AbstractResourceTypeViaProvider.java | 20 +-
.../models/impl/via/ChildResourceViaProvider.java | 47 ++-
.../impl/via/OriginalResourceTypeViaProvider.java | 27 +-
... ResourceTypeForcingJakartaRequestWrapper.java} | 9 +-
.../via/ResourceTypeForcingRequestWrapper.java | 4 +
.../sling/models/impl/AdapterFactoryTest.java | 10 +-
.../models/impl/AdapterImplementationsTest.java | 55 +++-
.../org/apache/sling/models/impl/CachingTest.java | 10 +-
.../apache/sling/models/impl/ConstructorTest.java | 4 +-
.../models/impl/ConstructorVisibilityTest.java | 4 +-
.../impl/InjectorSpecificAnnotationTest.java | 4 +-
.../sling/models/impl/InvalidAdaptationsTest.java | 4 +-
.../sling/models/impl/ModelAdapterFactoryTest.java | 335 +++++++++++++++++++++
...apterFactory_ImplementationPickerOrderTest.java | 8 +-
.../ModelAdapterFactory_InjectorOrderTest.java | 6 +-
.../sling/models/impl/MultipleInjectorTest.java | 10 +-
.../sling/models/impl/OptionalObjectsTest.java | 4 +-
.../ParameterizedTypeFromRequestAttributeTest.java | 6 +-
.../sling/models/impl/RequestDisposalTest.java | 30 +-
.../sling/models/impl/RequestInjectionTest.java | 4 +-
.../sling/models/impl/RequestWrapperTest.java | 12 +-
...esourceOverridingJakartaRequestWrapperTest.java | 102 +++++++
.../impl/ResourceOverridingRequestWrapperTest.java | 103 +++++++
.../models/impl/ResourcePathInjectionTest.java | 4 +-
.../sling/models/impl/SelfDependencyTest.java | 4 +-
.../impl/StaticInjectionAPFLoadOrderTest.java | 6 +-
.../java/org/apache/sling/models/impl/ViaTest.java | 8 +-
.../impl/injectors/ResourcePathInjectorTest.java | 85 ++++++
.../injectors/ResourceResolverInjectorTest.java | 36 ++-
.../models/impl/injectors/SelfInjectorTest.java | 134 +++++++--
.../injectors/SlingObjectInjectorRequestTest.java | 76 ++++-
.../SlingObjectInjectorResourceResolverTest.java | 41 ++-
.../injectors/SlingObjectInjectorResourceTest.java | 41 ++-
.../impl/injectors/ValueMapInjectorTest.java | 36 ++-
.../via/AbstractResourceTypeViaProviderTest.java | 102 +++++++
.../impl/via/BeanPropertyViaProviderTest.java | 95 ++++++
.../impl/via/ChildResourceViaProviderTest.java | 59 +++-
...java => ForcedResourceTypeViaProviderTest.java} | 47 +--
.../via/OriginalResourceTypeViaProviderTest.java | 53 +++-
.../impl/via/ResourceSuperTypeViaProviderTest.java | 71 +++++
...ourceTypeForcingJakartaRequestWrapperTest.java} | 49 ++-
... => ResourceTypeForcingRequestWrapperTest.java} | 48 ++-
.../models/testmodels/classes/BindingsModel.java | 4 +-
.../models/testmodels/classes/CachedModel.java | 4 +-
.../classes/CachedModelWithAdapterTypes12.java | 4 +-
.../classes/CachedModelWithAdapterTypes23.java | 4 +-
.../classes/CachedModelWithSelfReference.java | 6 +-
.../classes/DirectCyclicSelfDependencyModel.java | 4 +-
.../IndirectCyclicSelfDependencyModelA.java | 4 +-
.../IndirectCyclicSelfDependencyModelB.java | 4 +-
.../classes/InjectorSpecificAnnotationModel.java | 4 +-
.../classes/InvalidConstructorModel.java | 6 +-
.../testmodels/classes/OptionalObjectsModel.java | 4 +-
.../testmodels/classes/RequestOSGiModel.java | 4 +-
.../classes/ResourcePathAllOptionalModel.java | 4 +-
.../testmodels/classes/ResourcePathModel.java | 4 +-
.../classes/ResourcePathModelWrapping.java | 4 +-
.../classes/ResourcePathPartialModel.java | 4 +-
.../testmodels/classes/SelfDependencyModelA.java | 4 +-
.../testmodels/classes/SelfDependencyModelB.java | 8 +-
.../classes/SuperclassConstructorModel.java | 6 +-
.../models/testmodels/classes/UncachedModel.java | 4 +-
.../sling/models/testmodels/classes/ViaModel.java | 4 +-
.../classes/WithOneConstructorModel.java | 10 +-
.../classes/WithThreeConstructorsModel.java | 19 +-
.../classes/WithTwoConstructorsModel.java | 10 +-
.../constructorinjection/BindingsModel.java | 4 +-
.../InjectorSpecificAnnotationModel.java | 4 +-
.../classes/constructorinjection/NoNameModel.java | 4 +-
.../ViaRequestSuffixModel.java | 4 +-
.../WithThreeConstructorsOneInjectModel.java | 10 +-
.../PackagePrivateConstructorModel.java | 4 +-
.../PrivateConstructorModel.java | 4 +-
.../ProtectedConstructorModel.java | 4 +-
.../models/testmodels/interfaces/CachedModel.java | 4 +-
.../testmodels/interfaces/UncachedModel.java | 4 +-
92 files changed, 1957 insertions(+), 503 deletions(-)
copy
src/main/java/org/apache/sling/models/impl/{ResourceOverridingRequestWrapper.java
=> ResourceOverridingJakartaRequestWrapper.java} (83%)
copy
src/main/java/org/apache/sling/models/impl/via/{ResourceTypeForcingRequestWrapper.java
=> ResourceTypeForcingJakartaRequestWrapper.java} (75%)
create mode 100644
src/test/java/org/apache/sling/models/impl/ModelAdapterFactoryTest.java
create mode 100644
src/test/java/org/apache/sling/models/impl/ResourceOverridingJakartaRequestWrapperTest.java
create mode 100644
src/test/java/org/apache/sling/models/impl/ResourceOverridingRequestWrapperTest.java
create mode 100644
src/test/java/org/apache/sling/models/impl/injectors/ResourcePathInjectorTest.java
create mode 100644
src/test/java/org/apache/sling/models/impl/via/AbstractResourceTypeViaProviderTest.java
create mode 100644
src/test/java/org/apache/sling/models/impl/via/BeanPropertyViaProviderTest.java
copy
src/test/java/org/apache/sling/models/impl/via/{ChildResourceViaProviderTest.java
=> ForcedResourceTypeViaProviderTest.java} (52%)
create mode 100644
src/test/java/org/apache/sling/models/impl/via/ResourceSuperTypeViaProviderTest.java
copy
src/test/java/org/apache/sling/models/impl/via/{ChildResourceViaProviderTest.java
=> ResourceTypeForcingJakartaRequestWrapperTest.java} (50%)
copy
src/test/java/org/apache/sling/models/impl/via/{ChildResourceViaProviderTest.java
=> ResourceTypeForcingRequestWrapperTest.java} (53%)
