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 2020/01/19 18:20:45 UTC
[isis] 02/02: ISIS-2223: dont check whether Optional is null
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
commit 2ccaf33242dc05d1a474cef68f7c6a40c929af52
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Jan 19 19:20:30 2020 +0100
ISIS-2223: dont check whether Optional is null
---
.../apache/isis/core/metamodel/facets/MethodFinderUtils.java | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodFinderUtils.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodFinderUtils.java
index 1619687..147dfeb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodFinderUtils.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodFinderUtils.java
@@ -171,12 +171,10 @@ public final class MethodFinderUtils {
final Class<? extends Annotation> annotationClass,
final Map<Class<?>, Optional<Method>> methods) {
- final Class<?> clz = pojo.getClass();
- Optional<Method> nullableMethod = methods.get(clz);
- if(nullableMethod == null) {
- nullableMethod = search(clz, annotationClass, methods);
- }
- return nullableMethod.orElse(null);
+ val clz = pojo.getClass();
+ val annotatedMethodIfAny =
+ methods.computeIfAbsent(clz, __->search(clz, annotationClass, methods));
+ return annotatedMethodIfAny.orElse(null);
}
private static Optional<Method> search(