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-models-impl.git
from 9d1c725 SLING-12359 - Extend records support (#51) new cc4ac50 SLING-12360 Update to Parent 60, Java 11 Minimum Version new fcb45ad SLING-12360 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 | 117 +++--- .../sling/models/impl/AdapterImplementations.java | 162 ++++---- .../apache/sling/models/impl/ExportServlet.java | 71 ++-- .../models/impl/FirstImplementationPicker.java | 8 +- .../models/impl/MapBackedInvocationHandler.java | 3 +- .../sling/models/impl/ModelAdapterFactory.java | 426 +++++++++++++-------- .../impl/ModelAdapterFactoryConfiguration.java | 33 +- .../models/impl/ModelConfigurationPrinter.java | 77 ++-- .../models/impl/ModelPackageBundleListener.java | 107 ++++-- .../apache/sling/models/impl/ReflectionUtil.java | 14 +- .../impl/ResourceOverridingRequestWrapper.java | 54 +-- .../impl/ResourceTypeBasedResourcePicker.java | 32 +- .../java/org/apache/sling/models/impl/Result.java | 16 +- .../impl/SlingModelsScriptEngineFactory.java | 51 +-- .../sling/models/impl/ThreadInvocationCounter.java | 2 +- .../models/impl/injectors/AbstractInjector.java | 6 +- .../models/impl/injectors/BindingsInjector.java | 41 +- .../impl/injectors/ChildResourceInjector.java | 72 ++-- .../models/impl/injectors/OSGiServiceInjector.java | 97 +++-- .../impl/injectors/RequestAttributeInjector.java | 44 ++- .../impl/injectors/ResourcePathInjector.java | 35 +- .../sling/models/impl/injectors/SelfInjector.java | 47 ++- .../models/impl/injectors/SlingObjectInjector.java | 47 ++- .../models/impl/injectors/ValueMapInjector.java | 50 ++- .../impl/model/AbstractInjectableElement.java | 80 ++-- .../models/impl/model/ConstructorParameter.java | 23 +- .../sling/models/impl/model/InjectableElement.java | 1 - .../sling/models/impl/model/InjectableField.java | 16 +- .../sling/models/impl/model/InjectableMethod.java | 15 +- .../apache/sling/models/impl/model/ModelClass.java | 37 +- .../models/impl/model/ModelClassConstructor.java | 32 +- .../impl/model/OptionalTypedInjectableElement.java | 29 +- .../impl/model/ParameterCountInjectComparator.java | 18 +- .../impl/via/AbstractResourceTypeViaProvider.java | 39 +- .../models/impl/via/BeanPropertyViaProvider.java | 28 +- .../models/impl/via/ChildResourceViaProvider.java | 32 +- .../impl/via/ForcedResourceTypeViaProvider.java | 28 +- .../impl/via/OriginalResourceTypeViaProvider.java | 26 +- .../impl/via/ResourceSuperTypeViaProvider.java | 28 +- .../via/ResourceTypeForcingRequestWrapper.java | 26 +- .../via/ResourceTypeForcingResourceWrapper.java | 26 +- .../sling/models/impl/AdapterFactoryTest.java | 61 +-- .../models/impl/AdapterImplementationsTest.java | 65 ++-- .../sling/models/impl/AnnotationConflictsTest.java | 34 +- .../org/apache/sling/models/impl/CachingTest.java | 108 +++--- .../apache/sling/models/impl/ConstructorTest.java | 49 +-- .../models/impl/ConstructorVisibilityTest.java | 37 +- .../sling/models/impl/CustomInjectorTest.java | 41 +- .../models/impl/DefaultInterfaceMethodTest.java | 34 +- .../org/apache/sling/models/impl/DefaultTest.java | 95 +++-- .../sling/models/impl/ExtraDefaultTests.java | 53 +-- .../sling/models/impl/ImplementsExtendsTest.java | 89 +++-- .../impl/InjectorSpecificAnnotationTest.java | 128 ++++--- .../models/impl/InterfaceInheritanceTest.java | 39 +- .../sling/models/impl/InvalidAdaptationsTest.java | 49 ++- .../impl/ModelPackageBundleListenerTest.java | 61 +-- .../sling/models/impl/MultipleInjectorTest.java | 44 +-- .../sling/models/impl/OSGiInjectionTest.java | 114 +++--- .../sling/models/impl/OptionalObjectsTest.java | 72 ++-- .../sling/models/impl/OptionalPrimitivesTest.java | 64 ++-- .../ParameterizedTypeFromRequestAttributeTest.java | 12 +- .../sling/models/impl/PostConstructTest.java | 57 +-- .../sling/models/impl/ReflectionUtilTest.java | 41 +- .../sling/models/impl/RequestDisposalTest.java | 81 ++-- .../sling/models/impl/RequestInjectionTest.java | 47 +-- .../sling/models/impl/RequestWrapperTest.java | 59 +-- .../models/impl/ResourceModelClassesTest.java | 104 ++--- .../models/impl/ResourceModelConstructorTest.java | 48 ++- .../models/impl/ResourceModelInterfacesTest.java | 70 ++-- .../models/impl/ResourcePathInjectionTest.java | 61 +-- .../sling/models/impl/SelfDependencyTest.java | 50 +-- .../sling/models/impl/ServicePropertiesMap.java | 29 +- .../impl/StaticInjectionAPFLoadOrderTest.java | 48 ++- .../java/org/apache/sling/models/impl/ViaTest.java | 39 +- .../implpicker/FirstImplementationPickerTest.java | 11 +- .../models/impl/injector/CustomAnnotation.java | 38 +- .../impl/injector/CustomAnnotationInjector.java | 33 +- .../sling/models/impl/injector/SimpleInjector.java | 33 +- .../impl/injectors/BindingsInjectorTest.java | 12 +- .../injectors/RequestAttributeInjectorTest.java | 16 +- .../injectors/ResourceResolverInjectorTest.java | 10 +- .../models/impl/injectors/SelfInjectorTest.java | 102 +++-- .../injectors/SlingObjectInjectorRequestTest.java | 32 +- .../SlingObjectInjectorResourceResolverTest.java | 29 +- .../injectors/SlingObjectInjectorResourceTest.java | 25 +- .../impl/injectors/ValueMapInjectorTest.java | 9 +- .../impl/via/ChildResourceViaProviderTest.java | 31 +- .../via/OriginalResourceTypeViaProviderTest.java | 26 +- .../models/testmodels/classes/ArrayOSGiModel.java | 31 +- .../testmodels/classes/ArrayPrimitivesModel.java | 32 +- .../testmodels/classes/ArrayWrappersModel.java | 32 +- .../models/testmodels/classes/BindingsModel.java | 33 +- .../models/testmodels/classes/CachedModel.java | 30 +- .../classes/CachedModelWithAdapterTypes12.java | 38 +- .../classes/CachedModelWithAdapterTypes23.java | 38 +- .../classes/CachedModelWithSelfReference.java | 28 +- .../models/testmodels/classes/ChildModel.java | 28 +- .../testmodels/classes/ChildResourceModel.java | 37 +- .../testmodels/classes/ChildResourceViaModel.java | 31 +- .../testmodels/classes/ChildValueMapModel.java | 29 +- .../classes/CollectionDefaultsModel.java | 35 +- .../testmodels/classes/CollectionOSGiModel.java | 35 +- .../classes/ConstructorWithExceptionModel.java | 28 +- .../testmodels/classes/DefaultPrimitivesModel.java | 31 +- .../testmodels/classes/DefaultStringModel.java | 28 +- .../testmodels/classes/DefaultWrappersModel.java | 31 +- .../classes/DirectCyclicSelfDependencyModel.java | 3 +- .../classes/FailingPostConstructModel.java | 3 +- .../classes/FalsePostConstructModel.java | 7 +- .../IndirectCyclicSelfDependencyModelA.java | 3 +- .../IndirectCyclicSelfDependencyModelB.java | 3 +- .../classes/InjectorSpecificAnnotationModel.java | 27 +- .../classes/InvalidConstructorModel.java | 26 +- .../classes/InvalidModelWithMissingAnnotation.java | 33 +- .../testmodels/classes/ListDefaultsModel.java | 43 ++- .../sling/models/testmodels/classes/ListModel.java | 33 +- .../models/testmodels/classes/ListOSGiModel.java | 35 +- .../testmodels/classes/OptionalArrayOSGiModel.java | 34 +- .../testmodels/classes/OptionalListOSGiModel.java | 38 +- .../testmodels/classes/OptionalObjectsModel.java | 29 +- .../classes/OptionalPrimitivesModel.java | 75 ++-- .../models/testmodels/classes/ParentModel.java | 36 +- .../testmodels/classes/RequestOSGiModel.java | 31 +- .../classes/ResourceModelWithRequiredField.java | 27 +- ...urceModelWithRequiredFieldOptionalStrategy.java | 49 +-- .../classes/ResourcePathAllOptionalModel.java | 9 +- .../testmodels/classes/ResourcePathModel.java | 34 +- .../classes/ResourcePathModelWrapping.java | 3 +- .../classes/ResourcePathPartialModel.java | 22 +- .../testmodels/classes/SelfDependencyModelA.java | 3 +- .../testmodels/classes/SelfDependencyModelB.java | 3 +- .../models/testmodels/classes/SetOSGiModel.java | 35 +- .../SimpleModelWithInvalidSecondAnnotation.java | 30 +- .../models/testmodels/classes/SimpleOSGiModel.java | 31 +- .../testmodels/classes/SimplePropertyModel.java | 27 +- .../sling/models/testmodels/classes/SubClass.java | 30 +- .../classes/SubClassOverriddenPostConstruct.java | 32 +- .../models/testmodels/classes/SuperClass.java | 27 +- .../classes/SuperclassConstructorModel.java | 29 +- .../testmodels/classes/TruePostConstructModel.java | 7 +- .../models/testmodels/classes/UncachedModel.java | 27 +- .../sling/models/testmodels/classes/ViaModel.java | 27 +- .../classes/WithOneConstructorModel.java | 26 +- .../classes/WithThreeConstructorsModel.java | 33 +- .../classes/WithTwoConstructorsModel.java | 29 +- .../testmodels/classes/annotations/Hidden.java | 30 +- .../classes/annotations/OtherAnnotation.java | 26 +- .../constructorinjection/BindingsModel.java | 29 +- .../DefaultPrimitivesModel.java | 35 +- .../constructorinjection/DefaultStringModel.java | 31 +- .../constructorinjection/DefaultWrappersModel.java | 34 +- .../InjectorSpecificAnnotationModel.java | 32 +- .../constructorinjection/ListOSGiModel.java | 33 +- .../classes/constructorinjection/NoNameModel.java | 3 +- .../OptionalPrimitivesModel.java | 29 +- .../classes/constructorinjection/ParentModel.java | 8 +- .../constructorinjection/SimpleOSGiModel.java | 29 +- .../ViaRequestSuffixModel.java | 32 +- .../WithThreeConstructorsOneInjectModel.java | 31 +- .../PackagePrivateConstructorModel.java | 30 +- .../PrivateConstructorModel.java | 30 +- .../ProtectedConstructorModel.java | 30 +- .../implextend/EvenSimplerPropertyModel.java | 27 +- .../implextend/ExtendsClassPropertyModel.java | 35 +- .../ImplementsInterfacePropertyModel.java | 41 +- .../ImplementsInterfacePropertyModel2.java | 35 +- .../InvalidImplementsInterfacePropertyModel.java | 35 +- .../implextend/InvalidSampleServiceInterface.java | 3 +- .../classes/implextend/SampleServiceInterface.java | 3 +- .../classes/implextend/SimplePropertyModel.java | 35 +- .../models/testmodels/interfaces/AdapterType1.java | 29 +- .../models/testmodels/interfaces/AdapterType2.java | 29 +- .../models/testmodels/interfaces/AdapterType3.java | 29 +- .../models/testmodels/interfaces/CachedModel.java | 30 +- .../models/testmodels/interfaces/ChildModel.java | 26 +- .../testmodels/interfaces/ChildResourceModel.java | 27 +- .../testmodels/interfaces/ChildValueMapModel.java | 27 +- .../interfaces/ModelWithDefaultMethods.java | 36 +- .../interfaces/OptionalPrimitivesModel.java | 75 ++-- .../models/testmodels/interfaces/ParentModel.java | 38 +- .../interfaces/PropertyModelWithDefaults.java | 35 +- .../interfaces/ResourceModelWithRequiredField.java | 27 +- .../testmodels/interfaces/ServiceInterface.java | 30 +- .../testmodels/interfaces/SimplePropertyModel.java | 29 +- .../testmodels/interfaces/SubClassModel.java | 30 +- .../testmodels/interfaces/SuperClassModel.java | 30 +- .../testmodels/interfaces/UncachedModel.java | 30 +- .../models/testutil/ModelAdapterFactoryUtil.java | 8 +- 189 files changed, 4033 insertions(+), 3283 deletions(-) create mode 100644 .sling-module.json