You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/03/15 13:15:36 UTC
[isis] branch master updated: ISIS-1887 fix incompatible type cast
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new fecfd95 ISIS-1887 fix incompatible type cast
fecfd95 is described below
commit fecfd95fb3175ecda82ce75cf86a1dadcace2c60
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Mar 15 14:15:32 2018 +0100
ISIS-1887 fix incompatible type cast
---
.../facets/value/timestampsql/EpochMillis.java | 40 ----------------------
.../JavaSqlTimeStampValueSemanticsProvider.java | 4 +--
...> TimeStampValueSemanticsProviderAbstract.java} | 4 +--
3 files changed, 4 insertions(+), 44 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/EpochMillis.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/EpochMillis.java
deleted file mode 100644
index 0d5b883..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/EpochMillis.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.value.timestampsql;
-
-import java.util.Date;
-
-class EpochMillis {
-
- private final long epochMillis;
-
- public EpochMillis(long epochMillis) {
- this.epochMillis = epochMillis;
- }
-
- public long epochMillis() {
- return epochMillis;
- }
-
- public Date toJavaUtilDate() {
- return new Date(epochMillis);
- }
-
-}
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 6f0d3a9..1e3cfb8 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
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.facets.properties.defaults.PropertyDefault
import org.apache.isis.core.metamodel.services.ServicesInjector;
public class JavaSqlTimeStampValueSemanticsProvider
-extends EpochMillisValueSemanticsProviderAbstract<java.sql.Timestamp> {
+extends TimeStampValueSemanticsProviderAbstract<java.sql.Timestamp> {
public static final boolean isAPropertyDefaultFacet() {
return PropertyDefaultFacet.class.isAssignableFrom(JavaSqlTimeStampValueSemanticsProvider.class);
@@ -63,7 +63,7 @@ extends EpochMillisValueSemanticsProviderAbstract<java.sql.Timestamp> {
@Override
protected Date dateValue(final Object value) {
- return ((EpochMillis) value).toJavaUtilDate();
+ return new Date(((java.sql.Timestamp) value).getTime());
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/EpochMillisValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/TimeStampValueSemanticsProviderAbstract.java
similarity index 93%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/EpochMillisValueSemanticsProviderAbstract.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/TimeStampValueSemanticsProviderAbstract.java
index c9d5525..3516073 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/EpochMillisValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestampsql/TimeStampValueSemanticsProviderAbstract.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal;
import org.apache.isis.core.metamodel.services.ServicesInjector;
-abstract class EpochMillisValueSemanticsProviderAbstract<T> extends ValueSemanticsProviderAbstractTemporal<T> {
+abstract class TimeStampValueSemanticsProviderAbstract<T> extends ValueSemanticsProviderAbstractTemporal<T> {
private static final Object DEFAULT_VALUE = null; // no default
private static final int TYPICAL_LENGTH = 25;
@@ -42,7 +42,7 @@ abstract class EpochMillisValueSemanticsProviderAbstract<T> extends ValueSemanti
}
@SuppressWarnings("unchecked")
- public EpochMillisValueSemanticsProviderAbstract(final FacetHolder holder, final Class<T> adaptedClass, final ServicesInjector context) {
+ public TimeStampValueSemanticsProviderAbstract(final FacetHolder holder, final Class<T> adaptedClass, final ServicesInjector context) {
super("timestamp", holder, adaptedClass, TYPICAL_LENGTH, Immutability.NOT_IMMUTABLE, EqualByContent.NOT_HONOURED, (T) DEFAULT_VALUE, context);
final String formatRequired = getConfiguration().getString(ConfigurationConstants.ROOT + "value.format.timestamp");
if (formatRequired == null) {
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.