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/11/12 13:28:32 UTC
[isis] branch master updated: ISIS-2882: fixes flipped logic in
prev. commit
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 a9c1cb7 ISIS-2882: fixes flipped logic in prev. commit
a9c1cb7 is described below
commit a9c1cb715c44b41631b7436233d0e9f38c7d0386
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Nov 12 14:28:24 2021 +0100
ISIS-2882: fixes flipped logic in prev. commit
---
...alDigitsFacetForPersistentBigDecimalWhenUnspecified.java | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacetForPersistentBigDecimalWhenUnspecified.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacetForPersistentBigDecimalWhenUnspecified.java
index b25be82..20f39e8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacetForPersistentBigDecimalWhenUnspecified.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacetForPersistentBigDecimalWhenUnspecified.java
@@ -51,15 +51,12 @@ extends MaxFractionalDigitsFacetAbstract {
val facetHolder = processMethodContext.getFacetHolder();
// only applies in a very specific context, see class java-doc
- if(facetHolder.getFeatureType().isProperty()
- || !processMethodContext.getMethod().getReturnType().equals(BigDecimal.class)
- || !beanTypeRegistry.getEntityTypes().contains(cls)) {
- return Optional.empty();
- }
+ val isApplicable = scaleIfAny.orElse(-1)<0
+ && facetHolder.getFeatureType().isProperty()
+ && processMethodContext.getMethod().getReturnType().equals(BigDecimal.class)
+ && beanTypeRegistry.getEntityTypes().contains(cls);
- final int scale = scaleIfAny.orElse(-1);
-
- return scale<0
+ return isApplicable
? Optional.of(new MaxFractionalDigitsFacetForPersistentBigDecimalWhenUnspecified(
facetHolder))
: Optional.empty();