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 a9d9245ab00bd935db3e6822d0c1a66a5a56c2d3 Merge: faa39c62ae 51c633beb1 Author: Andi Huber <[email protected]> AuthorDate: Thu Mar 14 13:31:11 2024 +0100 Merge remote-tracking branch 'origin/master' into spring6 .../causeway/applib/annotation/DomainService.java | 4 +- .../applib/annotation/NatureOfService.java | 74 +----------- .../services/appfeatui/ApplicationFeatureMenu.java | 5 +- .../services/confview/ConfigurationMenu.java | 5 +- .../services/metamodel/MetaModelServiceMenu.java | 5 +- .../applib/services/user/ImpersonateMenu.java | 5 +- .../applib/services/user/ImpersonateStopMenu.java | 5 +- .../causeway/applib/services/userui/UserMenu.java | 5 +- .../config/beans/CausewayBeanTypeClassifier.java | 26 +++++ .../beans/CausewayBeanTypeClassifierDefault.java | 5 +- core/metamodel/src/main/java/module-info.java | 2 - .../metamodel/context/HasMetaModelContext.java | 3 +- .../notinservicemenu/WebApiOnlyActionFacet.java | 36 ------ .../WebApiOnlyActionFacetAbstract.java | 39 ------- ...viceMenuFacetFromDomainServiceFacetFactory.java | 65 ----------- ...ebApiOnlyActionFacetFromDomainServiceFacet.java | 55 --------- .../object/domainservice/DomainServiceFacet.java | 70 ----------- .../domainservice/DomainServiceFacetAbstract.java | 57 --------- .../DomainServiceFacetAnnotationFactory.java | 10 +- .../DomainServiceFacetForAnnotation.java | 33 ------ .../RemoveAnnotatedMethodsFacetFactory.java | 4 +- .../LogicalTypeFacetFromClassNameFactory.java | 5 +- .../dflt/ProgrammingModelFacetsJava11.java | 3 - .../services/metamodel/MetaModelExporter.java | 35 +----- .../core/metamodel/spec/ObjectSpecification.java | 5 + .../specimpl/dflt/ObjectSpecificationDefault.java | 13 +++ .../causeway/core/metamodel/util/Facets.java | 5 - ...tionFacetFromDomainServiceFacetFactoryTest.java | 129 --------------------- .../DomainServiceFacetAnnotationFactoryTest.java | 11 +- .../facets/param/name/ParameterNameFacetTest.java | 2 +- .../bootstrap/MenuBarsServiceBootstrap.java | 17 +-- .../runtimeservices/menubars/bootstrap/Bar.java | 5 +- .../security/authentication/logout/LogoutMenu.java | 5 +- .../commandlog/applib/app/CommandLogMenu.java | 3 +- .../docgen/help/menu/DocumentationMenu.java | 3 +- .../bulkupdate/BulkUpdateMenuForDemoToDoItem.java | 5 +- .../ExcelPivotByCategoryAndSubcategoryMenu.java | 5 +- .../ExcelUploadServiceForDemoToDoItem.java | 5 +- .../todomodule/dom/ExcelDemoToDoItemMenu.java | 5 +- .../executionlog/applib/app/ExecutionLogMenu.java | 3 +- .../applib/app/ExecutionOutboxMenu.java | 5 +- .../applib/restapi/OutboxRestApi.java | 3 +- .../github/menu/LayoutLoadersGitHubMenu.java | 3 +- .../audittrail/applib/app/AuditTrailMenu.java | 3 +- .../permission/menu/ApplicationPermissionMenu.java | 5 +- .../applib/role/menu/ApplicationRoleMenu.java | 5 +- .../tenancy/menu/ApplicationTenancyMenu.java | 5 +- .../applib/user/menu/ApplicationUserMenu.java | 5 +- .../secman/applib/user/menu/MeService.java | 5 +- .../sessionlog/applib/app/SessionLogMenu.java | 3 +- .../restapi/CommandRetrievalOnPrimaryService.java | 3 +- .../testdomain/jdo/JdoInventoryResource.java | 2 - .../testdomain/jpa/JpaInventoryResource.java | 4 +- .../causeway/testdomain/rospec/RoSpecSampler.java | 3 +- .../dom/FakeDataDemoObjectWithAllMenu.java | 5 +- .../applib/fixturescripts/FixtureScripts.java | 5 +- .../h2console/ui/services/H2ManagerMenu.java | 5 +- .../hsqldbmgr/dom/services/HsqlDbManagerMenu.java | 5 +- .../viewer/test/domain/admin/AdminMenu.java | 3 +- .../viewer/test/domain/calc/Calculator.java | 53 +++++---- .../viewer/test/domain/dept/Departments.java | 4 +- .../graphql/viewer/test/domain/dept/DeptHeads.java | 3 +- .../graphql/viewer/test/domain/dept/People.java | 8 +- .../graphql/viewer/test/domain/dept/Staff.java | 4 +- .../viewer/test/domain/i18n/I18nCalculator.java | 3 +- .../rendering/ReprRendererAbstract.java | 6 - .../swagger/internal/_OpenApiModelFactory.java | 7 +- .../test/domain/dom/Departments.java | 9 +- .../restfulobjects/test/domain/dom/DeptHeads.java | 8 +- .../restfulobjects/test/domain/dom/People.java | 13 +-- .../restfulobjects/test/domain/dom/Staff.java | 9 +- .../test/scenarios/dept/Department_IntegTest.java | 1 - .../resources/DomainServiceResourceServerside.java | 14 +-- .../resources/DomainServicesListReprRenderer.java | 14 ++- 74 files changed, 156 insertions(+), 854 deletions(-) diff --cc extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java index e5ae70e81e,63c66801dc..16805fbe41 --- a/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java +++ b/extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java @@@ -46,11 -45,9 +45,9 @@@ import org.apache.causeway.applib.servi import lombok.RequiredArgsConstructor; - @DomainService( - nature = NatureOfService.BOTH - ) + @DomainService @Named("libExcelFixture.ExcelDemoToDoItemMenu") [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = {@Inject}) public class ExcelDemoToDoItemMenu { diff --cc incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/restapi/CommandRetrievalOnPrimaryService.java index 3ea3382bab,d74dc4f13c..9d9c123fbf --- a/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/restapi/CommandRetrievalOnPrimaryService.java +++ b/incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/restapi/CommandRetrievalOnPrimaryService.java @@@ -46,9 -45,9 +45,9 @@@ import org.apache.causeway.schema.cmd.v /** * @since 2.0 {@index} */ - @DomainService(nature = NatureOfService.WEB_API) + @DomainService @Named(CausewayModuleExtCommandReplayPrimary.NAMESPACE + ".CommandRetrievalOnPrimaryService") [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) @Profile("commandreplay-primary") public class CommandRetrievalOnPrimaryService { diff --cc regressiontests/base/src/main/java/org/apache/causeway/testdomain/jdo/JdoInventoryResource.java index 89e94eef33,cff0c89b28..57332d0fc5 --- a/regressiontests/base/src/main/java/org/apache/causeway/testdomain/jdo/JdoInventoryResource.java +++ b/regressiontests/base/src/main/java/org/apache/causeway/testdomain/jdo/JdoInventoryResource.java @@@ -48,10 -47,9 +47,9 @@@ import lombok.val @Named("testdomain.jdo.InventoryResource") @DomainService( - nature = NatureOfService.WEB_API, aliased = "testdomain.jdo.InventoryResourceAlias" // <-- as tested with RestEndpointService ) [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = { @Inject }) public class JdoInventoryResource { diff --cc regressiontests/base/src/main/java/org/apache/causeway/testdomain/jpa/JpaInventoryResource.java index ef5ba10eb7,8fa0d49b33..55dc7f2884 --- a/regressiontests/base/src/main/java/org/apache/causeway/testdomain/jpa/JpaInventoryResource.java +++ b/regressiontests/base/src/main/java/org/apache/causeway/testdomain/jpa/JpaInventoryResource.java @@@ -44,9 -43,8 +43,8 @@@ import lombok.RequiredArgsConstructor import lombok.val; @Named("testdomain.jpa.InventoryResource") - - @DomainService(nature = NatureOfService.WEB_API) + @DomainService [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = { @Inject }) public class JpaInventoryResource { diff --cc regressiontests/base/src/main/java/org/apache/causeway/testdomain/rospec/RoSpecSampler.java index 0c0fd3d438,a0e9b7d12e..132de388a3 --- a/regressiontests/base/src/main/java/org/apache/causeway/testdomain/rospec/RoSpecSampler.java +++ b/regressiontests/base/src/main/java/org/apache/causeway/testdomain/rospec/RoSpecSampler.java @@@ -30,8 -29,8 +29,8 @@@ import org.apache.causeway.applib.annot import org.apache.causeway.applib.annotation.SemanticsOf; @Named("testdomain.RoSpecSampler") - @DomainService(nature = NatureOfService.WEB_API) + @DomainService [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) public class RoSpecSampler { // -- VOID diff --cc viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/Departments.java index c279d48e62,a12438e8a7..ac95ad2fe6 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/Departments.java +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/Departments.java @@@ -34,9 -33,8 +33,8 @@@ import org.apache.causeway.applib.annot import lombok.RequiredArgsConstructor; @Named("university.dept.Departments") - @DomainService( - nature=NatureOfService.BOTH) + @DomainService [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = {@Inject}) public class Departments { diff --cc viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/DeptHeads.java index 60dadeec47,439932e1e7..3b4f0afcea --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/DeptHeads.java +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/DeptHeads.java @@@ -32,8 -31,8 +31,8 @@@ import org.apache.causeway.applib.annot import lombok.RequiredArgsConstructor; @Named("university.dept.DeptHeads") - @DomainService(nature=NatureOfService.BOTH) + @DomainService [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = {@Inject}) public class DeptHeads { diff --cc viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/People.java index 27e6b46b60,2bc2915d04..c08a322f51 --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/People.java +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/People.java @@@ -14,9 -13,8 +13,8 @@@ import org.apache.causeway.applib.annot import lombok.RequiredArgsConstructor; @Named("university.dept.People") - @DomainService( - nature= NatureOfService.BOTH) + @DomainService [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = {@Inject}) public class People { diff --cc viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/Staff.java index 9590b439ea,15ec874b12..d9690780ea --- a/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/Staff.java +++ b/viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/Staff.java @@@ -32,9 -31,8 +31,8 @@@ import org.apache.causeway.applib.annot import lombok.RequiredArgsConstructor; @Named("university.dept.Staff") - @DomainService( - nature=NatureOfService.BOTH) + @DomainService [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = {@Inject}) public class Staff { diff --cc viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/ReprRendererAbstract.java index 1b72caf3cd,5a22f0d6c8..fb1d5c82fb --- a/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/ReprRendererAbstract.java +++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/causeway/viewer/restfulobjects/rendering/ReprRendererAbstract.java @@@ -20,9 -20,8 +20,8 @@@ package org.apache.causeway.viewer.rest import java.util.List; import java.util.Map; - import java.util.stream.Stream; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.causeway.commons.internal.base._Casts; import org.apache.causeway.commons.internal.collections._Lists; diff --cc viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/domain/dom/Departments.java index 13f6bc9c98,eabb6c3c8e..91f0943501 --- a/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/domain/dom/Departments.java +++ b/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/domain/dom/Departments.java @@@ -34,14 -33,8 +33,8 @@@ import org.apache.causeway.applib.annot import lombok.RequiredArgsConstructor; @Named("university.dept.Departments") - @DomainService( - <<<<<<< HEAD - nature=NatureOfService.VIEW) + @DomainService [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) - ======= - nature=NatureOfService.BOTH) - @jakarta.annotation.Priority(PriorityPrecedence.EARLY) - >>>>>>> refs/remotes/origin/master @RequiredArgsConstructor(onConstructor_ = {@Inject}) public class Departments { diff --cc viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/domain/dom/DeptHeads.java index 1d8903097c,9fc390b55a..8cb02c030b --- a/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/domain/dom/DeptHeads.java +++ b/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/domain/dom/DeptHeads.java @@@ -32,13 -31,8 +31,8 @@@ import org.apache.causeway.applib.annot import lombok.RequiredArgsConstructor; @Named("university.dept.DeptHeads") - <<<<<<< HEAD - @DomainService(nature=NatureOfService.VIEW) + @DomainService [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) - ======= - @DomainService(nature=NatureOfService.BOTH) - @jakarta.annotation.Priority(PriorityPrecedence.EARLY) - >>>>>>> refs/remotes/origin/master @RequiredArgsConstructor(onConstructor_ = {@Inject}) public class DeptHeads { diff --cc viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/domain/dom/People.java index 9ec579fbe4,511cc3b1f5..18a5e54ef7 --- a/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/domain/dom/People.java +++ b/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/domain/dom/People.java @@@ -14,14 -13,8 +13,8 @@@ import org.apache.causeway.applib.annot import lombok.RequiredArgsConstructor; @Named("university.dept.People") - @DomainService( - <<<<<<< HEAD - nature= NatureOfService.VIEW) + @DomainService [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) - ======= - nature= NatureOfService.BOTH) - @jakarta.annotation.Priority(PriorityPrecedence.EARLY) - >>>>>>> refs/remotes/origin/master @RequiredArgsConstructor(onConstructor_ = {@Inject}) public class People { diff --cc viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/domain/dom/Staff.java index 4dce14727e,11923234d1..635aee0acd --- a/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/domain/dom/Staff.java +++ b/viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/domain/dom/Staff.java @@@ -32,14 -31,8 +31,8 @@@ import org.apache.causeway.applib.annot import lombok.RequiredArgsConstructor; @Named("university.dept.Staff") - @DomainService( - <<<<<<< HEAD - nature=NatureOfService.VIEW) + @DomainService [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) - ======= - nature=NatureOfService.BOTH) - @jakarta.annotation.Priority(PriorityPrecedence.EARLY) - >>>>>>> refs/remotes/origin/master @RequiredArgsConstructor(onConstructor_ = {@Inject}) public class Staff { diff --cc viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java index 4f58f6e911,a9c869cf5f..9240c03915 --- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java +++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java @@@ -19,20 -19,19 +19,19 @@@ package org.apache.causeway.viewer.restfulobjects.viewer.resources; import java.io.InputStream; - import java.util.function.Predicate; import java.util.stream.Stream; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.springframework.stereotype.Component;
