You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/17 01:12:08 UTC
[isis] 32/36: ISIS-2264: isis.value.money.current ->
isis.legacy.value-types.money.current
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit b002abbfacf71f95470c14a56784b81ba6484707
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 17 01:57:03 2020 +0100
ISIS-2264: isis.value.money.current -> isis.legacy.value-types.money.current
---
.../toc/modules/mignotes/pages/migrating-to-2.0.0.adoc | 4 ++--
.../org/apache/isis/core/config/IsisConfiguration.java | 18 ++++++++----------
.../value/money/MoneyValueSemanticsProvider.java | 2 +-
3 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/antora/components/toc/modules/mignotes/pages/migrating-to-2.0.0.adoc b/antora/components/toc/modules/mignotes/pages/migrating-to-2.0.0.adoc
index 2d2ba0b..a2fdc1d 100644
--- a/antora/components/toc/modules/mignotes/pages/migrating-to-2.0.0.adoc
+++ b/antora/components/toc/modules/mignotes/pages/migrating-to-2.0.0.adoc
@@ -693,8 +693,8 @@ isis.value-types. +
{nbsp}{nbsp}java-sql.timestamp.format
-|
-|
+|isis.value.money.current
+|isis.legacy.value-types.money.current
|===
diff --git a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
index c06b369..b88ced0 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
@@ -1354,7 +1354,15 @@ public class IsisConfiguration {
public static class Percentage {
private String format;
}
+
+ private final Money money = new Money();
+ @Data
+ public static class Money {
+ private Optional<String> currency = Optional.empty();
+ }
}
+
+
}
//TODO no meta data yet ... https://docs.spring.io/spring-boot/docs/current/reference/html/appendix-configuration-metadata.html#configuration-metadata-property-attributes
@@ -1362,16 +1370,6 @@ public class IsisConfiguration {
@Data
public static class Value {
- private Map<String, String> format = new HashMap<>();
-
- public enum FormatIdentifier {
- }
-
- private final Money money = new Money();
- @Data
- public static class Money {
- private Optional<String> currency = Optional.empty();
- }
}
diff --git a/legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/money/MoneyValueSemanticsProvider.java b/legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/money/MoneyValueSemanticsProvider.java
index 75cf126..d550afc 100644
--- a/legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/money/MoneyValueSemanticsProvider.java
+++ b/legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/money/MoneyValueSemanticsProvider.java
@@ -80,7 +80,7 @@ implements MoneyValueFacet {
super(type(), holder, Money.class, TYPICAL_LENGTH, -1, Immutability.IMMUTABLE, EqualByContent.HONOURED, DEFAULT_VALUE);
defaultCurrencyCode =
- getConfiguration().getValue().getMoney().getCurrency()
+ getConfiguration().getLegacy().getValueTypes().getMoney().getCurrency()
.filter(_Strings::isNotEmpty)
.orElse(LOCAL_CURRENCY_CODE);
}