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 10:02:17 UTC
[isis] branch master updated: ISIS-2871: adds facets for
minIntegerDigits and MinFractionalDigits
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 0719be2 ISIS-2871: adds facets for minIntegerDigits and MinFractionalDigits
0719be2 is described below
commit 0719be29626f49cf1eaa2ef4eb563969110c0bde
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Nov 7 11:02:10 2021 +0100
ISIS-2871: adds facets for minIntegerDigits and MinFractionalDigits
---
.../digits/MaxFractionalDigitsFacet.java | 4 +--
.../digits/MaxFractionalDigitsFacetAbstract.java | 2 +-
...itsFacet.java => MinFractionalDigitsFacet.java} | 13 ++++------
....java => MinFractionalDigitsFacetAbstract.java} | 30 ++++++++++------------
...DigitsFacet.java => MinIntegerDigitsFacet.java} | 13 ++++------
...act.java => MinIntegerDigitsFacetAbstract.java} | 30 ++++++++++------------
6 files changed, 41 insertions(+), 51 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacet.java
index ded9ec2..d8c556f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacet.java
@@ -24,8 +24,8 @@ import org.apache.isis.applib.annotation.ValueSemantics;
import org.apache.isis.core.metamodel.facetapi.Facet;
/**
- * The number of digits to the right of the decimal place (fractional part)
- * for this decimal.
+ * The maximum allowed number of digits to the right of the decimal place (fractional part)
+ * for this number.
*
* <p>
* For example:
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacetAbstract.java
index f723b11..6a4f3cd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacetAbstract.java
@@ -65,7 +65,7 @@ implements MaxFractionalDigitsFacet {
@Override
public void visitAttributes(final BiConsumer<String, Object> visitor) {
super.visitAttributes(visitor);
- visitor.accept("maximumFractionDigits", maxFractionalDigits <0
+ visitor.accept("maxFractionalDigits", maxFractionalDigits <0
? "unlimited"
: String.valueOf(maxFractionalDigits));
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MinFractionalDigitsFacet.java
similarity index 79%
copy from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacet.java
copy to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MinFractionalDigitsFacet.java
index ded9ec2..be36f9d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MinFractionalDigitsFacet.java
@@ -18,14 +18,12 @@
*/
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;
/**
- * The number of digits to the right of the decimal place (fractional part)
- * for this decimal.
+ * The minimum required number of digits to the right of the decimal place (fractional part)
+ * for this number.
*
* <p>
* For example:
@@ -35,13 +33,12 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
* <li><tt>12345.0</tt> has 1 fraction digit</li>
* </ul>
*/
-public interface MaxFractionalDigitsFacet
+public interface MinFractionalDigitsFacet
extends Facet {
/**
- * eg. as provided by {@link Digits#fraction()}
- * and {@link ValueSemantics#maxFractionalDigits()}
+ * eg. as provided by {@link ValueSemantics#minFractionalDigits()}
*/
- int getMaxFractionalDigits();
+ int getMinFractionalDigits();
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MinFractionalDigitsFacetAbstract.java
similarity index 69%
copy from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacetAbstract.java
copy to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MinFractionalDigitsFacetAbstract.java
index f723b11..36029ab 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MinFractionalDigitsFacetAbstract.java
@@ -27,47 +27,45 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import lombok.Getter;
import lombok.NonNull;
-public abstract class MaxFractionalDigitsFacetAbstract
+public abstract class MinFractionalDigitsFacetAbstract
extends FacetAbstract
-implements MaxFractionalDigitsFacet {
+implements MinFractionalDigitsFacet {
private static final Class<? extends Facet> type() {
- return MaxFractionalDigitsFacet.class;
+ return MinFractionalDigitsFacet.class;
}
@Getter(onMethod_ = {@Override})
- private final int maxFractionalDigits;
+ private final int minFractionalDigits;
- protected MaxFractionalDigitsFacetAbstract(
- final int maxFractionalDigits,
+ protected MinFractionalDigitsFacetAbstract(
+ final int minFractionalDigits,
final FacetHolder holder) {
super(type(), holder);
- this.maxFractionalDigits = maxFractionalDigits;
+ this.minFractionalDigits = minFractionalDigits;
}
- protected MaxFractionalDigitsFacetAbstract(
- final int maxFractionalDigits,
+ protected MinFractionalDigitsFacetAbstract(
+ final int minFractionalDigits,
final FacetHolder holder,
final Facet.Precedence precedence) {
super(type(), holder, precedence);
- this.maxFractionalDigits = maxFractionalDigits;
+ this.minFractionalDigits = minFractionalDigits;
}
@Override
public boolean semanticEquals(@NonNull final Facet other) {
- return other instanceof MaxFractionalDigitsFacet
+ return other instanceof MinFractionalDigitsFacet
? Integer.compare(
- this.getMaxFractionalDigits(),
- ((MaxFractionalDigitsFacet)other).getMaxFractionalDigits()) == 0
+ this.getMinFractionalDigits(),
+ ((MinFractionalDigitsFacet)other).getMinFractionalDigits()) == 0
: false;
}
@Override
public void visitAttributes(final BiConsumer<String, Object> visitor) {
super.visitAttributes(visitor);
- visitor.accept("maximumFractionDigits", maxFractionalDigits <0
- ? "unlimited"
- : String.valueOf(maxFractionalDigits));
+ visitor.accept("minFractionalDigits", String.valueOf(minFractionalDigits));
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MinIntegerDigitsFacet.java
similarity index 79%
copy from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacet.java
copy to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MinIntegerDigitsFacet.java
index ded9ec2..31e65f9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MinIntegerDigitsFacet.java
@@ -18,14 +18,12 @@
*/
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;
/**
- * The number of digits to the right of the decimal place (fractional part)
- * for this decimal.
+ * The minimum required number of digits to the left of the decimal place
+ * (integral/integer part) for this number.
*
* <p>
* For example:
@@ -35,13 +33,12 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
* <li><tt>12345.0</tt> has 1 fraction digit</li>
* </ul>
*/
-public interface MaxFractionalDigitsFacet
+public interface MinIntegerDigitsFacet
extends Facet {
/**
- * eg. as provided by {@link Digits#fraction()}
- * and {@link ValueSemantics#maxFractionalDigits()}
+ * eg. as provided by {@link ValueSemantics#minIntegerDigits()}
*/
- int getMaxFractionalDigits();
+ int getMinIntegerDigits();
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MinIntegerDigitsFacetAbstract.java
similarity index 69%
copy from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacetAbstract.java
copy to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MinIntegerDigitsFacetAbstract.java
index f723b11..787ff20 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MaxFractionalDigitsFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/digits/MinIntegerDigitsFacetAbstract.java
@@ -27,47 +27,45 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import lombok.Getter;
import lombok.NonNull;
-public abstract class MaxFractionalDigitsFacetAbstract
+public abstract class MinIntegerDigitsFacetAbstract
extends FacetAbstract
-implements MaxFractionalDigitsFacet {
+implements MinIntegerDigitsFacet {
private static final Class<? extends Facet> type() {
- return MaxFractionalDigitsFacet.class;
+ return MinIntegerDigitsFacet.class;
}
@Getter(onMethod_ = {@Override})
- private final int maxFractionalDigits;
+ private final int minIntegerDigits;
- protected MaxFractionalDigitsFacetAbstract(
- final int maxFractionalDigits,
+ protected MinIntegerDigitsFacetAbstract(
+ final int minIntegerDigits,
final FacetHolder holder) {
super(type(), holder);
- this.maxFractionalDigits = maxFractionalDigits;
+ this.minIntegerDigits = minIntegerDigits;
}
- protected MaxFractionalDigitsFacetAbstract(
- final int maxFractionalDigits,
+ protected MinIntegerDigitsFacetAbstract(
+ final int minIntegerDigits,
final FacetHolder holder,
final Facet.Precedence precedence) {
super(type(), holder, precedence);
- this.maxFractionalDigits = maxFractionalDigits;
+ this.minIntegerDigits = minIntegerDigits;
}
@Override
public boolean semanticEquals(@NonNull final Facet other) {
- return other instanceof MaxFractionalDigitsFacet
+ return other instanceof MinFractionalDigitsFacet
? Integer.compare(
- this.getMaxFractionalDigits(),
- ((MaxFractionalDigitsFacet)other).getMaxFractionalDigits()) == 0
+ this.getMinIntegerDigits(),
+ ((MinFractionalDigitsFacet)other).getMinFractionalDigits()) == 0
: false;
}
@Override
public void visitAttributes(final BiConsumer<String, Object> visitor) {
super.visitAttributes(visitor);
- visitor.accept("maximumFractionDigits", maxFractionalDigits <0
- ? "unlimited"
- : String.valueOf(maxFractionalDigits));
+ visitor.accept("minIntegerDigits", String.valueOf(minIntegerDigits));
}
}