You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/09/10 19:56:08 UTC
[isis] branch master updated: ISIS-2870: fixes flipped filter logic
in title component processing
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 1c1b54f ISIS-2870: fixes flipped filter logic in title component processing
1c1b54f is described below
commit 1c1b54f068332e9ef2ee62d1894819a519d6b360
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Sep 10 21:55:59 2021 +0200
ISIS-2870: fixes flipped filter logic in title component processing
---
.../java/org/apache/isis/core/metamodel/facets/Evaluators.java | 2 +-
.../object/title/annotation/TitleFacetViaTitleAnnotation.java | 7 +++++--
.../viewer/wicket/exceldownload/ui/components/ExcelFileModel.java | 4 +---
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Evaluators.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Evaluators.java
index 50c79cf..9b75437 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Evaluators.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Evaluators.java
@@ -78,7 +78,7 @@ public final class Evaluators {
val methodEvaluators = streamMethodEvaluators(cls, memberFilter, classCache)
.collect(Can.toCan());
val fieldEvaluators = streamFieldEvaluators(cls, memberFilter, classCache)
- .filter(fieldEvaluator->fieldEvaluator.isSameAsAnyOf(methodEvaluators))
+ .filter(fieldEvaluator->!fieldEvaluator.isSameAsAnyOf(methodEvaluators))
.collect(Can.toCan());
return Stream.concat(
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
index 793183a..d8a3513 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
@@ -63,9 +63,9 @@ implements ImperativeFacet {
final @NonNull Class<?> cls,
final @NonNull FacetHolder holder){
- val titles = new ArrayDeque<Title>();
+ final var titles = new ArrayDeque<Title>();
- val titleComponents = Evaluators
+ final var titleComponents = Evaluators
.streamEvaluators(cls,
annotatedElement->isTitleComponent(annotatedElement, titles::addLast),
TypeHierarchyPolicy.EXCLUDE,
@@ -74,6 +74,8 @@ implements ImperativeFacet {
evaluator, holder, titles::removeLast))
.map(evaluator->TitleComponent.of(evaluator, titles.removeFirst()))
.collect(Can.toCan())
+ // fixes type hierarchy deep search duplicates
+ //.distinct((a, b)->a.getTitleEvaluator().name().equals(b.getTitleEvaluator().name()))
.sorted(TitleComponent::compareTo);
if (titleComponents.isEmpty()) {
@@ -233,6 +235,7 @@ implements ImperativeFacet {
@Override
public String toString() {
final List<String> parts = _Lists.newArrayList();
+ parts.add("evaluator=" + titleEvaluator.name());
if(prepend != null && !_Strings.isNullOrEmpty(prepend.trim())) {
parts.add("prepend=" + prepend);
}
diff --git a/extensions/vw/exceldownload/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/exceldownload/ui/components/ExcelFileModel.java b/extensions/vw/exceldownload/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/exceldownload/ui/components/ExcelFileModel.java
index 22a6b3e..2796934 100644
--- a/extensions/vw/exceldownload/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/exceldownload/ui/components/ExcelFileModel.java
+++ b/extensions/vw/exceldownload/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/exceldownload/ui/components/ExcelFileModel.java
@@ -30,7 +30,6 @@ import java.time.OffsetDateTime;
import java.util.Date;
import java.util.List;
import java.util.Optional;
-import java.util.function.UnaryOperator;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellStyle;
@@ -111,8 +110,7 @@ class ExcelFileModel extends LoadableDetachableModel<File> {
int i=0;
for (ObjectAssociation property : columnProperties) {
final Cell cell = row.createCell((short) i++);
- cell.setCellValue(property.getStaticOrCanonicalFriendlyName()
- .fold(UnaryOperator.identity(), UnaryOperator.identity()));
+ cell.setCellValue(property.getCanonicalFriendlyName());
}
final CellStyle dateCellStyle = createDateFormatCellStyle(wb);