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/03 10:45:42 UTC
[isis] branch master updated: ISIS-2774: remove static comparator
memoization (instead inline)
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 bcd24bd ISIS-2774: remove static comparator memoization (instead inline)
bcd24bd is described below
commit bcd24bd293cfc324bf769768ca6720168b7484a8
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Sep 3 12:45:35 2021 +0200
ISIS-2774: remove static comparator memoization (instead inline)
---
.../title/annotation/TitleFacetViaTitleAnnotation.java | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
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 6048623..aa192e8 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
@@ -20,7 +20,6 @@
package org.apache.isis.core.metamodel.facets.object.title.annotation;
import java.lang.reflect.Method;
-import java.util.Comparator;
import java.util.List;
import java.util.Optional;
import java.util.function.BiConsumer;
@@ -42,7 +41,6 @@ import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
import org.apache.isis.core.metamodel.facets.object.title.TitleFacetAbstract;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import lombok.AccessLevel;
import lombok.Getter;
import lombok.NonNull;
import lombok.val;
@@ -61,7 +59,9 @@ implements ImperativeFacet {
Title.class,
TypeHierarchyPolicy.EXCLUDE,
InterfacePolicy.INCLUDE)
- .sorted(getSequenceComparator())
+ .sorted((eval1, eval2) -> _Comparators.deweyOrderCompare(
+ eval1.getAnnotation().sequence(),
+ eval2.getAnnotation().sequence()))
.map(TitleFacetViaTitleAnnotation.TitleComponent::of)
.collect(Can.toCan());
@@ -164,13 +164,6 @@ implements ImperativeFacet {
// -- HELPER
- // static comparator memoization
- @Getter(lazy = true, value = AccessLevel.PRIVATE)
- private static final Comparator<Evaluators.Evaluator<Title>> sequenceComparator =
- (eval1, eval2) -> _Comparators.deweyOrderCompare(
- eval1.getAnnotation().sequence(),
- eval2.getAnnotation().sequence());
-
private String titleOf(final ManagedObject adapter) {
if (adapter == null) {
return null;