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-app-referenceapp.git
commit c6fd07e6e114d721d694920dd5f5cf20ba3c3599 Merge: 28bc4d1 98d90fc Author: Andi Huber <[email protected]> AuthorDate: Thu Mar 14 18:00:37 2024 +0100 Merge remote-tracking branch 'origin/master' into spring6 .../java/demoapp/dom/domain/actions/Action/ActionMenu.java | 8 ++++---- .../dom/domain/actions/ActionLayout/ActionLayoutMenu.java | 3 +-- .../dom/domain/collections/Collection/CollectionMenu.java | 3 +-- .../collections/CollectionLayout/CollectionLayoutMenu.java | 3 +-- .../dom/domain/objects/DomainObject/DomainObjectMenu.java | 3 +-- .../objects/DomainObjectLayout/DomainObjectLayoutMenu.java | 3 +-- .../demoapp/dom/domain/properties/Property/PropertyMenu.java | 10 ++++------ .../domain/properties/PropertyLayout/PropertyLayoutMenu.java | 10 ++++------ .../domain/properties/ValueSemantics/ValueSemanticsMenu.java | 10 ++++------ domain/src/main/java/demoapp/dom/featured/FeaturedMenu.java | 10 ++++------ .../dom/featured/causewayext/cal/CalendarEventsMenu.java | 5 +---- .../java/demoapp/dom/featured/causewayext/sse/SseDemoMenu.java | 5 +---- .../progmodel/actions/autocomplete/ActionAutoCompleteMenu.java | 3 +-- .../demoapp/dom/progmodel/actions/bulk/BulkActionMenu.java | 3 +-- .../dom/progmodel/actions/choices/ActionChoicesMenu.java | 3 +-- .../dom/progmodel/actions/defaults/ActionDefaultsMenu.java | 3 +-- .../dom/progmodel/actions/validate/ActionValidateMenu.java | 3 +-- .../demoapp/dom/progmodel/actions/veto/ActionVetoMenu.java | 3 +-- .../compositevalues/CompositeValueTypeMenu.java | 3 +-- .../customvaluetypes/customvalues/ScalarValueTypeMenu.java | 3 +-- .../embeddedvalues/jdo/EmbeddedTypeMenuJdo.java | 3 +-- .../embeddedvalues/jpa/EmbeddedTypeMenuJpa.java | 3 +-- .../src/main/java/demoapp/dom/progmodel/mixins/MixinMenu.java | 5 +---- .../main/java/demoapp/dom/progmodel/uihints/UiHintsMenu.java | 5 +---- .../src/main/java/demoapp/dom/services/core/ServicesMenu.java | 3 +-- .../dom/services/core/wrapperFactory/PrimeNumberGenerator.java | 5 +---- .../demoapp/dom/services/extensions/secman/ExtSecManMenu.java | 5 +---- .../java/demoapp/dom/types/causeway/CausewayTypesMenu.java | 5 +---- .../demoapp/dom/types/causewayval/CausewayValTypesMenu.java | 5 +---- .../main/java/demoapp/dom/types/javaawt/JavaAwtTypesMenu.java | 5 +---- .../java/demoapp/dom/types/javalang/JavaLangTypesMenu.java | 5 +---- .../demoapp/dom/types/javalang/JavaLangWrapperTypesMenu.java | 5 +---- .../java/demoapp/dom/types/javamath/JavaMathTypesMenu.java | 5 +---- .../demoapp/dom/types/javamath/bigdecimals/meta/Money.java | 2 +- .../main/java/demoapp/dom/types/javanet/JavaNetTypesMenu.java | 5 +---- .../main/java/demoapp/dom/types/javasql/JavaSqlTypesMenu.java | 5 +---- .../java/demoapp/dom/types/javatime/JavaTimeTypesMenu.java | 5 +---- .../java/demoapp/dom/types/javautil/JavaUtilTypesMenu.java | 5 +---- .../java/demoapp/dom/types/jodatime/JodaTimeTypesMenu.java | 5 +---- .../java/demoapp/dom/types/primitive/PrimitiveTypesMenu.java | 5 +---- .../web/security/PrototypeActionsVisibilityAdvisor.java | 5 +---- 41 files changed, 56 insertions(+), 137 deletions(-) diff --cc domain/src/main/java/demoapp/dom/domain/actions/Action/ActionMenu.java index c96f981,244bfde..1c263ff --- a/domain/src/main/java/demoapp/dom/domain/actions/Action/ActionMenu.java +++ b/domain/src/main/java/demoapp/dom/domain/actions/Action/ActionMenu.java @@@ -37,12 -39,10 +39,10 @@@ import demoapp.dom.domain.actions.Actio import demoapp.dom.domain.actions.Action.semantics.ActionSemanticsPage; import demoapp.dom.domain.actions.Action.typeOf.ActionTypeOfPage; import demoapp.dom.domain.actions.Action.typeOf.child.ActionTypeOfChildVm; - import lombok.RequiredArgsConstructor; - import lombok.val; @Named("demo.ActionMenu") - @DomainService(nature=NatureOfService.VIEW) + @DomainService [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = {@Inject}) public class ActionMenu { diff --cc domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/ActionLayoutMenu.java index 90c45c2,a47a758..25985c0 --- a/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/ActionLayoutMenu.java +++ b/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/ActionLayoutMenu.java @@@ -41,12 -43,10 +40,12 @@@ import demoapp.dom.domain.actions.Actio import demoapp.dom.domain.actions.ActionLayout.promptStyle.ActionLayoutPromptStylePage; import demoapp.dom.domain.actions.ActionLayout.redirectPolicy.ActionLayoutRedirectPolicyPage; import demoapp.dom.domain.actions.ActionLayout.sequence.ActionLayoutSequencePage; +import lombok.RequiredArgsConstructor; +import lombok.val; - @DomainService(nature=NatureOfService.VIEW) + @DomainService @Named("demo.ActionLayoutMenu") [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = {@Inject}) //tag::menu-item-described-as[] public class ActionLayoutMenu { diff --cc domain/src/main/java/demoapp/dom/domain/collections/Collection/CollectionMenu.java index cbce593,e5a55d1..45eafcf --- a/domain/src/main/java/demoapp/dom/domain/collections/Collection/CollectionMenu.java +++ b/domain/src/main/java/demoapp/dom/domain/collections/Collection/CollectionMenu.java @@@ -34,11 -36,9 +33,11 @@@ import demoapp.dom._infra.samples.NameS import demoapp.dom.domain.collections.Collection.domainEvent.CollectionDomainEventPage; import demoapp.dom.domain.collections.Collection.typeOf.CollectionTypeOfPage; import demoapp.dom.domain.collections.Collection.typeOf.child.CollectionTypeOfChildVm; +import lombok.RequiredArgsConstructor; +import lombok.val; @Named("demo.CollectionMenu") - @DomainService(nature=NatureOfService.VIEW) + @DomainService @Priority(PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = {@Inject}) //@Log4j2 diff --cc domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/CollectionLayoutMenu.java index 3b42b17,a25f7ec..ad5a082 --- a/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/CollectionLayoutMenu.java +++ b/domain/src/main/java/demoapp/dom/domain/collections/CollectionLayout/CollectionLayoutMenu.java @@@ -48,11 -50,9 +47,11 @@@ import demoapp.dom.domain.collections.C import demoapp.dom.domain.collections.CollectionLayout.sortedBy.child.CollectionLayoutSortedByChildVm; import demoapp.dom.domain.collections.CollectionLayout.tabledec.CollectionLayoutTableDecoratorPage; import demoapp.dom.domain.collections.CollectionLayout.tabledec.child.CollectionLayoutTableDecoratorChildVm; +import lombok.RequiredArgsConstructor; +import lombok.val; @Named("demo.CollectionLayoutMenu") - @DomainService(nature=NatureOfService.VIEW) + @DomainService @Priority(PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = {@Inject}) //@Log4j2 diff --cc domain/src/main/java/demoapp/dom/domain/objects/DomainObject/DomainObjectMenu.java index fcf4cf0,b9391d9..dc0befe --- a/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/DomainObjectMenu.java +++ b/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/DomainObjectMenu.java @@@ -39,11 -41,9 +38,11 @@@ import demoapp.dom.domain.objects.Domai import demoapp.dom.domain.objects.DomainObject.nature.DomainObjectNaturePage; import demoapp.dom.domain.objects.DomainObject.xxxDomainEvent.DomainObjectXxxDomainEventPage; import demoapp.dom.domain.objects.DomainObject.xxxLifecycleEvent.DomainObjectXxxLifecycleEventPage; +import lombok.RequiredArgsConstructor; +import lombok.val; @Named("demo.DomainObjectMenu") - @DomainService(nature=NatureOfService.VIEW) + @DomainService @Priority(PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = {@Inject}) public class DomainObjectMenu { diff --cc domain/src/main/java/demoapp/dom/domain/properties/Property/PropertyMenu.java index 7c32658,1641faa..83f6da1 --- a/domain/src/main/java/demoapp/dom/domain/properties/Property/PropertyMenu.java +++ b/domain/src/main/java/demoapp/dom/domain/properties/Property/PropertyMenu.java @@@ -47,14 -49,10 +49,10 @@@ import demoapp.dom.domain.properties.Pr import demoapp.dom.domain.properties.Property.regexPattern.PropertyRegexPatternPage; import demoapp.dom.domain.properties.Property.snapshot.PropertySnapshotPage; import demoapp.dom.types.Samples; - import lombok.RequiredArgsConstructor; - import lombok.val; @Named("demo.PropertyMenu") - @DomainService( - nature=NatureOfService.VIEW - ) + @DomainService [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = {@Inject}) public class PropertyMenu { diff --cc domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/PropertyLayoutMenu.java index b2fc24c,8f872a5..d82e1b1 --- a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/PropertyLayoutMenu.java +++ b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/PropertyLayoutMenu.java @@@ -37,14 -39,10 +39,10 @@@ import demoapp.dom.domain.properties.Pr import demoapp.dom.domain.properties.PropertyLayout.navigable.FileNodeVm; import demoapp.dom.domain.properties.PropertyLayout.repainting.PropertyLayoutRepaintingPage; import demoapp.dom.domain.properties.PropertyLayout.typicalLength.PropertyLayoutTypicalLengthPage; - import lombok.RequiredArgsConstructor; - import lombok.val; @Named("demo.PropertyLayoutMenu") - @DomainService( - nature=NatureOfService.VIEW - ) + @DomainService [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = { @Inject }) //@Log4j2 public class PropertyLayoutMenu { diff --cc domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/ValueSemanticsMenu.java index 678b3f3,4db6a9c..a50aa9e --- a/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/ValueSemanticsMenu.java +++ b/domain/src/main/java/demoapp/dom/domain/properties/ValueSemantics/ValueSemanticsMenu.java @@@ -34,13 -33,12 +33,12 @@@ import org.apache.causeway.applib.annot import lombok.RequiredArgsConstructor; import lombok.val; + import demoapp.dom.domain.properties.ValueSemantics.dateRenderAdjustDays.ValueSemanticsDateRenderAdjustDaysPage; + import demoapp.dom.domain.properties.ValueSemantics.percentage.ValueSemanticsProviderPercentagePage; + @Named("demo.ValueSemanticsMenu") - @DomainService( - nature=NatureOfService.VIEW - ) + @DomainService [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = { @Inject }) //@Log4j2 public class ValueSemanticsMenu { diff --cc domain/src/main/java/demoapp/dom/featured/FeaturedMenu.java index afaa73f,701fee7..7efd3d8 --- a/domain/src/main/java/demoapp/dom/featured/FeaturedMenu.java +++ b/domain/src/main/java/demoapp/dom/featured/FeaturedMenu.java @@@ -38,14 -40,10 +40,10 @@@ import demoapp.dom.featured.customui.Wh import demoapp.dom.featured.customui.Zoom; import demoapp.dom.featured.layout.tooltip.DemoItem; import demoapp.dom.featured.layout.tooltip.TooltipPage; - import lombok.RequiredArgsConstructor; - import lombok.val; @Named("demo.FeaturedMenu") - @DomainService( - nature=NatureOfService.VIEW - ) + @DomainService [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = { @Inject }) public class FeaturedMenu { diff --cc domain/src/main/java/demoapp/dom/featured/causewayext/cal/CalendarEventsMenu.java index d36da4c,8477c52..a042a7d --- a/domain/src/main/java/demoapp/dom/featured/causewayext/cal/CalendarEventsMenu.java +++ b/domain/src/main/java/demoapp/dom/featured/causewayext/cal/CalendarEventsMenu.java @@@ -29,11 -29,9 +28,9 @@@ import org.apache.causeway.applib.annot import org.apache.causeway.applib.annotation.SemanticsOf; @Named("demo.CalendarEventsMenu") - @DomainService( - nature=NatureOfService.VIEW - ) + @DomainService @DomainObjectLayout(named="CausewayExtTypes") [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) public class CalendarEventsMenu { @Action(semantics = SemanticsOf.SAFE) diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompleteMenu.java index 3c6324c,193c829..e893d65 --- a/domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompleteMenu.java +++ b/domain/src/main/java/demoapp/dom/progmodel/actions/autocomplete/ActionAutoCompleteMenu.java @@@ -33,8 -31,10 +32,8 @@@ import demoapp.dom.progmodel.actions.Tv import lombok.RequiredArgsConstructor; import lombok.val; -import demoapp.dom.progmodel.actions.TvCharacterPopulator; - @Named("demo.ActionAutoCompleteMenu") - @DomainService(nature=NatureOfService.VIEW) + @DomainService @Priority(PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = { @Inject }) public class ActionAutoCompleteMenu { diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesMenu.java index 0130ad7,755afdd..a3137aa --- a/domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesMenu.java +++ b/domain/src/main/java/demoapp/dom/progmodel/actions/choices/ActionChoicesMenu.java @@@ -33,8 -31,10 +32,8 @@@ import demoapp.dom.progmodel.actions.Tv import lombok.RequiredArgsConstructor; import lombok.val; -import demoapp.dom.progmodel.actions.TvCharacterPopulator; - @Named("demo.ActionChoicesMenu") - @DomainService(nature=NatureOfService.VIEW) + @DomainService @Priority(PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = { @Inject }) public class ActionChoicesMenu { diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/defaults/ActionDefaultsMenu.java index 00e886e,873a972..dcc2d37 --- a/domain/src/main/java/demoapp/dom/progmodel/actions/defaults/ActionDefaultsMenu.java +++ b/domain/src/main/java/demoapp/dom/progmodel/actions/defaults/ActionDefaultsMenu.java @@@ -33,8 -31,10 +32,8 @@@ import demoapp.dom.progmodel.actions.Tv import lombok.RequiredArgsConstructor; import lombok.val; -import demoapp.dom.progmodel.actions.TvCharacterPopulator; - @Named("demo.ActionDefaultsMenu") - @DomainService(nature=NatureOfService.VIEW) + @DomainService @Priority(PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = { @Inject }) public class ActionDefaultsMenu { diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidateMenu.java index f3a21a9,c7e86a5..c535873 --- a/domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidateMenu.java +++ b/domain/src/main/java/demoapp/dom/progmodel/actions/validate/ActionValidateMenu.java @@@ -33,8 -31,10 +32,8 @@@ import demoapp.dom.progmodel.actions.Tv import lombok.RequiredArgsConstructor; import lombok.val; -import demoapp.dom.progmodel.actions.TvCharacterPopulator; - @Named("demo.ActionValidateMenu") - @DomainService(nature=NatureOfService.VIEW) + @DomainService @Priority(PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = { @Inject }) public class ActionValidateMenu { diff --cc domain/src/main/java/demoapp/dom/progmodel/actions/veto/ActionVetoMenu.java index ceb56a3,5be24c7..be19bdb --- a/domain/src/main/java/demoapp/dom/progmodel/actions/veto/ActionVetoMenu.java +++ b/domain/src/main/java/demoapp/dom/progmodel/actions/veto/ActionVetoMenu.java @@@ -33,8 -31,10 +32,8 @@@ import demoapp.dom.progmodel.actions.Tv import lombok.RequiredArgsConstructor; import lombok.val; -import demoapp.dom.progmodel.actions.TvCharacterPopulator; - @Named("demo.ActionVetoMenu") - @DomainService(nature=NatureOfService.VIEW) + @DomainService @Priority(PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = { @Inject }) public class ActionVetoMenu { diff --cc domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/customvalues/ScalarValueTypeMenu.java index 744114c,5394f34..f5888b9 --- a/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/customvalues/ScalarValueTypeMenu.java +++ b/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/customvalues/ScalarValueTypeMenu.java @@@ -31,8 -30,8 +30,8 @@@ import org.apache.causeway.applib.servi import lombok.RequiredArgsConstructor; @Named("demo.ScalarValueTypeMenu") - @DomainService(nature=NatureOfService.VIEW) + @DomainService [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = {@Inject}) public class ScalarValueTypeMenu { diff --cc domain/src/main/java/demoapp/dom/progmodel/mixins/MixinMenu.java index b6b3aae,5d689ce..3707668 --- a/domain/src/main/java/demoapp/dom/progmodel/mixins/MixinMenu.java +++ b/domain/src/main/java/demoapp/dom/progmodel/mixins/MixinMenu.java @@@ -29,10 -28,8 +28,8 @@@ import org.apache.causeway.applib.annot import lombok.val; @Named("demo.MixinMenu") - @DomainService( - nature = NatureOfService.VIEW - ) + @DomainService [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) public class MixinMenu { @Action diff --cc domain/src/main/java/demoapp/dom/progmodel/uihints/UiHintsMenu.java index 0001df2,2cb5cc6..a33621f --- a/domain/src/main/java/demoapp/dom/progmodel/uihints/UiHintsMenu.java +++ b/domain/src/main/java/demoapp/dom/progmodel/uihints/UiHintsMenu.java @@@ -26,11 -26,8 +26,8 @@@ import org.apache.causeway.applib.annot import org.apache.causeway.applib.annotation.PriorityPrecedence; @Named("demo.UiHintsMenu") - @DomainService( - nature = NatureOfService.VIEW - ) + @DomainService [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) public class UiHintsMenu { @Action diff --cc domain/src/main/java/demoapp/dom/services/core/ServicesMenu.java index 96c0819,351d828..394f5d4 --- a/domain/src/main/java/demoapp/dom/services/core/ServicesMenu.java +++ b/domain/src/main/java/demoapp/dom/services/core/ServicesMenu.java @@@ -34,10 -35,9 +33,10 @@@ import demoapp.dom.services.core.errorr import demoapp.dom.services.core.eventbusservice.EventBusServiceDemoPage; import demoapp.dom.services.core.messageservice.MessageServiceDemoPage; import demoapp.dom.services.core.wrapperFactory.WrapperFactoryDemoPage; +import lombok.RequiredArgsConstructor; @Named("demo.ServicesMenu") - @DomainService(nature=NatureOfService.VIEW) + @DomainService @Priority(PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = {@Inject}) public class ServicesMenu { diff --cc domain/src/main/java/demoapp/dom/types/causewayval/CausewayValTypesMenu.java index 17ba1bc,a0fd13b..787d771 --- a/domain/src/main/java/demoapp/dom/types/causewayval/CausewayValTypesMenu.java +++ b/domain/src/main/java/demoapp/dom/types/causewayval/CausewayValTypesMenu.java @@@ -34,11 -33,9 +33,9 @@@ import demoapp.dom.types.causewayval.ma import demoapp.dom.types.causewayval.vegas.CausewayVegas; @Named("demo.CausewayValTypesMenu") - @DomainService( - nature=NatureOfService.VIEW - ) + @DomainService @DomainObjectLayout(named="CausewayValTypes") [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) public class CausewayValTypesMenu { @Action(semantics = SemanticsOf.SAFE) diff --cc domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/meta/Money.java index 196a7b7,59262dc..6db41c2 --- a/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/meta/Money.java +++ b/domain/src/main/java/demoapp/dom/types/javamath/bigdecimals/meta/Money.java @@@ -6,10 -6,10 +6,10 @@@ import java.lang.annotation.Retention import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.constraints.Digits; +import jakarta.validation.constraints.Digits; @Digits(integer = 12, fraction = 2) --// @javax.persistence.Column(precision = 14, scale = 2) // JPA doesn't support meta-annotations ++// @jakarta.persistence.Column(precision = 14, scale = 2) // JPA doesn't support meta-annotations @javax.jdo.annotations.Column(scale = 2) // JDO doesn't require length to be specified @Inherited @Target({
