This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch v4 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 26e0b406c86a115ad2fd099a66d3cecc8304fcc2 Merge: 19c7569e24a 402b1a92a89 Author: Andi Huber <[email protected]> AuthorDate: Wed Jun 25 10:23:49 2025 +0200 Merge remote-tracking branch 'origin/main' into v4 .../metamodel/context/HasMetaModelContext.java | 5 + .../context/MetaModelContext_usingSpring.java | 5 + .../core/metamodel/facets/DomainEventHelper.java | 30 ++-- .../actions/action/invocation/IdentifierUtil.java | 158 --------------------- .../metamodel/interactions/InteractionHead.java | 125 +++++++++------- .../managed/ActionInteractionHead.java | 30 +--- .../interactions/managed/ManagedAction.java | 9 +- .../managed/ParameterNegotiationModel.java | 76 +++++----- .../core/metamodel/object/MmDebugUtils.java | 2 +- .../core/metamodel/progmodel/ProgrammingModel.java | 10 ++ .../schema/SchemaValueMarshallerAbstract.java | 48 ++++++- .../metamodel/spec/feature/HasObjectAction.java | 3 +- .../core/metamodel/spec/feature/MixedInAction.java | 1 + .../core/metamodel/spec/feature/MixedInMember.java | 2 +- .../core/metamodel/spec/feature/ObjectAction.java | 15 +- .../metamodel/spec/impl/ObjectActionDefault.java | 8 +- .../metamodel/spec/impl/ObjectActionMixedIn.java | 8 +- .../spec/impl/ObjectActionParameterAbstract.java | 2 +- .../spec/impl/ProgrammingModelDefault.java | 10 +- .../spec/impl/_MixedInMemberNamingStrategy.java | 43 +++--- .../facets/AbstractTestWithMetaModelContext.java | 4 + .../ViewModelSemanticCheckingFacetFactoryTest.java | 7 +- .../spec/impl/MixedInMemberNamingStrategyTest.java | 30 ++-- .../command/CommandDtoFactoryDefault.java | 7 +- .../executor/MemberExecutorServiceDefault.java | 7 +- .../handlers/DomainObjectInvocationHandler.java | 4 +- .../testdomain/interact/ActionInteractionTest.java | 5 +- .../commons/model/attrib/HasUiParameter.java | 2 +- .../viewer/commons/model/attrib/UiParameter.java | 2 +- .../viewer/resources/_DomainResourceHelper.java | 3 +- 30 files changed, 315 insertions(+), 346 deletions(-) diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ActionInteractionHead.java index 80b5b8b27f5,e876d727485..1ef89474815 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ActionInteractionHead.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ActionInteractionHead.java @@@ -25,33 -25,17 +25,17 @@@ import org.apache.causeway.core.metamod import org.apache.causeway.core.metamodel.object.ManagedObject; import org.apache.causeway.core.metamodel.spec.feature.ObjectAction; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; -@Log4j2 +@Slf4j public record ActionInteractionHead( - @NonNull InteractionHeadRecord interactionHeadRecord, - @NonNull ObjectAction objectAction, - @NonNull MultiselectChoices multiselectChoices) - implements InteractionHead, HasMetaModel<ObjectAction> { - - public static ActionInteractionHead of( - final @NonNull ObjectAction objectAction, - final @NonNull ManagedObject owner, - final @NonNull ManagedObject target) { - return new ActionInteractionHead(new InteractionHeadRecord(owner, target), objectAction, Can::empty); - } - - public static ActionInteractionHead of( - final @NonNull ObjectAction objectAction, - final @NonNull ManagedObject owner, - final @NonNull ManagedObject target, - final @NonNull MultiselectChoices multiselectChoices) { - return new ActionInteractionHead(new InteractionHeadRecord(owner, target), objectAction, multiselectChoices); - } + @NonNull InteractionHead interactionHead, + @NonNull ObjectAction objectAction) + implements HasMetaModel<ObjectAction> { @Override public ObjectAction getMetaModel() { return objectAction(); } - @Override public ManagedObject owner() { return interactionHeadRecord.owner(); } - @Override public ManagedObject target() { return interactionHeadRecord.target(); } + public ManagedObject owner() { return interactionHead.owner(); } + public ManagedObject target() { return interactionHead.target(); } /** * See step 1 'Fill in defaults' in @@@ -70,10 -54,10 +54,10 @@@ pendingParamModel = pendingParamModel .withParamValue(param.getParameterIndex(), param.getDefault(pendingParamModel)); } - + return pendingParamModel; - } - + } + // -- HELPER /** diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ParameterNegotiationModel.java index 4a2fa495401,ed4de33f9d3..efcc6d6b8dc --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ParameterNegotiationModel.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ParameterNegotiationModel.java @@@ -46,9 -47,10 +47,10 @@@ import org.apache.causeway.core.metamod import org.apache.causeway.core.metamodel.object.ManagedObjects; import org.apache.causeway.core.metamodel.object.MmAssertionUtils; import org.apache.causeway.core.metamodel.spec.ObjectSpecification; + import org.apache.causeway.core.metamodel.spec.feature.ObjectAction; import org.apache.causeway.core.metamodel.spec.feature.ObjectActionParameter; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; /** * Model used to negotiate the parameter values of an action by means of an UI dialog. diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/ObjectActionMixedIn.java index f734b39dc3f,d51e8e526c1..d878bd98e1c --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/ObjectActionMixedIn.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/ObjectActionMixedIn.java @@@ -41,10 -42,9 +42,9 @@@ import org.apache.causeway.core.metamod import org.apache.causeway.core.metamodel.spec.feature.ObjectAction; import lombok.Getter; - import org.jspecify.annotations.NonNull; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; -@Log4j2 +@Slf4j class ObjectActionMixedIn extends ObjectActionDefault implements MixedInAction { diff --cc core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/executor/MemberExecutorServiceDefault.java index e1058a0fbec,0b5d1fa6857..7989550da48 --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/executor/MemberExecutorServiceDefault.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/executor/MemberExecutorServiceDefault.java @@@ -76,10 -76,9 +76,9 @@@ import org.apache.causeway.schema.ixn.v import static org.apache.causeway.core.metamodel.facets.members.publish.command.CommandPublishingFacet.isPublishingEnabled; import lombok.Getter; - import org.jspecify.annotations.NonNull; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; /** * Default implementation of {@link MemberExecutorService}.
