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 9e98b7f659 ISIS-3049: fixes LabelAtFacetFromLayoutConfiguration
creation
9e98b7f659 is described below
commit 9e98b7f6598d03ecbd870129301009f259735fa0
Author: Andi Huber <[email protected]>
AuthorDate: Tue Jun 28 19:41:20 2022 +0200
ISIS-3049: fixes LabelAtFacetFromLayoutConfiguration creation
---
.../core/metamodel/facetapi/FacetAbstract.java | 22 +---------------
.../isis/core/metamodel/facetapi/FacetUtil.java | 29 ++++++++++++++++++++++
.../facets/fallback/FallbackFacetFactory.java | 22 +++++-----------
3 files changed, 36 insertions(+), 37 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 43fda19f0e..13a137fd44 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
@@ -24,8 +24,6 @@ import java.util.stream.Stream;
import org.springframework.util.ClassUtils;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.context.HasMetaModelContext;
import org.apache.isis.core.metamodel.context.MetaModelContext;
@@ -72,10 +70,7 @@ implements Facet, HasMetaModelContext {
@Override
public String toString() {
- val className = ClassUtils.getShortName(getClass());
- return getClass() == facetType()
- ? String.format("%s[%s]", className, attributesAsString())
- : String.format("%s[type=%s; %s]", className,
ClassUtils.getShortName(facetType()), attributesAsString());
+ return FacetUtil.toString(this);
}
@Override
@@ -116,19 +111,4 @@ implements Facet, HasMetaModelContext {
.collect(Collectors.joining(delimiter));
}
- // -- 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("; "));
- }
-
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetUtil.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetUtil.java
index 5f0c95ccc3..e6724ff2ab 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetUtil.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/FacetUtil.java
@@ -21,9 +21,14 @@ package org.apache.isis.core.metamodel.facetapi;
import java.util.Optional;
import java.util.function.BiConsumer;
import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
import org.springframework.lang.Nullable;
+import org.springframework.util.ClassUtils;
+import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.util.snapshot.XmlSchema;
import lombok.NonNull;
@@ -131,5 +136,29 @@ public final class FacetUtil {
.ifPresent(ranking->ranking.purgeIf(facetType, filter));
}
+ // -- FACET ATTRIBUTES
+
+ public static String attributesAsString(final Facet facet) {
+ return streamAttributes(facet)
+ .filter(kv->!kv.getKey().equals("facet")) // skip superfluous
attribute
+ .map(_Strings.KeyValuePair::toString)
+ .collect(Collectors.joining("; "));
+ }
+
+ public static Stream<_Strings.KeyValuePair> streamAttributes(final Facet
facet) {
+ final var keyValuePairs = _Lists.<_Strings.KeyValuePair>newArrayList();
+ facet.visitAttributes((k, v)->keyValuePairs.add(_Strings.pair(k,
""+v)));
+ return keyValuePairs.stream();
+ }
+
+ // -- FACET TO STRING
+
+ public static String toString(final Facet facet) {
+ val className = ClassUtils.getShortName(facet.getClass());
+ val attributesAsString = attributesAsString(facet);
+ return facet.getClass() == facet.facetType()
+ ? String.format("%s[%s]", className, attributesAsString)
+ : String.format("%s[type=%s; %s]", className,
ClassUtils.getShortName(facet.facetType()), attributesAsString);
+ }
}
diff --git
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/FallbackFacetFactory.java
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/FallbackFacetFactory.java
index 655aa06ede..b0c97dafc1 100644
---
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/FallbackFacetFactory.java
+++
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/FallbackFacetFactory.java
@@ -23,11 +23,8 @@ import java.util.Map;
import javax.inject.Inject;
-import org.apache.isis.applib.annotation.LabelPosition;
-import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
@@ -89,7 +86,9 @@ public class FallbackFacetFactory extends
FacetFactoryAbstract {
if (featureType.isProperty()) {
addFacet(new MaxLengthFacetUnlimited(facetedMethod));
addFacet(new MultiLineFacetNone(facetedMethod));
- addFacet(newPropParamLayoutFacetIfAny(facetedMethod,
"propertyLayout",
getConfiguration().getApplib().getAnnotation().getPropertyLayout()));
+ addFacet(new LabelAtFacetFromLayoutConfiguration(
+
getConfiguration().getApplib().getAnnotation().getPropertyLayout().getLabelPosition(),
+ facetedMethod));
}
if (featureType.isAction()) {
// none
@@ -105,23 +104,14 @@ public class FallbackFacetFactory extends
FacetFactoryAbstract {
@Override
public void processParams(final ProcessParameterContext
processParameterContext) {
-
final TypedHolder typedHolder =
processParameterContext.getFacetHolder();
if (typedHolder.getFeatureType().isActionParameter()) {
addFacet(new MultiLineFacetNone(typedHolder));
addFacet(new MaxLengthFacetUnlimited(typedHolder));
-
- addFacet(newPropParamLayoutFacetIfAny(typedHolder,
"parameterLayout",
getConfiguration().getApplib().getAnnotation().getParameterLayout()));
+ addFacet(new LabelAtFacetFromLayoutConfiguration(
+
getConfiguration().getApplib().getAnnotation().getParameterLayout().getLabelPosition(),
+ typedHolder));
}
-
}
- private Facet newPropParamLayoutFacetIfAny(final FacetHolder facetHolder,
final String layoutKey, final
IsisConfiguration.Applib.Annotation.ConfigPropsForPropertyOrParameterLayout
configPropsHolder) {
- final LabelPosition labelPosition = from(configPropsHolder);
- return new LabelAtFacetFromLayoutConfiguration(labelPosition,
facetHolder);
- }
-
- private static LabelPosition from(final
IsisConfiguration.Applib.Annotation.ConfigPropsForPropertyOrParameterLayout
configPropsHolder) {
- return configPropsHolder.getLabelPosition();
- }
}
