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:06 UTC
[isis] 30/36: ISIS-2264: isis.value.format["time"] ->
isis.value-types.java-sql.time.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 9ce41ccdc2161417dd495c7a04d941f5f4127bd8
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 17 01:34:41 2020 +0100
ISIS-2264: isis.value.format["time"] -> isis.value-types.java-sql.time.format
---
.../modules/mignotes/pages/migrating-to-2.0.0.adoc | 7 +++++--
.../apache/isis/core/config/IsisConfiguration.java | 19 +++++++++----------
.../timesql/JavaSqlTimeValueSemanticsProvider.java | 14 +++++---------
3 files changed, 19 insertions(+), 21 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 71083da..2edbad4 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
@@ -662,6 +662,9 @@ isis.value-types. +
isis.value-types. +
{nbsp}{nbsp}java-time.offset-date-time.format
+isis.value-types. +
+{nbsp}{nbsp}java-util.date.format
+
|isis.value.format["date"]
|isis.value-types. +
{nbsp}{nbsp}java-sql.date.format
@@ -669,9 +672,9 @@ isis.value-types. +
isis.value-types. +
{nbsp}{nbsp}joda.date-time.format
-|isis.value.format["datetime"]
+|isis.value.format["time"]
|isis.value-types. +
-{nbsp}{nbsp}java-util.date.format
+{nbsp}{nbsp}java-sql.time.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 9a251d6..8342ad4 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
@@ -1275,6 +1275,13 @@ public class IsisConfiguration {
// lower case
private String format = "medium";
}
+ private final Time time = new Time();
+ @Data
+ public static class Time {
+ // lower case
+ private String format = "short";
+ }
+
}
private final Joda joda = new Joda();
@@ -1283,6 +1290,8 @@ public class IsisConfiguration {
private final LocalDateTime localDateTime = new LocalDateTime();
@Data
public static class LocalDateTime {
+ // lower case
+ private String format = "medium";
}
private final DateTime dateTime = new DateTime();
@Data
@@ -1317,16 +1326,6 @@ public class IsisConfiguration {
public enum FormatIdentifier {
/**
- * Key to indicate how LocalDateTime should be parsed/rendered.
- * <p>
- * eg: {@code isis.value.format.datetime=iso}
- * <p>
- * A pre-determined list of values is available, specifically 'iso_encoding', 'iso' and 'medium' (see
- * <code>org.apache.isis.core.metamodel.facets.value.datetimejdk8local.Jdk8LocalDateTimeValueSemanticsProvider#NAMED_TITLE_FORMATTERS</code>).
- * Alternatively, can also specify a mask, eg <tt>dd-MMM-yyyy</tt>.
- */
- DATETIME,
- /**
* Key to indicate how LocalDate should be parsed/rendered.
* <p>
* eg: {@code isis.value.format.date=iso}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timesql/JavaSqlTimeValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timesql/JavaSqlTimeValueSemanticsProvider.java
index 6291de1..cbed5c5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timesql/JavaSqlTimeValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timesql/JavaSqlTimeValueSemanticsProvider.java
@@ -63,15 +63,11 @@ public class JavaSqlTimeValueSemanticsProvider extends ValueSemanticsProviderAbs
public JavaSqlTimeValueSemanticsProvider(final FacetHolder holder) {
super("time", type(), holder, java.sql.Time.class, 8, Immutability.NOT_IMMUTABLE, EqualByContent.NOT_HONOURED, null);
- configuredFormat = getConfiguration().getValue().getFormat().getOrDefault("time", "short").toLowerCase().trim();
-
- buildFormat(configuredFormat);
-
- final String formatRequired = getConfiguration().getValue().getFormat().get("time");
- if (formatRequired == null) {
- format = formats().get("short");
- } else {
- setMask(formatRequired);
+ final Map<String, DateFormat> formats = formats();
+ configuredFormat = getConfiguration().getValueTypes().getJavaSql().getTime().getFormat();
+ format = formats.get(configuredFormat);
+ if (format == null) {
+ setMask(configuredFormat);
}
}