This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch CAUSEWAY-3942 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit f247e3a0bacf021cd3b0475649f726b41ebecaa2 Author: Dan Haywood <[email protected]> AuthorDate: Tue Nov 11 09:43:54 2025 +0000 CAUSEWAY-3942: adds facet factory to remove _persistence_ methods introduced by EclipseLink static weaving --- core/metamodel/src/main/java/module-info.java | 1 + ...inkStaticWeaverPrefixedMethodsFacetFactory.java | 48 ++++++++++++++++++++++ .../jdo/metamodel/JdoProgrammingModel.java | 3 +- .../jpa/metamodel/JpaProgrammingModel.java | 17 +++++--- 4 files changed, 62 insertions(+), 7 deletions(-) diff --git a/core/metamodel/src/main/java/module-info.java b/core/metamodel/src/main/java/module-info.java index c2c7bf3e33f..5db67a24388 100644 --- a/core/metamodel/src/main/java/module-info.java +++ b/core/metamodel/src/main/java/module-info.java @@ -151,6 +151,7 @@ exports org.apache.causeway.core.metamodel.spi; exports org.apache.causeway.core.metamodel.services.deadlock; exports org.apache.causeway.core.metamodel.facets.object.autocomplete; + exports org.apache.causeway.core.metamodel.facets.object.ignore.eclipselink to org.apache.causeway.persistence.jdo.metamodel, org.apache.causeway.persistence.jpa.metamodel; requires jakarta.activation; requires jakarta.annotation; diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/eclipselink/RemoveEclipseLinkStaticWeaverPrefixedMethodsFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/eclipselink/RemoveEclipseLinkStaticWeaverPrefixedMethodsFacetFactory.java new file mode 100644 index 00000000000..5ba82c89126 --- /dev/null +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/eclipselink/RemoveEclipseLinkStaticWeaverPrefixedMethodsFacetFactory.java @@ -0,0 +1,48 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.causeway.core.metamodel.facets.object.ignore.eclipselink; + +import jakarta.inject.Inject; + +import org.apache.causeway.core.metamodel.context.MetaModelContext; +import org.apache.causeway.core.metamodel.facetapi.FeatureType; +import org.apache.causeway.core.metamodel.facets.FacetFactoryAbstract; + +/** + * Removes all methods inherited from <tt>javax.jdo.spi.PersistenceCapable</tt> (if JDO is on the classpath). + */ +public class RemoveEclipseLinkStaticWeaverPrefixedMethodsFacetFactory +extends FacetFactoryAbstract { + + @Inject + public RemoveEclipseLinkStaticWeaverPrefixedMethodsFacetFactory(final MetaModelContext mmc) { + super(mmc, FeatureType.OBJECTS_ONLY); + } + + @Override + public void process(final ProcessClassContext context) { + + getClassCache() + .streamPublicMethods(context.getCls()) + .filter(method->method.name().startsWith("_persistence_")) + .forEach(context::removeMethod); + + } + +} diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/JdoProgrammingModel.java b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/JdoProgrammingModel.java index d9c56e2317d..417bcf86a13 100644 --- a/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/JdoProgrammingModel.java +++ b/persistence/jdo/metamodel/src/main/java/org/apache/causeway/persistence/jdo/metamodel/JdoProgrammingModel.java @@ -52,9 +52,10 @@ public class JdoProgrammingModel implements MetaModelRefiner { @Override public void refineProgrammingModel(final ProgrammingModel pm) { - var step1 = ProgrammingModel.FacetProcessingOrder.C2_AFTER_METHOD_REMOVING; var mmc = pm.getMetaModelContext(); + var step1 = ProgrammingModel.FacetProcessingOrder.C2_AFTER_METHOD_REMOVING; + // come what may, we have to ignore the PersistenceCapable supertype. pm.addFactory(step1, new RemoveJdoEnhancementTypesFacetFactory(mmc), Marker.JDO); // so we may as well also just ignore any 'jdo' prefixed methods here also. diff --git a/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/JpaProgrammingModel.java b/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/JpaProgrammingModel.java index 0579efa6b5d..de13cc4d1c8 100644 --- a/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/JpaProgrammingModel.java +++ b/persistence/jpa/metamodel/src/main/java/org/apache/causeway/persistence/jpa/metamodel/JpaProgrammingModel.java @@ -18,6 +18,8 @@ */ package org.apache.causeway.persistence.jpa.metamodel; +import org.apache.causeway.core.metamodel.facets.object.ignore.eclipselink.RemoveEclipseLinkStaticWeaverPrefixedMethodsFacetFactory; + import org.springframework.stereotype.Component; import org.apache.causeway.core.metamodel.facetapi.MetaModelRefiner; @@ -37,14 +39,17 @@ public class JpaProgrammingModel implements MetaModelRefiner { @Override public void refineProgrammingModel(final ProgrammingModel pm) { - var step = ProgrammingModel.FacetProcessingOrder.A2_AFTER_FALLBACK_DEFAULTS; var mmc = pm.getMetaModelContext(); - pm.addFactory(step, new JpaTableAnnotationFacetFactory(mmc), Marker.JPA); - pm.addFactory(step, new JpaTransientAnnotationFacetFactory(mmc), Marker.JPA); - pm.addFactory(step, new MandatoryFromJpaColumnAnnotationFacetFactory(mmc), Marker.JPA); - pm.addFactory(step, new BigDecimalFromJpaColumnAnnotationFacetFactory(mmc), Marker.JPA); - pm.addFactory(step, new MaxLengthFromJpaColumnAnnotationFacetFactory(mmc), Marker.JPA); + var step1 = ProgrammingModel.FacetProcessingOrder.C2_AFTER_METHOD_REMOVING; + pm.addFactory(step1, new RemoveEclipseLinkStaticWeaverPrefixedMethodsFacetFactory(mmc), Marker.JPA); + + var step2 = ProgrammingModel.FacetProcessingOrder.A2_AFTER_FALLBACK_DEFAULTS; + pm.addFactory(step2, new JpaTableAnnotationFacetFactory(mmc), Marker.JPA); + pm.addFactory(step2, new JpaTransientAnnotationFacetFactory(mmc), Marker.JPA); + pm.addFactory(step2, new MandatoryFromJpaColumnAnnotationFacetFactory(mmc), Marker.JPA); + pm.addFactory(step2, new BigDecimalFromJpaColumnAnnotationFacetFactory(mmc), Marker.JPA); + pm.addFactory(step2, new MaxLengthFromJpaColumnAnnotationFacetFactory(mmc), Marker.JPA); }
