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:05 UTC
[isis] 29/36: ISIS-2264: isis.value.format.datetime ->
isis.value-types.java-util.date.format
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 fe146a143e5a92615c10e7bd4aacc36b8e0d2c09
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 17 01:31:58 2020 +0100
ISIS-2264: isis.value.format.datetime -> isis.value-types.java-util.date.format
---
.../toc/modules/mignotes/pages/migrating-to-2.0.0.adoc | 4 ++++
.../org/apache/isis/core/config/IsisConfiguration.java | 7 +++++++
.../dateutil/JavaUtilDateValueSemanticsProvider.java | 15 +++++----------
3 files changed, 16 insertions(+), 10 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 855cfa5..71083da 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
@@ -669,6 +669,10 @@ isis.value-types. +
isis.value-types. +
{nbsp}{nbsp}joda.date-time.format
+|isis.value.format["datetime"]
+|isis.value-types. +
+{nbsp}{nbsp}java-util.date.format
+
|
|
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 67c375c..9a251d6 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
@@ -1257,8 +1257,15 @@ public class IsisConfiguration {
@Data
public static class JavaUtil {
+ private final Date date = new Date();
+ @Data
+ public static class Date {
+ // lower case
+ private String format = "medium";
+ }
}
+
private final JavaSql javaSql = new JavaSql();
@Data
public static class JavaSql {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/dateutil/JavaUtilDateValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/dateutil/JavaUtilDateValueSemanticsProvider.java
index 4519a6a..fa131fc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/dateutil/JavaUtilDateValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/dateutil/JavaUtilDateValueSemanticsProvider.java
@@ -72,16 +72,11 @@ public class JavaUtilDateValueSemanticsProvider extends ValueSemanticsProviderAb
public JavaUtilDateValueSemanticsProvider(final FacetHolder holder) {
super("datetime", type(), holder, Date.class, 18, Immutability.NOT_IMMUTABLE, EqualByContent.NOT_HONOURED, null);
- configuredFormat = getConfiguration().getValue().getFormat().getOrDefault("datetime", "medium").toLowerCase().trim();
-
- buildFormat(configuredFormat);
-
- final String formatRequired = getConfiguration().getValue().getFormat().get("datetime");
-
- if (formatRequired == null) {
- format = formats().get("medium");
- } else {
- setMask(formatRequired);
+ final Map<String, DateFormat> formats = formats();
+ configuredFormat = getConfiguration().getValueTypes().getJavaUtil().getDate().getFormat();
+ format = formats.get(configuredFormat);
+ if (format == null) {
+ setMask(configuredFormat);
}
}