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 faa39c62ae9f189a9614239553a105c520df60b4 Merge: b94ff72064 dba64e531f Author: Andi Huber <[email protected]> AuthorDate: Thu Mar 14 07:16:29 2024 +0100 Merge remote-tracking branch 'origin/master' into spring6 .../pages/index/annotation/DomainService.adoc | 2 +- .../pages/index/annotation/NatureOfService.adoc | 70 ++++++++++++++-------- .../DomainObject_028-autoCompleteRepository.adoc | 4 +- .../annotation/hooks/DomainService_022-nature.adoc | 2 +- .../pages/index/services/swagger/Visibility.adoc | 2 +- .../ROOT/partials/domain-services/progmodel.adoc | 4 +- .../globally-defined-dropdowns.adoc | 2 +- .../ui-layout-and-hints/menubars-layout.adoc | 4 +- .../causeway/applib/annotation/DomainService.java | 2 +- .../applib/annotation/NatureOfService.java | 58 ++++++++++++++---- .../services/appfeatui/ApplicationFeatureMenu.java | 2 +- .../services/confview/ConfigurationMenu.java | 2 +- .../services/metamodel/MetaModelServiceMenu.java | 2 +- .../applib/services/swagger/Visibility.java | 2 +- .../applib/services/user/ImpersonateMenu.java | 2 +- .../applib/services/user/ImpersonateStopMenu.java | 2 +- .../causeway/applib/services/userui/UserMenu.java | 2 +- .../causeway/commons/internal/os/_OsUtil.java | 6 +- ...ceMenuFacet.java => WebApiOnlyActionFacet.java} | 2 +- ...act.java => WebApiOnlyActionFacetAbstract.java} | 8 +-- ...viceMenuFacetFromDomainServiceFacetFactory.java | 4 +- ...bApiOnlyActionFacetFromDomainServiceFacet.java} | 8 +-- .../object/domainservice/DomainServiceFacet.java | 26 +++----- .../LogicalTypeFacetFromClassNameFactory.java | 6 +- ...ionFacetFromDomainServiceFacetFactoryTest.java} | 20 +++---- .../bootstrap/MenuBarsServiceBootstrap.java | 13 ++-- .../runtimeservices/menubars/bootstrap/Bar.java | 2 +- .../security/authentication/logout/LogoutMenu.java | 2 +- .../commandlog/applib/app/CommandLogMenu.java | 2 +- .../docgen/help/menu/DocumentationMenu.java | 2 +- .../bulkupdate/BulkUpdateMenuForDemoToDoItem.java | 2 +- .../ExcelPivotByCategoryAndSubcategoryMenu.java | 2 +- .../ExcelUploadServiceForDemoToDoItem.java | 2 +- .../todomodule/dom/ExcelDemoToDoItemMenu.java | 2 +- .../executionlog/applib/app/ExecutionLogMenu.java | 2 +- .../applib/app/ExecutionOutboxMenu.java | 2 +- .../applib/restapi/OutboxRestApi.java | 2 +- .../github/menu/LayoutLoadersGitHubMenu.java | 2 +- .../audittrail/applib/app/AuditTrailMenu.java | 2 +- .../permission/menu/ApplicationPermissionMenu.java | 2 +- .../applib/role/menu/ApplicationRoleMenu.java | 2 +- .../tenancy/menu/ApplicationTenancyMenu.java | 2 +- .../applib/user/menu/ApplicationUserMenu.java | 2 +- .../secman/applib/user/menu/MeService.java | 2 +- .../sessionlog/applib/app/SessionLogMenu.java | 2 +- .../dom/PdfJsDemoObjectWithBlobMenu.java | 8 +-- .../demoapp/web/replay/DemoReplayController.java | 5 ++ .../restapi/CommandRetrievalOnPrimaryService.java | 4 +- .../primary/ui/CommandReplayOnPrimaryService.java | 5 +- .../ui/CommandReplayOnSecondaryService.java | 5 +- .../testdomain/jdo/JdoInventoryResource.java | 2 +- .../testdomain/jpa/JpaInventoryResource.java | 3 +- .../model/actnsemantics/BlobDemoMenu.java | 3 +- .../model/bad/InvalidServiceWithAlias.java | 3 +- .../model/good/ProperServiceWithAlias.java | 3 +- .../model/good/ProperServiceWithMixin.java | 3 +- .../causeway/testdomain/rospec/RoSpecSampler.java | 4 +- .../dom/FakeDataDemoObjectWithAllMenu.java | 2 +- .../applib/fixturescripts/FixtureScripts.java | 4 +- .../h2console/ui/services/H2ManagerMenu.java | 2 +- .../hsqldbmgr/dom/services/HsqlDbManagerMenu.java | 2 +- viewers/graphql/adoc/modules/ROOT/pages/i18n.adoc | 2 +- .../adoc/modules/ROOT/pages/testsupport.adoc | 2 +- .../viewer/test/domain/admin/AdminMenu.java | 2 +- .../viewer/test/domain/calc/Calculator.java | 2 +- .../viewer/test/domain/dept/Departments.java | 2 +- .../graphql/viewer/test/domain/dept/DeptHeads.java | 2 +- .../graphql/viewer/test/domain/dept/People.java | 2 +- .../graphql/viewer/test/domain/dept/Staff.java | 2 +- .../viewer/test/domain/i18n/I18nCalculator.java | 2 +- .../hints-and-tips/view-model-as-parameter.adoc | 2 +- .../swagger/internal/_OpenApiModelFactory.java | 2 +- .../test/domain/dom/Departments.java | 5 ++ .../restfulobjects/test/domain/dom/DeptHeads.java | 5 ++ .../restfulobjects/test/domain/dom/People.java | 5 ++ .../restfulobjects/test/domain/dom/Staff.java | 5 ++ .../resources/DomainServiceResourceServerside.java | 2 +- 77 files changed, 225 insertions(+), 172 deletions(-) diff --cc extensions/core/excel/fixture/src/main/java/org/apache/causeway/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java index cbb9c6f354,61e671a4f8..e5ae70e81e --- 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 @@@ -47,10 -47,10 +47,10 @@@ import org.apache.causeway.applib.servi import lombok.RequiredArgsConstructor; @DomainService( - nature = NatureOfService.VIEW + nature = NatureOfService.BOTH ) @Named("libExcelFixture.ExcelDemoToDoItemMenu") [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = {@Inject}) public class ExcelDemoToDoItemMenu { diff --cc extensions/vw/pdfjs/fixtures/src/main/java/org/causewayaddons/wicket/pdfjs/fixture/demoapp/demomodule/dom/PdfJsDemoObjectWithBlobMenu.java index d0f0a55c76,dac3b47ebe..3c83e103e5 --- a/extensions/vw/pdfjs/fixtures/src/main/java/org/causewayaddons/wicket/pdfjs/fixture/demoapp/demomodule/dom/PdfJsDemoObjectWithBlobMenu.java +++ b/extensions/vw/pdfjs/fixtures/src/main/java/org/causewayaddons/wicket/pdfjs/fixture/demoapp/demomodule/dom/PdfJsDemoObjectWithBlobMenu.java @@@ -20,6 -20,8 +20,8 @@@ package org.causewayaddons.wicket.pdfjs import java.util.List; -import javax.inject.Named; ++import jakarta.inject.Named; + import org.apache.causeway.applib.annotation.Action; import org.apache.causeway.applib.annotation.ActionLayout; import org.apache.causeway.applib.annotation.BookmarkPolicy; diff --cc incubator/examples/demo/web/src/main/java/demoapp/web/replay/DemoReplayController.java index f47616e746,9182b5430f..5f5e2ce89a --- a/incubator/examples/demo/web/src/main/java/demoapp/web/replay/DemoReplayController.java +++ b/incubator/examples/demo/web/src/main/java/demoapp/web/replay/DemoReplayController.java @@@ -31,10 -31,8 +31,15 @@@ import org.apache.causeway.applib.annot import org.apache.causeway.extensions.commandreplay.secondary.spi.ReplayCommandExecutionController; @Named("demo.web.DemoReplayController") ++<<<<<<< HEAD +@DomainService( + nature = NatureOfService.VIEW +) [email protected](PriorityPrecedence.EARLY) ++======= + @DomainService [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) ++>>>>>>> refs/remotes/origin/master @Profile("commandreplay-secondary") public class DemoReplayController implements ReplayCommandExecutionController { diff --cc incubator/extensions/core/commandreplay/primary/src/main/java/org/apache/causeway/extensions/commandreplay/primary/restapi/CommandRetrievalOnPrimaryService.java index ad1c1dbbae,66a81569a4..3ea3382bab --- 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,11 -46,9 +46,9 @@@ import org.apache.causeway.schema.cmd.v /** * @since 2.0 {@index} */ - @DomainService( - nature = NatureOfService.REST - ) + @DomainService(nature = NatureOfService.WEB_API) @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 08a398b478,9d74b84dfe..89e94eef33 --- 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 -48,10 +48,10 @@@ import lombok.val @Named("testdomain.jdo.InventoryResource") @DomainService( - nature = NatureOfService.REST, + 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 3fab411047,daf2a33f01..ef5ba10eb7 --- 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,8 -44,8 +44,9 @@@ import lombok.RequiredArgsConstructor import lombok.val; @Named("testdomain.jpa.InventoryResource") - @DomainService(nature = NatureOfService.REST) ++ + @DomainService(nature = NatureOfService.WEB_API) [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 7b03756d52,63caf051d5..0c0fd3d438 --- 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,10 -30,8 +30,8 @@@ import org.apache.causeway.applib.annot import org.apache.causeway.applib.annotation.SemanticsOf; @Named("testdomain.RoSpecSampler") - @DomainService( - nature = NatureOfService.REST - ) + @DomainService(nature = NatureOfService.WEB_API) [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) public class RoSpecSampler { // -- VOID diff --cc testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java index 6e76540f10,32ca455ad6..eb132e162a --- a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java +++ b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/fixturescripts/FixtureScripts.java @@@ -27,11 -27,8 +27,10 @@@ import java.util.TreeMap import java.util.function.Function; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; - import jakarta.xml.bind.annotation.XmlRootElement; + +import org.springframework.context.annotation.Import; import org.apache.causeway.applib.ViewModel; import org.apache.causeway.applib.annotation.Action; diff --cc viewers/graphql/test/src/test/java/org/apache/causeway/viewer/graphql/viewer/test/domain/dept/Departments.java index 254d9305ab,ee7a001b1b..c279d48e62 --- 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 @@@ -35,8 -35,8 +35,8 @@@ import lombok.RequiredArgsConstructor @Named("university.dept.Departments") @DomainService( - nature=NatureOfService.VIEW) + nature=NatureOfService.BOTH) [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 6ca2a1dfa5,05e98e33bb..60dadeec47 --- 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 -32,8 +32,8 @@@ import org.apache.causeway.applib.annot import lombok.RequiredArgsConstructor; @Named("university.dept.DeptHeads") - @DomainService(nature=NatureOfService.VIEW) + @DomainService(nature=NatureOfService.BOTH) [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 99e749f2ff,c84c926cf2..27e6b46b60 --- 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 @@@ -15,8 -15,8 +15,8 @@@ import lombok.RequiredArgsConstructor @Named("university.dept.People") @DomainService( - nature= NatureOfService.VIEW) + nature= NatureOfService.BOTH) [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 e7c2bcc85b,b3f9aa70b4..9590b439ea --- 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 @@@ -33,8 -33,8 +33,8 @@@ import lombok.RequiredArgsConstructor @Named("university.dept.Staff") @DomainService( - nature=NatureOfService.VIEW) + nature=NatureOfService.BOTH) [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = {@Inject}) public class Staff { diff --cc viewers/restfulobjects/test/src/test/java/org/apache/causeway/viewer/restfulobjects/test/domain/dom/Departments.java index 7b4ebcf46d,a156cd0b83..13f6bc9c98 --- 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 @@@ -35,8 -35,8 +35,13 @@@ import lombok.RequiredArgsConstructor @Named("university.dept.Departments") @DomainService( ++<<<<<<< HEAD + nature=NatureOfService.VIEW) [email protected](PriorityPrecedence.EARLY) ++======= + nature=NatureOfService.BOTH) [email protected](PriorityPrecedence.EARLY) [email protected](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 da66b59f03,9f303bf829..1d8903097c --- 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,8 -32,8 +32,13 @@@ import org.apache.causeway.applib.annot import lombok.RequiredArgsConstructor; @Named("university.dept.DeptHeads") ++<<<<<<< HEAD +@DomainService(nature=NatureOfService.VIEW) [email protected](PriorityPrecedence.EARLY) ++======= + @DomainService(nature=NatureOfService.BOTH) [email protected](PriorityPrecedence.EARLY) [email protected](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 1b198278a3,3af3a2e4db..9ec579fbe4 --- 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 @@@ -15,8 -15,8 +15,13 @@@ import lombok.RequiredArgsConstructor @Named("university.dept.People") @DomainService( ++<<<<<<< HEAD + nature= NatureOfService.VIEW) [email protected](PriorityPrecedence.EARLY) ++======= + nature= NatureOfService.BOTH) [email protected](PriorityPrecedence.EARLY) [email protected](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 6104a0b71b,646ce863c7..4dce14727e --- 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 @@@ -33,8 -33,8 +33,13 @@@ import lombok.RequiredArgsConstructor @Named("university.dept.Staff") @DomainService( ++<<<<<<< HEAD + nature=NatureOfService.VIEW) [email protected](PriorityPrecedence.EARLY) ++======= + nature=NatureOfService.BOTH) [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) ++>>>>>>> refs/remotes/origin/master @RequiredArgsConstructor(onConstructor_ = {@Inject}) public class Staff {
