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/06 10:46:21 UTC
[isis] 02/03: ISIS-2774: fixes lombok issue (java-17)
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 68c4288c8bedb0c510b90b495c0e53bb7dddd279
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Sep 6 10:54:28 2021 +0200
ISIS-2774: fixes lombok issue (java-17)
---
.../core/metamodel/facetapi/FacetAbstract.java | 23 +++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetAbstract.java
index f420be5..8576831 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetAbstract.java
@@ -82,15 +82,6 @@ implements Facet, HasMetaModelContext {
: String.format("%s[type=%s; %s]", className, ClassUtils.getShortName(facetType()), attributesAsString());
}
- private String attributesAsString() {
- val keyValuePairs = _Lists.<_Strings.KeyValuePair>newArrayList();
- visitAttributes((k, v)->keyValuePairs.add(_Strings.pair(k, ""+v)));
- return keyValuePairs.stream()
- .filter(kv->!kv.getKey().equals("facet")) // skip superfluous attribute
- .map(_Strings.KeyValuePair::toString)
- .collect(Collectors.joining("; "));
- }
-
@Override
public void visitAttributes(final BiConsumer<String, Object> visitor) {
visitor.accept("facet", ClassUtils.getShortName(getClass()));
@@ -146,5 +137,19 @@ implements Facet, HasMetaModelContext {
}
}
+ // -- HELPER
+
+ protected final Stream<_Strings.KeyValuePair> streamAttributes() {
+ final var keyValuePairs = _Lists.<_Strings.KeyValuePair>newArrayList();
+ visitAttributes((k, v)->keyValuePairs.add(_Strings.pair(k, ""+v)));
+ return keyValuePairs.stream();
+ }
+
+ private String attributesAsString() {
+ return streamAttributes()
+ .filter(kv->!kv.getKey().equals("facet")) // skip superfluous attribute
+ .map(_Strings.KeyValuePair::toString)
+ .collect(Collectors.joining("; "));
+ }
}