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 ff29ea43eea9db4b639935f605813f5a8ee2e7da Merge: d812749ee10 5b27ef53007 Author: andi-huber <[email protected]> AuthorDate: Sun Jun 22 21:46:31 2025 +0200 Merge remote-tracking branch 'origin/main' into v4 .../wrapper/WrapperFactoryDefault.java | 8 +-- .../handlers/DomainObjectInvocationHandler.java | 71 +++++++++------------- .../wrapper/handlers/ProxyGenerator.java | 23 ++++--- 3 files changed, 44 insertions(+), 58 deletions(-) diff --cc core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java index b2159b312dd,3580a6ea3a4..6a2e4a4ecca --- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java +++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java @@@ -67,38 -64,28 +64,28 @@@ import org.apache.causeway.core.runtime import lombok.Getter; import lombok.SneakyThrows; - - import lombok.extern.slf4j.Slf4j; import lombok.experimental.Accessors; -import lombok.extern.log4j.Log4j2; ++import lombok.extern.slf4j.Slf4j; - /** - * - * @param <T> type of delegate - */ -@Log4j2 +@Slf4j - final class DomainObjectInvocationHandler<T> + final class DomainObjectInvocationHandler implements WrapperInvocationHandler { - @Getter(onMethod_ = {@Override}) @Accessors(fluent=true) + @Getter(onMethod_ = {@Override}) @Accessors(fluent=true) private final WrapperInvocationHandler.ClassMetaData classMetaData; - + private final ProxyGenerator proxyGenerator; - private final MetaModelContext mmc; - - private final EntityFacet entityFacet; private final ManagedObject mixeeAdapter; + private final ObjectSpecification targetSpec; DomainObjectInvocationHandler( - final Class<T> domainObjectClass, final ManagedObject mixeeAdapter, // ignored if not handling a mixin - final ManagedObject targetAdapter, + final ObjectSpecification targetSpec, final ProxyGenerator proxyGenerator) { - this.mmc = targetAdapter.objSpec().getMetaModelContext(); - this.classMetaData = WrapperInvocationHandler.ClassMetaData.of(domainObjectClass); + this.targetSpec = targetSpec; + this.classMetaData = WrapperInvocationHandler.ClassMetaData.of(targetSpec.getCorrespondingClass()); this.proxyGenerator = proxyGenerator; - - this.entityFacet = targetAdapter.objSpec().entityFacet().orElse(null); this.mixeeAdapter = mixeeAdapter; }
