This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch spring6 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 5a2dbc1de793d25bdbbf01ff082df22f6b6bdee5 Merge: 1dd4eb2eab 135526f23e Author: Andi Huber <[email protected]> AuthorDate: Tue Feb 27 19:52:25 2024 +0100 Merge remote-tracking branch 'origin/master' into spring6 .../org/apache/causeway/applib/id/LogicalType.java | 4 + .../applib/services/registry/ServiceRegistry.java | 11 ++- .../commons/internal/ioc/_IocContainer.java | 4 +- .../commons/internal/ioc/_IocContainer_Spring.java | 22 ++---- .../commons/internal/ioc/_ManagedBeanAdapter.java | 50 ------------ .../internal/ioc/_ManagedBeanAdapter_Spring.java | 49 ------------ .../ioc/_ManagedBeanAdapter_forTestingLazy.java | 44 ----------- .../internal/ioc/_SingletonBeanProvider.java | 90 ++++++++++++++++++++++ .../progmodel/ProgrammingModelConstants.java | 4 + .../_testing/MetaModelContext_forTesting.java | 36 ++++----- .../_testing/ServiceRegistry_forTesting.java | 18 ++--- .../context/MetaModelContext_usingSpring.java | 9 +-- .../DomainObjectAnnotationFacetFactory.java | 48 ++++++++++-- .../core/metamodel/objectmanager/ObjectLoader.java | 6 +- .../services/registry/ServiceRegistryDefault.java | 29 ++++--- .../title/TitlesAndTranslationsValidator.java | 3 +- .../RuntimeServicesTestAbstract.java | 8 +- .../SpringServiceProvisioningTest.java | 6 +- 18 files changed, 205 insertions(+), 236 deletions(-) diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java index 696ff75e43,19a7d102e1..62cc89125e --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java @@@ -23,9 -23,12 +23,12 @@@ import java.util.List import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; + import org.springframework.lang.Nullable; + import org.springframework.util.ClassUtils; + import org.apache.causeway.applib.Identifier; import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.Collection; diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/registry/ServiceRegistryDefault.java index cb151fc760,7ba8e1ab31..b69294f555 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/registry/ServiceRegistryDefault.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/registry/ServiceRegistryDefault.java @@@ -21,11 -21,12 +21,12 @@@ package org.apache.causeway.core.metamo import java.lang.annotation.Annotation; import java.util.Map; import java.util.Optional; + import java.util.function.Predicate; import java.util.stream.Stream; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; diff --cc regressiontests/stable-bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/SpringServiceProvisioningTest.java index 70662b241f,efc3ccd2ae..ff1ed61df7 --- a/regressiontests/stable-bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/SpringServiceProvisioningTest.java +++ b/regressiontests/stable-bootstrapping/src/test/java/org/apache/causeway/testdomain/bootstrapping/SpringServiceProvisioningTest.java @@@ -32,12 -34,9 +32,12 @@@ import org.junit.jupiter.api.Test import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.TestPropertySource; + import org.apache.causeway.applib.services.registry.ServiceRegistry; import org.apache.causeway.commons.internal.base._Strings; - import org.apache.causeway.commons.internal.ioc._ManagedBeanAdapter; + import org.apache.causeway.commons.internal.ioc._SingletonBeanProvider; import org.apache.causeway.commons.internal.resources._Resources; import org.apache.causeway.core.config.environment.CausewaySystemEnvironment; import org.apache.causeway.core.config.presets.CausewayPresets;
