This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/main by this push:
new 5f967d57b47 CAUSEWAY-3942: filters _persistence_ methods early in the
_ClassCache
5f967d57b47 is described below
commit 5f967d57b473c0e44ca5a38fadc4cd5faef90878
Author: andi-huber <[email protected]>
AuthorDate: Wed Nov 12 07:54:44 2025 +0100
CAUSEWAY-3942: filters _persistence_ methods early in the _ClassCache
- reverts some changes from prev. commit
---
.../commons/internal/reflection/_ClassCache.java | 3 +-
core/metamodel/src/main/java/module-info.java | 1 -
...inkStaticWeaverPrefixedMethodsFacetFactory.java | 48 ----------------------
.../jpa/metamodel/JpaProgrammingModel.java | 17 +++-----
4 files changed, 8 insertions(+), 61 deletions(-)
diff --git
a/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_ClassCache.java
b/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_ClassCache.java
index ed101ad7bbd..50359d7f898 100644
---
a/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_ClassCache.java
+++
b/commons/src/main/java/org/apache/causeway/commons/internal/reflection/_ClassCache.java
@@ -440,7 +440,8 @@ public void close() throws Exception {
// -- UTILITY
public static boolean methodExcludeFilter(final Method method) {
- return method.isBridge()
+ return method.getName().startsWith("_persistence_") // EclispeLink
static weaving
+ || method.isBridge()
|| Modifier.isStatic(method.getModifiers())
|| method.getDeclaringClass().equals(Object.class)
|| (_Reflect.isNonFinalObjectMethod(method)
diff --git a/core/metamodel/src/main/java/module-info.java
b/core/metamodel/src/main/java/module-info.java
index 5794e6a268e..a5d00a19d97 100644
--- a/core/metamodel/src/main/java/module-info.java
+++ b/core/metamodel/src/main/java/module-info.java
@@ -140,7 +140,6 @@
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 static lombok;
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
deleted file mode 100644
index 5ba82c89126..00000000000
---
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/ignore/eclipselink/RemoveEclipseLinkStaticWeaverPrefixedMethodsFacetFactory.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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/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 de13cc4d1c8..0579efa6b5d 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,8 +18,6 @@
*/
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;
@@ -39,17 +37,14 @@ public class JpaProgrammingModel implements
MetaModelRefiner {
@Override
public void refineProgrammingModel(final ProgrammingModel pm) {
+ var step =
ProgrammingModel.FacetProcessingOrder.A2_AFTER_FALLBACK_DEFAULTS;
var mmc = pm.getMetaModelContext();
- 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);
+ 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);
}
