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 3e789cabce60508c509c01a31c079dd7f6bc6c31
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 16 23:29:22 2020 +0100
ISIS-2264: isis.value.format["percentage"] -> isis.legacy.value-types.percentage.format
---
.../toc/modules/mignotes/pages/migrating-to-2.0.0.adoc | 4 ++++
.../adoc/modules/config/pages/configuration-properties.adoc | 3 ---
.../java/org/apache/isis/core/config/IsisConfiguration.java | 13 +++++++++++++
.../value/percentage/PercentageValueSemanticsProvider.java | 3 +--
4 files changed, 18 insertions(+), 5 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 77b9f50..bf2af81 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
@@ -648,6 +648,10 @@ isis.value-types. +
|isis.value-types. +
{nbsp}{nbsp}java-lang.short.format
+|isis.value.format["percentage"]
+|isis.legacy.value-types. +
+{nbsp}{nbsp}percentage.format
+
|
|
diff --git a/core/config/src/main/adoc/modules/config/pages/configuration-properties.adoc b/core/config/src/main/adoc/modules/config/pages/configuration-properties.adoc
index f11a111..ab110fa 100644
--- a/core/config/src/main/adoc/modules/config/pages/configuration-properties.adoc
+++ b/core/config/src/main/adoc/modules/config/pages/configuration-properties.adoc
@@ -244,7 +244,6 @@ include::refguide:config:example$generated/isis.incubator.adoc[]
endif::[]
-ifdef::env-this-stuff-is-currently-disabled[]
== Legacy
@@ -259,8 +258,6 @@ include::refguide:config:example$generated/isis.legacy.adoc[]
|===
-endif::[]
-
== 3rd Party
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 f32a5ec..2d35f48 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
@@ -1253,8 +1253,21 @@ public class IsisConfiguration {
public static class Joda {
}
+ }
+ private final Legacy legacy = new Legacy();
+ @Data
+ public static class Legacy {
+ private final ValueTypes valueTypes = new ValueTypes();
+ @Data
+ public static class ValueTypes {
+ private final Percentage percentage = new Percentage();
+ @Data
+ public static class Percentage {
+ private String format;
+ }
+ }
}
//TODO no meta data yet ... https://docs.spring.io/spring-boot/docs/current/reference/html/appendix-configuration-metadata.html#configuration-metadata-property-attributes
diff --git a/legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java b/legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java
index 84272e8..e9b50ad 100644
--- a/legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java
+++ b/legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java
@@ -61,8 +61,7 @@ implements FloatingPointValueFacet {
public PercentageValueSemanticsProvider(final FacetHolder holder) {
super(type(), holder, Percentage.class, TYPICAL_LENGTH, -1, Immutability.IMMUTABLE, EqualByContent.HONOURED, DEFAULT_VALUE);
- final String formatRequired = getConfiguration()
- .getValue().getFormatOrElse(FormatIdentifier.PERCENTAGE, null);
+ final String formatRequired = getConfiguration().getLegacy().getValueTypes().getPercentage().getFormat();
if (formatRequired == null) {
format = PERCENTAGE_FORMAT;