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/07 09:47:51 UTC
[isis] branch master updated: ISIS-2871: aligns max fractional
digit facet names with annotation attr. names
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 f1f29f2 ISIS-2871: aligns max fractional digit facet names with annotation attr. names
f1f29f2 is described below
commit f1f29f2301944a4331ab3b35c52ce1a3d6770887
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Nov 7 10:47:43 2021 +0100
ISIS-2871: aligns max fractional digit facet names with annotation attr.
names
- basically what we already had couple days ago
---
.../apache/isis/applib/annotation/MinLength.java | 2 +-
.../isis/applib/annotation/ValueSemantics.java | 2 ++
...itsFacet.java => MaxFractionalDigitsFacet.java} | 6 +++--
....java => MaxFractionalDigitsFacetAbstract.java} | 30 +++++++++++-----------
.../objectvalue/digits/MaxTotalDigitsFacet.java | 2 ++
...rameterFromJavaxValidationDigitsAnnotation.java | 8 +++---
...ropertyFromJavaxValidationDigitsAnnotation.java | 8 +++---
.../valuesemantics/BigDecimalValueSemantics.java | 6 ++---
...ValidationDigitsAnnotationFacetFactoryTest.java | 6 ++---
...nferredFromJdoColumnAnnotationFacetFactory.java | 8 +++---
...axFractionDigitsFacetInferredFromJdoColumn.java | 8 +++---
...vedFromJdoColumnAnnotationFacetFactoryTest.java | 10 ++++----
...axFractionDigitsFacetInferredFromJpaColumn.java | 8 +++---
.../domainobjects/ObjectPropertyReprRenderer.java | 6 ++---
14 files changed, 58 insertions(+), 52 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/MinLength.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/MinLength.java
index 2afcfc2..b3503fe 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/MinLength.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/MinLength.java
@@ -26,7 +26,7 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * Specify the minimum number of characters for an autocomplete search argument.
+ * Specify the minimum number of characters for an auto-complete search argument.
* @since 1.x {@index}
*/
@Inherited
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/ValueSemantics.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/ValueSemantics.java
index 51f246a..c8986ba 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/ValueSemantics.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/ValueSemantics.java
@@ -45,6 +45,8 @@ public @interface ValueSemantics {
String provider()
default "";
+ // -- NUMBER CONSTRAINTS
+
/**
* EXPERIMENTAL - considered to be moved to a separate {@code @Digits} annotation<p>
* If associated with a {@link Number}, the minimum number of integer digits required for
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionDigitsFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacet.java
similarity index 87%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionDigitsFacet.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacet.java
index b33b718..ded9ec2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionDigitsFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacet.java
@@ -20,6 +20,7 @@ package org.apache.isis.core.metamodel.facets.objectvalue.digits;
import javax.validation.constraints.Digits;
+import org.apache.isis.applib.annotation.ValueSemantics;
import org.apache.isis.core.metamodel.facetapi.Facet;
/**
@@ -34,12 +35,13 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
* <li><tt>12345.0</tt> has 1 fraction digit</li>
* </ul>
*/
-public interface MaxFractionDigitsFacet
+public interface MaxFractionalDigitsFacet
extends Facet {
/**
* eg. as provided by {@link Digits#fraction()}
+ * and {@link ValueSemantics#maxFractionalDigits()}
*/
- int getMaximumFractionDigits();
+ int getMaxFractionalDigits();
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionDigitsFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacetAbstract.java
similarity index 68%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionDigitsFacetAbstract.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacetAbstract.java
index ddcec46..f723b11 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionDigitsFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacetAbstract.java
@@ -27,47 +27,47 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import lombok.Getter;
import lombok.NonNull;
-public abstract class MaxFractionDigitsFacetAbstract
+public abstract class MaxFractionalDigitsFacetAbstract
extends FacetAbstract
-implements MaxFractionDigitsFacet {
+implements MaxFractionalDigitsFacet {
private static final Class<? extends Facet> type() {
- return MaxFractionDigitsFacet.class;
+ return MaxFractionalDigitsFacet.class;
}
@Getter(onMethod_ = {@Override})
- private final int maximumFractionDigits;
+ private final int maxFractionalDigits;
- protected MaxFractionDigitsFacetAbstract(
- final int maximumFractionDigits,
+ protected MaxFractionalDigitsFacetAbstract(
+ final int maxFractionalDigits,
final FacetHolder holder) {
super(type(), holder);
- this.maximumFractionDigits = maximumFractionDigits;
+ this.maxFractionalDigits = maxFractionalDigits;
}
- protected MaxFractionDigitsFacetAbstract(
- final int maximumFractionDigits,
+ protected MaxFractionalDigitsFacetAbstract(
+ final int maxFractionalDigits,
final FacetHolder holder,
final Facet.Precedence precedence) {
super(type(), holder, precedence);
- this.maximumFractionDigits = maximumFractionDigits;
+ this.maxFractionalDigits = maxFractionalDigits;
}
@Override
public boolean semanticEquals(@NonNull final Facet other) {
- return other instanceof MaxFractionDigitsFacet
+ return other instanceof MaxFractionalDigitsFacet
? Integer.compare(
- this.getMaximumFractionDigits(),
- ((MaxFractionDigitsFacet)other).getMaximumFractionDigits()) == 0
+ this.getMaxFractionalDigits(),
+ ((MaxFractionalDigitsFacet)other).getMaxFractionalDigits()) == 0
: false;
}
@Override
public void visitAttributes(final BiConsumer<String, Object> visitor) {
super.visitAttributes(visitor);
- visitor.accept("maximumFractionDigits", maximumFractionDigits <0
+ visitor.accept("maximumFractionDigits", maxFractionalDigits <0
? "unlimited"
- : String.valueOf(maximumFractionDigits));
+ : String.valueOf(maxFractionalDigits));
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxTotalDigitsFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxTotalDigitsFacet.java
index 7263b63..0820591 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxTotalDigitsFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxTotalDigitsFacet.java
@@ -20,6 +20,7 @@ package org.apache.isis.core.metamodel.facets.objectvalue.digits;
import javax.validation.constraints.Digits;
+import org.apache.isis.applib.annotation.ValueSemantics;
import org.apache.isis.core.metamodel.facetapi.Facet;
/**
@@ -38,6 +39,7 @@ extends Facet {
/**
* eg. as provided by {@link Digits#fraction()}
+ * and {@link ValueSemantics#maxTotalDigits()}
*/
int maxTotalDigits();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/bigdecimal/javaxvaldigits/MaxFractionDigitsFacetOnParameterFromJavaxValidationDigitsAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/bigdecimal/javaxvaldigits/MaxFractionDigitsFacetOnParameterFromJavaxValidationDigitsAnnotation.java
index 1344999..56e5a12 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/bigdecimal/javaxvaldigits/MaxFractionDigitsFacetOnParameterFromJavaxValidationDigitsAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/bigdecimal/javaxvaldigits/MaxFractionDigitsFacetOnParameterFromJavaxValidationDigitsAnnotation.java
@@ -23,13 +23,13 @@ import java.util.Optional;
import javax.validation.constraints.Digits;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionDigitsFacet;
-import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionDigitsFacetAbstract;
+import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionalDigitsFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionalDigitsFacetAbstract;
public class MaxFractionDigitsFacetOnParameterFromJavaxValidationDigitsAnnotation
-extends MaxFractionDigitsFacetAbstract {
+extends MaxFractionalDigitsFacetAbstract {
- public static Optional<MaxFractionDigitsFacet> create(
+ public static Optional<MaxFractionalDigitsFacet> create(
final Optional<Digits> digitsIfAny,
final FacetHolder holder) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/bigdecimal/javaxvaldigits/MaxFractionDigitsFacetOnPropertyFromJavaxValidationDigitsAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/bigdecimal/javaxvaldigits/MaxFractionDigitsFacetOnPropertyFromJavaxValidationDigitsAnnotation.java
index 879f618..95a2a47 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/bigdecimal/javaxvaldigits/MaxFractionDigitsFacetOnPropertyFromJavaxValidationDigitsAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/bigdecimal/javaxvaldigits/MaxFractionDigitsFacetOnPropertyFromJavaxValidationDigitsAnnotation.java
@@ -23,13 +23,13 @@ import java.util.Optional;
import javax.validation.constraints.Digits;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionDigitsFacet;
-import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionDigitsFacetAbstract;
+import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionalDigitsFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionalDigitsFacetAbstract;
public class MaxFractionDigitsFacetOnPropertyFromJavaxValidationDigitsAnnotation
-extends MaxFractionDigitsFacetAbstract {
+extends MaxFractionalDigitsFacetAbstract {
- public static Optional<MaxFractionDigitsFacet> create(
+ public static Optional<MaxFractionalDigitsFacet> create(
final Optional<Digits> digitsIfAny,
final FacetHolder holder) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/BigDecimalValueSemantics.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/BigDecimalValueSemantics.java
index 61b1b9f..91ee64f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/BigDecimalValueSemantics.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/BigDecimalValueSemantics.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.adapters.Renderer;
import org.apache.isis.applib.adapters.ValueSemanticsAbstract;
import org.apache.isis.applib.adapters.ValueSemanticsProvider;
import org.apache.isis.applib.exceptions.UnrecoverableException;
-import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionDigitsFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionalDigitsFacet;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.schema.common.v2.ValueType;
@@ -124,8 +124,8 @@ implements
}
// evaluate any facets that provide the MaximumFractionDigits
- feature.lookupFacet(MaxFractionDigitsFacet.class).stream()
- .mapToInt(MaxFractionDigitsFacet::getMaximumFractionDigits)
+ feature.lookupFacet(MaxFractionalDigitsFacet.class).stream()
+ .mapToInt(MaxFractionalDigitsFacet::getMaxFractionalDigits)
.filter(digits->digits>-1)
.forEach(digits-> // cardinality 0 or 1
format.setMaximumFractionDigits(digits));
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/decimal/JavaxValidationDigitsAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/decimal/JavaxValidationDigitsAnnotationFacetFactoryTest.java
index 7a5ae20..aacfe56 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/decimal/JavaxValidationDigitsAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/decimal/JavaxValidationDigitsAnnotationFacetFactoryTest.java
@@ -29,7 +29,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionDigitsFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionalDigitsFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxTotalDigitsFacet;
import org.apache.isis.core.metamodel.facets.param.bigdecimal.javaxvaldigits.BigDecimalFacetOnParameterFromJavaxValidationAnnotationFactory;
import org.apache.isis.core.metamodel.facets.param.bigdecimal.javaxvaldigits.MaxFractionDigitsFacetOnParameterFromJavaxValidationDigitsAnnotation;
@@ -92,11 +92,11 @@ extends AbstractFacetFactoryTest {
}
if(maxFractionalDigits>=0) {
- final MaxFractionDigitsFacet facet = facetedMethod.getFacet(MaxFractionDigitsFacet.class);
+ final MaxFractionalDigitsFacet facet = facetedMethod.getFacet(MaxFractionalDigitsFacet.class);
assertNotNull(facet);
assertTrue(facet instanceof MaxFractionDigitsFacetOnPropertyFromJavaxValidationDigitsAnnotation
||facet instanceof MaxFractionDigitsFacetOnParameterFromJavaxValidationDigitsAnnotation);
- assertThat(facet.getMaximumFractionDigits(), is(maxFractionalDigits));
+ assertThat(facet.getMaxFractionalDigits(), is(maxFractionalDigits));
}
}
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalInferredFromJdoColumnAnnotationFacetFactory.java b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalInferredFromJdoColumnAnnotationFacetFactory.java
index b7c110f..bb921c5 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalInferredFromJdoColumnAnnotationFacetFactory.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalInferredFromJdoColumnAnnotationFacetFactory.java
@@ -29,7 +29,7 @@ import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
-import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionDigitsFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionalDigitsFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxTotalDigitsFacet;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.spec.feature.MixedIn;
@@ -104,10 +104,10 @@ implements MetaModelRefiner {
b.getClass().getSimpleName());
}));
- association.lookupFacet(MaxFractionDigitsFacet.class)
- .map(MaxFractionDigitsFacet::getSharedFacetRankingElseFail)
+ association.lookupFacet(MaxFractionalDigitsFacet.class)
+ .map(MaxFractionalDigitsFacet::getSharedFacetRankingElseFail)
.ifPresent(facetRanking->facetRanking
- .visitTopRankPairsSemanticDiffering(MaxFractionDigitsFacet.class, (a, b)->{
+ .visitTopRankPairsSemanticDiffering(MaxFractionalDigitsFacet.class, (a, b)->{
ValidationFailure.raiseFormatted(
association,
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxFractionDigitsFacetInferredFromJdoColumn.java b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxFractionDigitsFacetInferredFromJdoColumn.java
index 7bdce6a..87aa6a3 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxFractionDigitsFacetInferredFromJdoColumn.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxFractionDigitsFacetInferredFromJdoColumn.java
@@ -23,13 +23,13 @@ import java.util.Optional;
import javax.jdo.annotations.Column;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionDigitsFacet;
-import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionDigitsFacetAbstract;
+import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionalDigitsFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionalDigitsFacetAbstract;
public class MaxFractionDigitsFacetInferredFromJdoColumn
-extends MaxFractionDigitsFacetAbstract {
+extends MaxFractionalDigitsFacetAbstract {
- public static Optional<MaxFractionDigitsFacet> create(
+ public static Optional<MaxFractionalDigitsFacet> create(
final Optional<Column> jdoColumnIfAny,
final FacetHolder holder) {
diff --git a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java
index 9f55c77..79c07b1 100644
--- a/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java
+++ b/persistence/jdo/metamodel/src/test/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java
@@ -26,9 +26,9 @@ import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.isis.core.metamodel._testing.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionDigitsFacet;
-import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxTotalDigitsFacet;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
+import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionalDigitsFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxTotalDigitsFacet;
import org.apache.isis.persistence.jdo.metamodel.testing.AbstractFacetFactoryTest;
import lombok.val;
@@ -112,12 +112,12 @@ extends AbstractFacetFactoryTest {
}
if(maxFractionalDigits>=0) {
- final MaxFractionDigitsFacet facet = facetedMethod.getFacet(MaxFractionDigitsFacet.class);
+ final MaxFractionalDigitsFacet facet = facetedMethod.getFacet(MaxFractionalDigitsFacet.class);
assertNotNull(facet);
assertTrue(facet instanceof MaxFractionDigitsFacetInferredFromJdoColumn);
- assertThat(facet.getMaximumFractionDigits(), is(maxFractionalDigits));
+ assertThat(facet.getMaxFractionalDigits(), is(maxFractionalDigits));
} else {
- assertNull(facetedMethod.getFacet(MaxFractionDigitsFacet.class));
+ assertNull(facetedMethod.getFacet(MaxFractionalDigitsFacet.class));
}
}
diff --git a/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MaxFractionDigitsFacetInferredFromJpaColumn.java b/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MaxFractionDigitsFacetInferredFromJpaColumn.java
index 5717b2a..e94cfdd 100644
--- a/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MaxFractionDigitsFacetInferredFromJpaColumn.java
+++ b/persistence/jpa/metamodel/src/main/java/org/apache/isis/persistence/jpa/metamodel/facets/prop/column/MaxFractionDigitsFacetInferredFromJpaColumn.java
@@ -23,13 +23,13 @@ import java.util.Optional;
import javax.persistence.Column;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionDigitsFacet;
-import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionDigitsFacetAbstract;
+import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionalDigitsFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionalDigitsFacetAbstract;
public class MaxFractionDigitsFacetInferredFromJpaColumn
-extends MaxFractionDigitsFacetAbstract {
+extends MaxFractionalDigitsFacetAbstract {
- public static Optional<MaxFractionDigitsFacet> create(
+ public static Optional<MaxFractionalDigitsFacet> create(
final Optional<Column> jpaColumnIfAny,
final FacetHolder holder) {
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
index 4ae5e75..e5d3bec 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.collections.collection.defaultview.DefaultViewFacet;
import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
-import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionDigitsFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionalDigitsFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxTotalDigitsFacet;
import org.apache.isis.core.metamodel.interactions.managed.ManagedProperty;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
@@ -107,8 +107,8 @@ extends AbstractObjectMemberReprRenderer<OneToOneAssociation> {
.map(MaxTotalDigitsFacet::maxTotalDigits)
.orElse(-1);
- final int scale = lookupFacet(MaxFractionDigitsFacet.class, facetHolders)
- .map(MaxFractionDigitsFacet::getMaximumFractionDigits)
+ final int scale = lookupFacet(MaxFractionalDigitsFacet.class, facetHolders)
+ .map(MaxFractionalDigitsFacet::getMaxFractionalDigits)
.orElse(-1);
format = String.format("big-decimal(%d,%d)", totalDigits, scale);