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/08 09:13:59 UTC
[isis] branch master updated: ISIS-2871: don't restrict digit
facets to BigDecimal type
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 0f862dd ISIS-2871: don't restrict digit facets to BigDecimal type
0f862dd is described below
commit 0f862dddb071a7060b785daae8f60021fe7ef238
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Nov 8 10:13:50 2021 +0100
ISIS-2871: don't restrict digit facets to BigDecimal type
---
.../value/semantics/ValueSemanticsAnnotationFacetFactory.java | 6 ++----
.../value/semantics/ValueSemanticsAnnotationFacetFactoryTest.java | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/ValueSemanticsAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/ValueSemanticsAnnotationFacetFactory.java
index ea2aee0..24e3e48 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/ValueSemanticsAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/semantics/ValueSemanticsAnnotationFacetFactory.java
@@ -52,13 +52,11 @@ extends FacetFactoryAbstract {
.addValidationFailure(processMethodContext.getFacetHolder(), ValueSemantics.class));
// support for @javax.validation.constraints.Digits
- val digitsIfAny = BigDecimal.class == processMethodContext.getMethod().getReturnType()
- ? processMethodContext
+ val digitsIfAny = processMethodContext
.synthesizeOnMethodOrMixinType(
Digits.class,
() -> MetaModelValidatorForAmbiguousMixinAnnotations
- .addValidationFailure(processMethodContext.getFacetHolder(), Digits.class))
- : Optional.<Digits>empty();
+ .addValidationFailure(processMethodContext.getFacetHolder(), Digits.class));
processAll(processMethodContext.getFacetHolder(), valueSemanticsIfAny, digitsIfAny);
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/semantics/ValueSemanticsAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/semantics/ValueSemanticsAnnotationFacetFactoryTest.java
index 85c230e..ff4e0f7 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/semantics/ValueSemanticsAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/semantics/ValueSemanticsAnnotationFacetFactoryTest.java
@@ -177,7 +177,7 @@ extends AbstractFacetFactoryTest {
assertDigitsFacets(facetedMethodParameter, 18, 4);
}
- // -- CONTRAINT MERGERS
+ // -- CONSTRAINT MERGERS
public void testMultipleAnnotationsMergedOnProperty() {
// given