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:02 UTC
[isis] 26/36: ISIS-2264: further simplifications of temporal VSP's
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 9f1eb16f379f81ddd0c1286c090c6a2aca0ebdf2
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 17 01:23:55 2020 +0100
ISIS-2264: further simplifications of temporal VSP's
---
.../value/ValueSemanticsProviderAbstractTemporal.java | 12 ++----------
.../datetimejoda/JodaDateTimeValueSemanticsProvider.java | 14 +++-----------
.../JavaSqlTimeStampValueSemanticsProvider.java | 7 +------
3 files changed, 6 insertions(+), 27 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
index 8034053..0c96ee8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
@@ -321,11 +321,6 @@ implements DateValueFacet {
return getObjectManager().adapt(setDate(date));
}
-
- // //////////////////////////////////////////////////////////////////
- // temporal-specific stuff
- // //////////////////////////////////////////////////////////////////
-
protected abstract T add(T original, int years, int months, int days, int hours, int minutes);
protected void clearFields(final Calendar cal) {
@@ -349,11 +344,8 @@ implements DateValueFacet {
format.setLenient(false);
}
- protected boolean isEmpty() {
- return false;
- }
-
- @Override public void appendAttributesTo(final Map<String, Object> attributeMap) {
+ @Override
+ public void appendAttributesTo(final Map<String, Object> attributeMap) {
super.appendAttributesTo(attributeMap);
attributeMap.put("propertyType", propertyType);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProvider.java
index 312e2cf..a0f8fce 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProvider.java
@@ -35,7 +35,6 @@ import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.EncodingException;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal;
@@ -64,12 +63,9 @@ public class JodaDateTimeValueSemanticsProvider extends ValueSemanticsProviderAb
this(null);
}
- public JodaDateTimeValueSemanticsProvider(final FacetHolder holder) {
- this(holder, null);
- }
-
- private JodaDateTimeValueSemanticsProvider(final FacetHolder holder, final DateTime defaultValue) {
- this("date", holder, defaultValue);
+ public JodaDateTimeValueSemanticsProvider(
+ final FacetHolder holder) {
+ super("date", type(), holder, DateTime.class, 12, Immutability.IMMUTABLE, EqualByContent.HONOURED, null);
configuredFormat = getConfiguration().getValue().getFormat().getOrDefault("date", "medium").toLowerCase().trim();
@@ -84,10 +80,6 @@ public class JodaDateTimeValueSemanticsProvider extends ValueSemanticsProviderAb
}
}
- private JodaDateTimeValueSemanticsProvider(
- final String propertyType, final FacetHolder holder, final DateTime defaultValue) {
- super(propertyType, type(), holder, DateTime.class, 12, Immutability.IMMUTABLE, EqualByContent.HONOURED, defaultValue);
- }
// //////////////////////////////////////////////////////////////////
// temporal-specific stuff
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java
index 3404b8b..2b62cad 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/JavaSqlTimeStampValueSemanticsProvider.java
@@ -31,7 +31,6 @@ import java.util.TimeZone;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.parseable.InvalidEntryException;
import org.apache.isis.core.metamodel.facets.properties.defaults.PropertyDefaultFacet;
@@ -62,7 +61,7 @@ extends ValueSemanticsProviderAbstractTemporal<Timestamp> {
@SuppressWarnings("unchecked")
public JavaSqlTimeStampValueSemanticsProvider(final FacetHolder holder) {
- this(IsisConfiguration.Value.FormatIdentifier.TIMESTAMP, holder, 25, Immutability.NOT_IMMUTABLE, EqualByContent.NOT_HONOURED, null);
+ super("timestamp", type(), holder, java.sql.Timestamp.class, 25, Immutability.NOT_IMMUTABLE, EqualByContent.NOT_HONOURED, null);
configuredFormat = getConfiguration().getValue().getFormat().getOrDefault("timestamp", "short").toLowerCase().trim();
@@ -77,10 +76,6 @@ extends ValueSemanticsProviderAbstractTemporal<Timestamp> {
}
}
- private JavaSqlTimeStampValueSemanticsProvider(final IsisConfiguration.Value.FormatIdentifier formatIdentifier, final FacetHolder holder, final int typicalLength, final Immutability immutability, final EqualByContent equalByContent, final Timestamp defaultValue) {
- super(formatIdentifier.name().toLowerCase(), type(), holder, java.sql.Timestamp.class, typicalLength, immutability, equalByContent, defaultValue);
- }
-
@Override
protected Timestamp add(final Timestamp original, final int years, final int months, final int days, final int hours, final int minutes) {
return original;