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 2022/08/02 10:31:07 UTC
[isis] branch master updated: ISIS-3105: adds temporal to string conversion tests
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 7b6d82acc5 ISIS-3105: adds temporal to string conversion tests
7b6d82acc5 is described below
commit 7b6d82acc51bade79ddbbf87d52f3319633935a2
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Aug 2 12:30:59 2022 +0200
ISIS-3105: adds temporal to string conversion tests
---
.../internal/base/{_Times.java => _Temporals.java} | 12 ++--
.../commons/internal/debug/xray/XrayDataModel.java | 4 +-
.../isis/commons/internal/base/TemporalsTest.java | 74 ++++++++++++++++++++++
.../commandlog/applib/dom/CommandLogEntry.java | 4 +-
.../executionlog/applib/dom/ExecutionLogEntry.java | 4 +-
.../applib/dom/ExecutionOutboxEntry.java | 4 +-
.../audittrail/applib/dom/AuditTrailEntry.java | 4 +-
.../sessionlog/applib/dom/SessionLogEntry.java | 4 +-
.../time/OffsetDateTimeConverterForJdo.java | 6 +-
.../time/OffsetTimeConverterForJdo.java | 6 +-
.../time/ZonedDateTimeConverterForJdo.java | 6 +-
.../java/time/OffsetDateTimeConverterForJpa.java | 6 +-
.../java/time/OffsetTimeConverterForJpa.java | 6 +-
.../java/time/ZonedDateTimeConverterForJpa.java | 6 +-
14 files changed, 110 insertions(+), 36 deletions(-)
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/base/_Times.java b/commons/src/main/java/org/apache/isis/commons/internal/base/_Temporals.java
similarity index 96%
rename from commons/src/main/java/org/apache/isis/commons/internal/base/_Times.java
rename to commons/src/main/java/org/apache/isis/commons/internal/base/_Temporals.java
index 9363389eba..39a0665e40 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/base/_Times.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/base/_Temporals.java
@@ -44,7 +44,7 @@ import lombok.experimental.UtilityClass;
* @since 2.0
*/
@UtilityClass
-public final class _Times {
+public final class _Temporals {
/**
* The default date/time format (seconds resolution): {@code 'yyyy-MM-dd HH:mm:ss'}.
@@ -82,19 +82,19 @@ public final class _Times {
DateTimeFormatter.ofPattern("HH:mm:ss.SSSSSSSSS XXX");
private static final DateTimeFormatter OFFSETTIME_DATASTORE_PARSER =
- DateTimeFormatter.ofPattern("HH:mm:ss[.SSSSSSSSS] [XXX][X]");
+ DateTimeFormatter.ofPattern("HH:mm:ss[.SSSSSSSSS][ XXX]");
private static final DateTimeFormatter OFFSETDATETIME_DATASTORE_FORMATTER =
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSSSSS XXX");
private static final DateTimeFormatter OFFSETDATETIME_DATASTORE_PARSER =
- DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss[.SSSSSSSSS] [XXX][X]");
+ DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss[.SSSSSSSSS][ XXX]");
private static final DateTimeFormatter ZONEDDATETIME_DATASTORE_FORMATTER =
- DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSSSSS V");
+ DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSSSSS VV");
private static final DateTimeFormatter ZONEDDATETIME_DATASTORE_PARSER =
- DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss[.SSSSSSSSS] [V]");
+ DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss[.SSSSSSSSS][ VV]");
/**
@@ -160,7 +160,7 @@ public final class _Times {
// -- HELPER
- private static BigDecimal millisToSeconds(final long millis) {
+ private BigDecimal millisToSeconds(final long millis) {
return new BigDecimal(millis)
.movePointLeft(3)
.setScale(3, RoundingMode.HALF_EVEN);
diff --git a/commons/src/main/java/org/apache/isis/commons/internal/debug/xray/XrayDataModel.java b/commons/src/main/java/org/apache/isis/commons/internal/debug/xray/XrayDataModel.java
index ab80f30ce7..955c2b859e 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/debug/xray/XrayDataModel.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/debug/xray/XrayDataModel.java
@@ -36,7 +36,7 @@ import javax.swing.JScrollPane;
import org.apache.isis.commons.functional.IndexedConsumer;
import org.apache.isis.commons.internal.base._Refs;
-import org.apache.isis.commons.internal.base._Times;
+import org.apache.isis.commons.internal.base._Temporals;
import org.apache.isis.commons.internal.debug.xray.XrayModel.HasIdAndLabel;
import org.apache.isis.commons.internal.debug.xray.XrayModel.Stickiness;
import org.apache.isis.commons.internal.debug.xray.graphics.SequenceDiagram;
@@ -124,7 +124,7 @@ public abstract class XrayDataModel extends HasIdAndLabel {
logMessagePane.setEditable(false);
logMessagePane.setText(logMessage);
- val timestampLabel = new JLabel(timestamp.format(_Times.DEFAULT_LOCAL_DATETIME_FORMATTER_WITH_MILLIS));
+ val timestampLabel = new JLabel(timestamp.format(_Temporals.DEFAULT_LOCAL_DATETIME_FORMATTER_WITH_MILLIS));
panel2.add(
_SwingUtil.verticalBox(
diff --git a/commons/src/test/java/org/apache/isis/commons/internal/base/TemporalsTest.java b/commons/src/test/java/org/apache/isis/commons/internal/base/TemporalsTest.java
new file mode 100644
index 0000000000..600aeaa914
--- /dev/null
+++ b/commons/src/test/java/org/apache/isis/commons/internal/base/TemporalsTest.java
@@ -0,0 +1,74 @@
+/*
+ * 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.commons.internal.base;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.OffsetDateTime;
+import java.time.OffsetTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import lombok.val;
+
+class TemporalsTest {
+
+ @Test
+ void roundtripOffsetTime() {
+ val temporal = OffsetTime.of(sampleTime(), sampleOffset());
+ assertEquals(temporal, _Temporals.destringAsOffsetTime(_Temporals.enstringOffsetTime(temporal)));
+ }
+
+ @Test
+ void roundtripOffsetDateTime() {
+ val temporal = OffsetDateTime.of(sampleDate(), sampleTime(), sampleOffset());
+ assertEquals(temporal, _Temporals.destringAsOffsetDateTime(_Temporals.enstringOffsetDateTime(temporal)));
+ }
+
+ @Test
+ void roundtripZonedDateTime() {
+ val temporal = ZonedDateTime.of(sampleDate(), sampleTime(), sampleZone());
+ assertEquals(temporal, _Temporals.destringAsZonedDateTime(_Temporals.enstringZonedDateTime(temporal)));
+ }
+
+ // -- HELPER
+
+ private static LocalDate sampleDate() {
+ return LocalDate.of(2022, 8, 2);
+ }
+
+ private static LocalTime sampleTime() {
+ return LocalTime.of(2, 3, 4, 5);
+ }
+
+ private static ZoneOffset sampleOffset() {
+ return ZoneOffset.ofHoursMinutes(6, 7);
+ }
+
+ private static ZoneId sampleZone() {
+ return ZoneId.of("Europe/Paris");
+ }
+
+
+}
diff --git a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/dom/CommandLogEntry.java b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/dom/CommandLogEntry.java
index b56503b736..e865155e06 100644
--- a/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/dom/CommandLogEntry.java
+++ b/extensions/core/commandlog/applib/src/main/java/org/apache/isis/extensions/commandlog/applib/dom/CommandLogEntry.java
@@ -61,7 +61,7 @@ import org.apache.isis.applib.util.TitleBuffer;
import org.apache.isis.applib.util.ToString;
import org.apache.isis.commons.functional.Try;
import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.base._Times;
+import org.apache.isis.commons.internal.base._Temporals;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.extensions.commandlog.applib.IsisModuleExtCommandLogApplib;
import org.apache.isis.schema.cmd.v2.CommandDto;
@@ -428,7 +428,7 @@ implements Comparable<CommandLogEntry>, DomainChangeRecord, HasCommandDto {
@Digits(integer=5, fraction=3)
@Duration
public BigDecimal getDuration() {
- return _Times.secondsBetweenAsDecimal(getStartedAt(), getCompletedAt())
+ return _Temporals.secondsBetweenAsDecimal(getStartedAt(), getCompletedAt())
.orElse(null);
}
diff --git a/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/dom/ExecutionLogEntry.java b/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/dom/ExecutionLogEntry.java
index c9602ff625..6063c4cdd5 100644
--- a/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/dom/ExecutionLogEntry.java
+++ b/extensions/core/executionlog/applib/src/main/java/org/apache/isis/extensions/executionlog/applib/dom/ExecutionLogEntry.java
@@ -58,7 +58,7 @@ import org.apache.isis.applib.services.tablecol.TableColumnOrderForCollectionTyp
import org.apache.isis.applib.util.ObjectContracts;
import org.apache.isis.applib.util.TitleBuffer;
import org.apache.isis.applib.util.ToString;
-import org.apache.isis.commons.internal.base._Times;
+import org.apache.isis.commons.internal.base._Temporals;
import org.apache.isis.extensions.executionlog.applib.IsisModuleExtExecutionLogApplib;
import org.apache.isis.schema.ixn.v2.InteractionDto;
import org.apache.isis.schema.ixn.v2.MemberExecutionDto;
@@ -421,7 +421,7 @@ implements Comparable<ExecutionLogEntry>, DomainChangeRecord, HasInteractionIdAn
*/
@Duration
public BigDecimal getDuration() {
- return _Times.secondsBetweenAsDecimal(getStartedAt(), getCompletedAt())
+ return _Temporals.secondsBetweenAsDecimal(getStartedAt(), getCompletedAt())
.orElse(null);
}
diff --git a/extensions/core/executionoutbox/applib/src/main/java/org/apache/isis/extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.java b/extensions/core/executionoutbox/applib/src/main/java/org/apache/isis/extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.java
index 52bda2a970..b16b69de4f 100644
--- a/extensions/core/executionoutbox/applib/src/main/java/org/apache/isis/extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.java
+++ b/extensions/core/executionoutbox/applib/src/main/java/org/apache/isis/extensions/executionoutbox/applib/dom/ExecutionOutboxEntry.java
@@ -58,7 +58,7 @@ import org.apache.isis.applib.services.tablecol.TableColumnOrderForCollectionTyp
import org.apache.isis.applib.util.ObjectContracts;
import org.apache.isis.applib.util.TitleBuffer;
import org.apache.isis.applib.util.ToString;
-import org.apache.isis.commons.internal.base._Times;
+import org.apache.isis.commons.internal.base._Temporals;
import org.apache.isis.extensions.executionoutbox.applib.IsisModuleExtExecutionOutboxApplib;
import org.apache.isis.schema.ixn.v2.InteractionDto;
import org.apache.isis.schema.ixn.v2.MemberExecutionDto;
@@ -411,7 +411,7 @@ implements Comparable<ExecutionOutboxEntry>, DomainChangeRecord, HasInteractionI
*/
@Duration
public BigDecimal getDuration() {
- return _Times.secondsBetweenAsDecimal(getStartedAt(), getCompletedAt())
+ return _Temporals.secondsBetweenAsDecimal(getStartedAt(), getCompletedAt())
.orElse(null);
}
diff --git a/extensions/security/audittrail/applib/src/main/java/org/apache/isis/extensions/audittrail/applib/dom/AuditTrailEntry.java b/extensions/security/audittrail/applib/src/main/java/org/apache/isis/extensions/audittrail/applib/dom/AuditTrailEntry.java
index 26459342af..87c9404fe7 100644
--- a/extensions/security/audittrail/applib/src/main/java/org/apache/isis/extensions/audittrail/applib/dom/AuditTrailEntry.java
+++ b/extensions/security/audittrail/applib/src/main/java/org/apache/isis/extensions/audittrail/applib/dom/AuditTrailEntry.java
@@ -44,7 +44,7 @@ import org.apache.isis.applib.services.publishing.spi.EntityPropertyChange;
import org.apache.isis.applib.util.ObjectContracts;
import org.apache.isis.applib.util.TitleBuffer;
import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.base._Times;
+import org.apache.isis.commons.internal.base._Temporals;
import org.apache.isis.extensions.audittrail.applib.IsisModuleExtAuditTrailApplib;
import lombok.val;
@@ -110,7 +110,7 @@ public abstract class AuditTrailEntry implements DomainChangeRecord, Comparable<
public String title() {
val buf = new TitleBuffer();
- buf.append(_Times.DEFAULT_LOCAL_DATETIME_FORMATTER
+ buf.append(_Temporals.DEFAULT_LOCAL_DATETIME_FORMATTER
.format(getTimestamp().toLocalDateTime()));
buf.append(" ").append(getLogicalMemberIdentifier());
return buf.toString();
diff --git a/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/extensions/sessionlog/applib/dom/SessionLogEntry.java b/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/extensions/sessionlog/applib/dom/SessionLogEntry.java
index 5c3d05cf65..3ab36feda9 100644
--- a/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/extensions/sessionlog/applib/dom/SessionLogEntry.java
+++ b/extensions/security/sessionlog/applib/src/main/java/org/apache/isis/extensions/sessionlog/applib/dom/SessionLogEntry.java
@@ -48,7 +48,7 @@ import org.apache.isis.applib.layout.component.CssClassFaPosition;
import org.apache.isis.applib.mixins.security.HasUsername;
import org.apache.isis.applib.services.session.SessionSubscriber;
import org.apache.isis.applib.util.ObjectContracts;
-import org.apache.isis.commons.internal.base._Times;
+import org.apache.isis.commons.internal.base._Temporals;
import org.apache.isis.extensions.sessionlog.applib.IsisModuleExtSessionLogApplib;
import lombok.experimental.UtilityClass;
@@ -117,7 +117,7 @@ public abstract class SessionLogEntry implements HasUsername, Comparable<Session
public String title() {
return String.format("%s: %s logged %s %s",
- _Times.DEFAULT_LOCAL_DATETIME_FORMATTER
+ _Temporals.DEFAULT_LOCAL_DATETIME_FORMATTER
.format(getLoginTimestamp().toLocalDateTime()),
getUsername(),
getLogoutTimestamp() == null ? "in": "out",
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/typeconverters/time/OffsetDateTimeConverterForJdo.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/typeconverters/time/OffsetDateTimeConverterForJdo.java
index 362752a2e4..60d04ca8f9 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/typeconverters/time/OffsetDateTimeConverterForJdo.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/typeconverters/time/OffsetDateTimeConverterForJdo.java
@@ -22,7 +22,7 @@ import java.time.OffsetDateTime;
import org.datanucleus.store.types.converters.TypeConverter;
-import org.apache.isis.commons.internal.base._Times;
+import org.apache.isis.commons.internal.base._Temporals;
/**
* @since 2.0 {@index}
@@ -33,12 +33,12 @@ public class OffsetDateTimeConverterForJdo implements TypeConverter<OffsetDateTi
@Override
public String toDatastoreType(final OffsetDateTime offsetDateTime) {
- return _Times.enstringOffsetDateTime(offsetDateTime);
+ return _Temporals.enstringOffsetDateTime(offsetDateTime);
}
@Override
public OffsetDateTime toMemberType(final String datastoreValue) {
- return _Times.destringAsOffsetDateTime(datastoreValue);
+ return _Temporals.destringAsOffsetDateTime(datastoreValue);
}
}
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/typeconverters/time/OffsetTimeConverterForJdo.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/typeconverters/time/OffsetTimeConverterForJdo.java
index 09a90eb8f2..5843ba4974 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/typeconverters/time/OffsetTimeConverterForJdo.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/typeconverters/time/OffsetTimeConverterForJdo.java
@@ -22,7 +22,7 @@ import java.time.OffsetTime;
import org.datanucleus.store.types.converters.TypeConverter;
-import org.apache.isis.commons.internal.base._Times;
+import org.apache.isis.commons.internal.base._Temporals;
/**
* @since 2.0 {@index}
@@ -33,12 +33,12 @@ public class OffsetTimeConverterForJdo implements TypeConverter<OffsetTime, Stri
@Override
public String toDatastoreType(final OffsetTime offsetTime) {
- return _Times.enstringOffsetTime(offsetTime);
+ return _Temporals.enstringOffsetTime(offsetTime);
}
@Override
public OffsetTime toMemberType(final String datastoreValue) {
- return _Times.destringAsOffsetTime(datastoreValue);
+ return _Temporals.destringAsOffsetTime(datastoreValue);
}
}
diff --git a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/typeconverters/time/ZonedDateTimeConverterForJdo.java b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/typeconverters/time/ZonedDateTimeConverterForJdo.java
index 1bd1b35fe4..ccac12d3ed 100644
--- a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/typeconverters/time/ZonedDateTimeConverterForJdo.java
+++ b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/typeconverters/time/ZonedDateTimeConverterForJdo.java
@@ -22,7 +22,7 @@ import java.time.ZonedDateTime;
import org.datanucleus.store.types.converters.TypeConverter;
-import org.apache.isis.commons.internal.base._Times;
+import org.apache.isis.commons.internal.base._Temporals;
/**
* @since 2.0 {@index}
@@ -33,12 +33,12 @@ public class ZonedDateTimeConverterForJdo implements TypeConverter<ZonedDateTime
@Override
public String toDatastoreType(final ZonedDateTime zonedDateTime) {
- return _Times.enstringZonedDateTime(zonedDateTime);
+ return _Temporals.enstringZonedDateTime(zonedDateTime);
}
@Override
public ZonedDateTime toMemberType(final String datastoreValue) {
- return _Times.destringAsZonedDateTime(datastoreValue);
+ return _Temporals.destringAsZonedDateTime(datastoreValue);
}
}
diff --git a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/java/time/OffsetDateTimeConverterForJpa.java b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/java/time/OffsetDateTimeConverterForJpa.java
index a2e783217e..27a5be03ce 100644
--- a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/java/time/OffsetDateTimeConverterForJpa.java
+++ b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/java/time/OffsetDateTimeConverterForJpa.java
@@ -23,7 +23,7 @@ import java.time.OffsetDateTime;
import javax.persistence.AttributeConverter;
import javax.persistence.Converter;
-import org.apache.isis.commons.internal.base._Times;
+import org.apache.isis.commons.internal.base._Temporals;
/**
* @since 2.0 {@index}
@@ -34,12 +34,12 @@ implements AttributeConverter<OffsetDateTime, String> {
@Override
public String convertToDatabaseColumn(final OffsetDateTime offsetDateTime) {
- return _Times.enstringOffsetDateTime(offsetDateTime);
+ return _Temporals.enstringOffsetDateTime(offsetDateTime);
}
@Override
public OffsetDateTime convertToEntityAttribute(final String datastoreValue) {
- return _Times.destringAsOffsetDateTime(datastoreValue);
+ return _Temporals.destringAsOffsetDateTime(datastoreValue);
}
}
diff --git a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/java/time/OffsetTimeConverterForJpa.java b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/java/time/OffsetTimeConverterForJpa.java
index 1b5b0c2082..c5c2f370ee 100644
--- a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/java/time/OffsetTimeConverterForJpa.java
+++ b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/java/time/OffsetTimeConverterForJpa.java
@@ -23,7 +23,7 @@ import java.time.OffsetTime;
import javax.persistence.AttributeConverter;
import javax.persistence.Converter;
-import org.apache.isis.commons.internal.base._Times;
+import org.apache.isis.commons.internal.base._Temporals;
/**
* @since 2.0 {@index}
@@ -34,12 +34,12 @@ implements AttributeConverter<OffsetTime, String>{
@Override
public String convertToDatabaseColumn(final OffsetTime offsetTime) {
- return _Times.enstringOffsetTime(offsetTime);
+ return _Temporals.enstringOffsetTime(offsetTime);
}
@Override
public OffsetTime convertToEntityAttribute(final String datastoreValue) {
- return _Times.destringAsOffsetTime(datastoreValue);
+ return _Temporals.destringAsOffsetTime(datastoreValue);
}
}
diff --git a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/java/time/ZonedDateTimeConverterForJpa.java b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/java/time/ZonedDateTimeConverterForJpa.java
index 70e3cd9761..42bc8505c0 100644
--- a/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/java/time/ZonedDateTimeConverterForJpa.java
+++ b/persistence/jpa/integration/src/main/java/org/apache/isis/persistence/jpa/integration/typeconverters/java/time/ZonedDateTimeConverterForJpa.java
@@ -23,7 +23,7 @@ import java.time.ZonedDateTime;
import javax.persistence.AttributeConverter;
import javax.persistence.Converter;
-import org.apache.isis.commons.internal.base._Times;
+import org.apache.isis.commons.internal.base._Temporals;
/**
* @since 2.0 {@index}
@@ -34,12 +34,12 @@ implements AttributeConverter<ZonedDateTime, String> {
@Override
public String convertToDatabaseColumn(final ZonedDateTime zonedDateTime) {
- return _Times.enstringZonedDateTime(zonedDateTime);
+ return _Temporals.enstringZonedDateTime(zonedDateTime);
}
@Override
public ZonedDateTime convertToEntityAttribute(final String datastoreValue) {
- return _Times.destringAsZonedDateTime(datastoreValue);
+ return _Temporals.destringAsZonedDateTime(datastoreValue);
}
}