This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch CAUSEWAY-3414 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 2a9dba9f79d93a3c4745883b336fc617c85ea19d Author: danhaywood <[email protected]> AuthorDate: Wed Apr 5 23:34:01 2023 +0200 CAUSEWAY-3414: ignores TableDecorator.Default --- .../java/org/apache/causeway/core/metamodel/util/Facets.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/util/Facets.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/util/Facets.java index ab084c835d..87452e2584 100644 --- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/util/Facets.java +++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/util/Facets.java @@ -341,13 +341,15 @@ public final class Facets { } private Optional<Class<? extends TableDecorator>> parentedTableDecorator( final FacetHolder facetHolder) { - return facetHolder.lookupFacet(CollectionLayoutTableDecoratorFacet.class) - .map(CollectionLayoutTableDecoratorFacet::value); + return (Optional) facetHolder.lookupFacet(CollectionLayoutTableDecoratorFacet.class) + .map(CollectionLayoutTableDecoratorFacet::value) + .filter(x -> x != TableDecorator.Default.class); } private Optional<Class<? extends TableDecorator>> standaloneTableDecorator( final FacetHolder facetHolder) { - return facetHolder.lookupFacet(DomainObjectLayoutTableDecoratorFacet.class) - .map(DomainObjectLayoutTableDecoratorFacet::value); + return (Optional)facetHolder.lookupFacet(DomainObjectLayoutTableDecoratorFacet.class) + .map(DomainObjectLayoutTableDecoratorFacet::value) + .filter(x -> x != TableDecorator.Default.class); } public Optional<ObjectSpecification> elementSpec(final FacetHolder facetHolder) {
