This is an automated email from the ASF dual-hosted git repository. tjwatson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit 6591e106369e346e483fad13f12007302f232452 Merge: 3bac62e 4e8021e Author: Thomas Watson <[email protected]> AuthorDate: Thu Dec 9 09:59:26 2021 -0600 Merge branch 'scrR8' scr/bnd.bnd | 8 +- scr/changelog.txt | 4 + scr/pom.xml | 14 +- .../java/org/apache/felix/scr/impl/Activator.java | 40 +++- .../felix/scr/impl/BundleComponentActivator.java | 15 +- .../apache/felix/scr/impl/helper/Coercions.java | 2 + .../impl/helper/ComponentServiceObjectsHelper.java | 85 +++---- .../felix/scr/impl/inject/ScrComponentContext.java | 2 + .../apache/felix/scr/impl/inject/ValueUtils.java | 140 +++++++----- .../felix/scr/impl/inject/field/FieldHandler.java | 55 +++-- .../felix/scr/impl/inject/internal/ClassUtils.java | 6 +- .../inject/internal/ComponentConstructorImpl.java | 19 +- .../scr/impl/inject/methods/ActivateMethod.java | 3 +- .../felix/scr/impl/inject/methods/BaseMethod.java | 8 +- .../felix/scr/impl/inject/methods/BindMethod.java | 3 +- .../SuitableMethodNotAccessibleException.java | 1 + .../scr/impl/manager/AbstractComponentManager.java | 9 +- .../scr/impl/manager/AbstractPrototypeRefPair.java | 1 - .../felix/scr/impl/manager/ComponentActivator.java | 2 + .../scr/impl/manager/ComponentContextImpl.java | 6 + .../scr/impl/manager/ComponentFactoryImpl.java | 2 +- .../impl/manager/ConfigurableComponentHolder.java | 12 +- .../felix/scr/impl/manager/DependencyManager.java | 134 +++++++---- .../scr/impl/manager/ExtendedServiceEvent.java | 3 +- .../PrototypeServiceFactoryComponentManager.java | 2 +- .../manager/ServiceFactoryComponentManager.java | 2 +- .../felix/scr/impl/manager/ServiceTracker.java | 62 +++-- .../scr/impl/manager/SingleComponentManager.java | 6 +- .../felix/scr/impl/metadata/ComponentMetadata.java | 14 +- .../apache/felix/scr/impl/metadata/DSVersion.java | 8 +- .../felix/scr/impl/metadata/PropertyMetadata.java | 16 ++ .../felix/scr/impl/metadata/ReferenceMetadata.java | 69 ++---- .../impl/runtime/ServiceComponentRuntimeImpl.java | 78 +------ .../apache/felix/scr/impl/xml/XmlConstants.java | 4 + .../org/apache/felix/scr/impl/xml/XmlHandler.java | 41 +++- .../scr/impl/BundleComponentActivatorTest.java | 8 +- .../felix/scr/impl/ComponentRegistryKeyTest.java | 2 +- .../java/org/apache/felix/scr/impl/MockBundle.java | 45 +++- .../scr/impl/inject/internal/AnnotationTest.java | 1 - .../impl/inject/methods/ActivateMethodTest.java | 43 ++-- .../scr/impl/inject/methods/BindMethodTest.java | 26 +-- .../manager/ConfiguredComponentHolderTest.java | 67 +++--- .../scr/impl/manager/RegistrationManagerTest.java | 3 +- .../impl/manager/SingleComponentManagerTest.java | 28 ++- .../felix/scr/impl/manager/components/T1.java | 37 +-- .../felix/scr/impl/manager/components/T1MapSR.java | 2 +- .../felix/scr/impl/manager/components2/T2.java | 19 +- .../felix/scr/impl/metadata/ComponentBase.java | 24 +- .../impl/metadata/ComponentMetaDataCacheTest.java | 6 +- .../scr/impl/metadata/ComponentMetadataTest.java | 3 +- .../felix/scr/impl/metadata/XmlHandlerTest.java | 97 ++++---- .../scr/impl/metadata/instances/AcceptMethod.java | 2 + .../scr/impl/metadata/instances/BaseObject.java | 7 +- .../scr/impl/metadata/instances/Level1Object.java | 3 +- .../scr/impl/metadata/instances/Level3Object.java | 7 +- .../scr/impl/metadata/instances2/Level2Object.java | 11 +- .../runtime/ServiceComponentRuntimeImplTest.java | 9 +- .../apache/felix/scr/impl/xml/XmlHandlerTest.java | 70 +++++- .../scr/integration/AnyServiceReferenceTest.java | 254 +++++++++++++++++++++ .../scr/integration/CircularReferenceTest.java | 4 +- .../scr/integration/ComponentConstructorTest.java | 2 +- .../scr/integration/ComponentDisposeTest.java | 2 +- .../scr/integration/ComponentFactoryTest.java | 27 ++- .../scr/integration/ComponentOptionalTest.java | 216 ++++++++++++++++++ .../felix/scr/integration/ComponentTestBase.java | 36 +-- .../scr/integration/ConfigurationChangeTest.java | 8 +- .../ConfigurationComponentFactoryTest.java | 3 +- .../felix/scr/integration/Felix3680_2Test.java | 4 +- .../felix/scr/integration/Felix4188Test.java | 2 +- .../felix/scr/integration/Felix4350Test.java | 18 +- .../felix/scr/integration/Felix4984Test.java | 16 +- .../felix/scr/integration/Felix5248Test.java | 2 + .../felix/scr/integration/Felix5276Test.java | 1 + .../felix/scr/integration/Felix5356Test.java | 4 +- .../felix/scr/integration/Felix6274Test.java | 1 + .../apache/felix/scr/integration/LocateTest.java | 2 +- .../apache/felix/scr/integration/LocationTest.java | 1 + .../scr/integration/MutablePropertiesTest.java | 32 ++- .../PersistentComponentFactoryTest.java | 31 ++- .../scr/integration/SatisfyingConditionTest.java | 208 +++++++++++++++++ .../scr/integration/ServiceBindGreedyTest.java | 15 +- .../felix/scr/integration/ServiceBindTest.java | 13 +- .../scr/integration/ServiceComponentTest.java | 15 +- .../integration/components/ActivatorComponent.java | 7 +- .../components/AnyServiceComponent.java | 108 +++++++++ ...ervice.java => AnyServiceComponentInvalid.java} | 13 +- ...ngService.java => AnyServiceComponentList.java} | 13 +- ...ingService.java => AnyServiceComponentMap.java} | 13 +- .../components/ConstructorSingleReference.java | 12 + .../integration/components/Felix4350Component.java | 2 + .../components/InjectOptionalComponent.java | 203 ++++++++++++++++ .../integration/components/MutatingService.java | 2 +- .../components/MutatingServiceImpl.java | 33 ++- ...java => SatisfyingConditionComponentClass.java} | 23 +- .../integration/components/SimpleService2Impl.java | 14 +- .../integration/components/SimpleServiceImpl.java | 1 + .../activatesignature/Signature_Package_Map.java | 4 +- .../activatesignature/Signature_Private_Map.java | 4 +- .../activatesignature/Signature_Protected_Map.java | 3 +- .../activatesignature/Signature_Public_Map.java | 3 +- .../scr/integration/components/circular/A.java | 4 + .../scr/integration/components/circular/B.java | 4 + .../components/circularFactory/FactoryClient.java | 4 +- .../components/concurrency/AFactory.java | 8 +- .../components/concurrency/CFactory.java | 8 +- .../integration/components/deadlock/Consumer.java | 2 +- .../components/deadlock/TestComponent.java | 6 +- .../scr/integration/components/felix3680/Main.java | 12 +- .../integration/components/felix3680_2/Main.java | 18 +- .../scr/integration/components/felix4984/A.java | 7 +- .../scr/integration/components/felix4984/B.java | 2 + .../scr/integration/components/felix5276/B.java | 2 + .../scr/integration/components/felix5276/C.java | 2 + .../components/felix6274_2/Component.java | 1 + .../components/felix6274_hook/Activator.java | 1 - .../java/org/osgi/service/condition/Condition.java | 77 +++++++ .../resources/integration_test_any_service.xml | 211 +++++++++++++++++ .../resources/integration_test_inject_optional.xml | 146 ++++++++++++ .../integration_test_satisfying_condition.xml | 147 ++++++++++++ .../resources/satisfying-condition-specified.xml | 23 ++ 120 files changed, 2758 insertions(+), 698 deletions(-)
