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 d03d67f856478fab4dc676e35919e247fe8a05a6 Merge: 3f7be5b3f06 d2944d6ae04 Author: Andi Huber <[email protected]> AuthorDate: Fri Jun 27 11:14:36 2025 +0200 Merge remote-tracking branch 'origin/main' into v4 .../services/wrapper/control/SyncControl.java | 18 ++- .../wrapper/listeners/InteractionAdapter.java | 9 -- .../wrapper/listeners/InteractionListener.java | 16 --- .../applib/events/InteractionEventTest.java | 22 +-- core/metamodel/src/main/java/module-info.java | 1 + .../core/metamodel/consent/ConsentAbstract.java | 2 +- .../core/metamodel/consent/InteractionResult.java | 149 ++++++--------------- .../metamodel/consent/InteractionResultSet.java | 13 +- .../metamodel/interactions/InteractionUtils.java | 82 ++++++------ .../interactions/managed/ManagedFeature.java | 3 +- .../interactions/managed/ManagedMember.java | 8 +- .../interactions/managed/ManagedParameter.java | 11 +- .../managed/ParameterNegotiationModel.java | 7 +- .../core/metamodel/object/MmVisibilityUtils.java | 2 +- .../metamodel/consent/InteractionResultTest.java | 59 ++++---- ...mandRecord.java => AsyncExecutionFinisher.java} | 19 +-- ...syncExecutorService.java => AsyncExecutor.java} | 5 +- .../wrapper/AsyncProxyInternal.java | 14 +- .../wrapper/WrapperFactoryDefault.java | 34 +++-- .../wrapper/handlers/CommandRecordFactory.java | 52 ------- .../handlers/DomainObjectInvocationHandler.java | 65 ++++----- .../wrapper/handlers/ProxyGenerator.java | 8 +- .../wrapper/internal/CommandRecord.java | 84 ++++++++++++ .../ProxyCreatorTestUsingCodegenPlugin.java | 3 +- .../commandlog/applib/dom/BackgroundService.java | 4 +- 25 files changed, 317 insertions(+), 373 deletions(-) diff --cc core/metamodel/src/main/java/module-info.java index 7ca02366ac2,50a01928912..161ac62f94f --- a/core/metamodel/src/main/java/module-info.java +++ b/core/metamodel/src/main/java/module-info.java @@@ -170,5 -171,11 +170,6 @@@ open module org.apache.causeway.core.me requires spring.context; requires spring.core; requires spring.boot.autoconfigure; + requires org.jspecify; -//JUnit testing stuff, not required as long this module is an 'open' one -// opens org.apache.causeway.core.metamodel.services to spring.core; -// opens org.apache.causeway.core.metamodel.services.registry to spring.core; -// opens org.apache.causeway.core.metamodel.services.grid to jakarta.xml.bind; -// opens org.apache.causeway.core.metamodel.services.metamodel to jakarta.xml.bind; } diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedMember.java index d5d97d6aea0,b782d649867..036d664117b --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedMember.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ManagedMember.java @@@ -30,15 -32,15 +32,15 @@@ import org.apache.causeway.core.metamod import org.apache.causeway.core.metamodel.spec.feature.ObjectMember; import lombok.Getter; - import org.jspecify.annotations.NonNull; import lombok.RequiredArgsConstructor; import lombok.Setter; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; -@Log4j2 +@Slf4j @RequiredArgsConstructor - public abstract class ManagedMember - implements ManagedFeature { + public sealed abstract class ManagedMember + implements ManagedFeature + permits ManagedAction, ManagedCollection, ManagedProperty { /** * Some representations may vary according to whether the member is to be represented for read diff --cc core/metamodel/src/main/java/org/apache/causeway/core/metamodel/interactions/managed/ParameterNegotiationModel.java index efcc6d6b8dc,6dd112dc317..6a9d0286ea3 --- 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 @@@ -344,8 -344,7 +344,7 @@@ public final class ParameterNegotiation // -- INTERNAL HOLDER OF PARAMETER BINDABLES - @Slf4j - private record ParameterModel( - @Log4j2 record ParameterModel( ++ @Slf4j record ParameterModel( int paramIndex, @NonNull ObjectActionParameter metaModel, @NonNull ParameterNegotiationModel negotiationModel,
