This is an automated email from the ASF dual-hosted git repository.
aadamchik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new 2b283be16 test refactoring - removing "java8" label
2b283be16 is described below
commit 2b283be167f77573096b115c0bc6c3d8f7e62f57
Author: Andrus Adamchik <and...@objectstyle.com>
AuthorDate: Thu Jan 30 16:37:06 2025 -0500
test refactoring - removing "java8" label
---
cayenne-ant/src/test/resources/testmap.map.xml | 4 +-
...ontextEJBQLDateTimeFunctionalExpressionsIT.java | 4 +-
.../org/apache/cayenne/access/DateTimeTypesIT.java | 6 +--
.../types/{Java8TimeIT.java => DateTimeIT.java} | 50 +++++++++---------
.../apache/cayenne/exp/parser/ASTExtractIT.java | 4 +-
.../cayenne/exp/parser/ASTFunctionCallDateIT.java | 4 +-
.../{java8 => datetime}/DurationTestEntity.java | 4 +-
.../{java8 => datetime}/LocalDateTestEntity.java | 4 +-
.../LocalDateTimeTestEntity.java | 4 +-
.../{java8 => datetime}/LocalTimeTestEntity.java | 4 +-
.../{java8 => datetime}/PeriodTestEntity.java | 4 +-
.../auto/_DurationTestEntity.java | 4 +-
.../auto/_LocalDateTestEntity.java | 4 +-
.../auto/_LocalDateTimeTestEntity.java | 4 +-
.../auto/_LocalTimeTestEntity.java | 4 +-
.../auto/_PeriodTestEntity.java | 4 +-
.../CalendarEntity.java | 4 +-
.../DateTestEntity.java | 4 +-
.../auto/_CalendarEntity.java | 4 +-
.../auto/_DateTestEntity.java | 4 +-
.../cayenne/unit/di/runtime/CayenneProjects.java | 2 +-
.../cayenne/unit/di/runtime/SchemaBuilder.java | 2 +-
...enne-java8.xml => cayenne-legacy-date-time.xml} | 2 +-
cayenne/src/test/resources/date-time.map.xml | 61 +++++++++++++++-------
cayenne/src/test/resources/java8.map.xml | 52 ------------------
...{date-time.map.xml => legacy-date-time.map.xml} | 6 +--
.../src/test/resources/testmap.map.xml | 4 +-
27 files changed, 112 insertions(+), 145 deletions(-)
diff --git a/cayenne-ant/src/test/resources/testmap.map.xml
b/cayenne-ant/src/test/resources/testmap.map.xml
index e5c941a64..fbcb740fc 100644
--- a/cayenne-ant/src/test/resources/testmap.map.xml
+++ b/cayenne-ant/src/test/resources/testmap.map.xml
@@ -324,7 +324,7 @@
<obj-entity name="BooleanTestEntity"
className="org.apache.cayenne.testdo.numeric_types.BooleanTestEntity"
dbEntityName="BOOLEAN_TEST">
<obj-attribute name="booleanColumn" type="java.lang.Boolean"
db-attribute-path="BOOLEAN_COLUMN"/>
</obj-entity>
- <obj-entity name="CalendarEntity"
className="org.apache.cayenne.testdo.date_time.CalendarEntity"
dbEntityName="CALENDAR_TEST">
+ <obj-entity name="CalendarEntity"
className="org.apache.cayenne.testdo.legacy_datetime.CalendarEntity"
dbEntityName="CALENDAR_TEST">
<obj-attribute name="calendarField" type="java.util.Calendar"
db-attribute-path="CALENDAR_FIELD"/>
</obj-entity>
<obj-entity name="CharFkTestEntity"
className="org.apache.cayenne.testdo.compound.CharFkTestEntity"
dbEntityName="CHAR_FK_TEST">
@@ -359,7 +359,7 @@
<obj-attribute name="key2" type="java.lang.String"
db-attribute-path="KEY2"/>
<obj-attribute name="name" type="java.lang.String"
db-attribute-path="NAME"/>
</obj-entity>
- <obj-entity name="DateTestEntity"
className="org.apache.cayenne.testdo.date_time.DateTestEntity"
dbEntityName="DATE_TEST">
+ <obj-entity name="DateTestEntity"
className="org.apache.cayenne.testdo.legacy_datetime.DateTestEntity"
dbEntityName="DATE_TEST">
<obj-attribute name="dateColumn" type="java.util.Date"
db-attribute-path="DATE_COLUMN"/>
<obj-attribute name="timeColumn" type="java.util.Date"
db-attribute-path="TIME_COLUMN"/>
<obj-attribute name="timestampColumn" type="java.util.Date"
db-attribute-path="TIMESTAMP_COLUMN"/>
diff --git
a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLDateTimeFunctionalExpressionsIT.java
b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLDateTimeFunctionalExpressionsIT.java
index 8d081d670..07f16dc6c 100644
---
a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLDateTimeFunctionalExpressionsIT.java
+++
b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLDateTimeFunctionalExpressionsIT.java
@@ -22,7 +22,7 @@ package org.apache.cayenne.access;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.query.EJBQLQuery;
-import org.apache.cayenne.testdo.date_time.DateTestEntity;
+import org.apache.cayenne.testdo.legacy_datetime.DateTestEntity;
import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.runtime.CayenneProjects;
import org.apache.cayenne.unit.di.runtime.RuntimeCase;
@@ -35,7 +35,7 @@ import java.util.List;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-@UseCayenneRuntime(CayenneProjects.DATE_TIME_PROJECT)
+@UseCayenneRuntime(CayenneProjects.LEGACY_DATE_TIME_PROJECT)
public class DataContextEJBQLDateTimeFunctionalExpressionsIT extends
RuntimeCase {
@Inject
diff --git
a/cayenne/src/test/java/org/apache/cayenne/access/DateTimeTypesIT.java
b/cayenne/src/test/java/org/apache/cayenne/access/DateTimeTypesIT.java
index 2ceb716f8..b778611aa 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DateTimeTypesIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DateTimeTypesIT.java
@@ -27,8 +27,8 @@ import org.apache.cayenne.DataRow;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.query.MappedSelect;
import org.apache.cayenne.query.ObjectSelect;
-import org.apache.cayenne.testdo.date_time.CalendarEntity;
-import org.apache.cayenne.testdo.date_time.DateTestEntity;
+import org.apache.cayenne.testdo.legacy_datetime.CalendarEntity;
+import org.apache.cayenne.testdo.legacy_datetime.DateTestEntity;
import org.apache.cayenne.unit.di.runtime.CayenneProjects;
import org.apache.cayenne.unit.di.runtime.RuntimeCase;
import org.apache.cayenne.unit.di.runtime.UseCayenneRuntime;
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertTrue;
/**
* Tests Date handling in Cayenne.
*/
-@UseCayenneRuntime(CayenneProjects.DATE_TIME_PROJECT)
+@UseCayenneRuntime(CayenneProjects.LEGACY_DATE_TIME_PROJECT)
public class DateTimeTypesIT extends RuntimeCase {
@Inject
diff --git
a/cayenne/src/test/java/org/apache/cayenne/access/types/Java8TimeIT.java
b/cayenne/src/test/java/org/apache/cayenne/access/types/DateTimeIT.java
similarity index 90%
rename from
cayenne/src/test/java/org/apache/cayenne/access/types/Java8TimeIT.java
rename to cayenne/src/test/java/org/apache/cayenne/access/types/DateTimeIT.java
index c349a4f0f..432965142 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/types/Java8TimeIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/types/DateTimeIT.java
@@ -19,24 +19,15 @@
package org.apache.cayenne.access.types;
-import java.sql.SQLException;
-import java.time.Duration;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.Period;
-import java.time.temporal.ChronoField;
-import java.time.temporal.TemporalField;
-
import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.query.ObjectSelect;
import org.apache.cayenne.test.jdbc.DBHelper;
-import org.apache.cayenne.testdo.java8.DurationTestEntity;
-import org.apache.cayenne.testdo.java8.LocalDateTestEntity;
-import org.apache.cayenne.testdo.java8.LocalDateTimeTestEntity;
-import org.apache.cayenne.testdo.java8.LocalTimeTestEntity;
-import org.apache.cayenne.testdo.java8.PeriodTestEntity;
+import org.apache.cayenne.testdo.datetime.DurationTestEntity;
+import org.apache.cayenne.testdo.datetime.LocalDateTestEntity;
+import org.apache.cayenne.testdo.datetime.LocalDateTimeTestEntity;
+import org.apache.cayenne.testdo.datetime.LocalTimeTestEntity;
+import org.apache.cayenne.testdo.datetime.PeriodTestEntity;
import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.runtime.CayenneProjects;
import org.apache.cayenne.unit.di.runtime.RuntimeCase;
@@ -44,12 +35,19 @@ import org.apache.cayenne.unit.di.runtime.UseCayenneRuntime;
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import java.sql.SQLException;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.Period;
+import java.time.temporal.ChronoField;
+import java.time.temporal.TemporalField;
+
+import static org.junit.Assert.*;
-@UseCayenneRuntime(CayenneProjects.JAVA8)
-public class Java8TimeIT extends RuntimeCase {
+@UseCayenneRuntime(CayenneProjects.DATE_TIME_PROJECT)
+public class DateTimeIT extends RuntimeCase {
@Inject
private DataContext context;
@@ -70,7 +68,7 @@ public class Java8TimeIT extends RuntimeCase {
}
@Test
- public void testJava8LocalDate_Null() {
+ public void testLocalDate_Null() {
LocalDateTestEntity localDateTestEntity =
context.newObject(LocalDateTestEntity.class);
localDateTestEntity.setDate(null);
@@ -82,7 +80,7 @@ public class Java8TimeIT extends RuntimeCase {
}
@Test
- public void testJava8LocalDate() {
+ public void testLocalDate() {
LocalDateTestEntity localDateTestEntity =
context.newObject(LocalDateTestEntity.class);
LocalDate localDate = LocalDate.now();
localDateTestEntity.setDate(localDate);
@@ -97,7 +95,7 @@ public class Java8TimeIT extends RuntimeCase {
}
@Test
- public void testJava8LocalTime() {
+ public void testLocalTime() {
LocalTimeTestEntity localTimeTestEntity =
context.newObject(LocalTimeTestEntity.class);
LocalTime localTime = LocalTime.now();
localTimeTestEntity.setTime(localTime);
@@ -117,7 +115,7 @@ public class Java8TimeIT extends RuntimeCase {
}
@Test
- public void testJava8LocalDateTime() {
+ public void testLocalDateTime() {
LocalDateTimeTestEntity localDateTimeTestEntity =
context.newObject(LocalDateTimeTestEntity.class);
// round up seconds fraction
// reason: on MySQL field should be defined as
TIMESTAMP(fractionSecondsPrecision) to support it
@@ -135,7 +133,7 @@ public class Java8TimeIT extends RuntimeCase {
}
@Test
- public void columnSelectWithJava8Type() {
+ public void columnSelectWithLocalDateTime() {
// round up seconds fraction
// reason: on MySQL field should be defined as
TIMESTAMP(fractionSecondsPrecision) to support it
LocalDateTime localDateTime =
LocalDateTime.now().with(ChronoField.NANO_OF_SECOND, 0);
@@ -157,7 +155,7 @@ public class Java8TimeIT extends RuntimeCase {
}
@Test
- public void testJava8Duration() {
+ public void testDuration() {
DurationTestEntity durationTestEntity =
context.newObject(DurationTestEntity.class);
Duration duration = Duration.ofDays(10);
durationTestEntity.setDurationBigInt(duration);
@@ -197,7 +195,7 @@ public class Java8TimeIT extends RuntimeCase {
}
@Test
- public void testJava8Period() {
+ public void testPeriod() {
PeriodTestEntity periodTestEntity =
context.newObject(PeriodTestEntity.class);
Period period = Period.of(100, 10, 5);
periodTestEntity.setPeriodField(period);
diff --git
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTExtractIT.java
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTExtractIT.java
index 1d15def00..2156589f6 100644
--- a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTExtractIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTExtractIT.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.exp.ExpressionFactory;
import org.apache.cayenne.query.ObjectSelect;
import org.apache.cayenne.test.jdbc.DBHelper;
-import org.apache.cayenne.testdo.date_time.DateTestEntity;
+import org.apache.cayenne.testdo.legacy_datetime.DateTestEntity;
import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.runtime.CayenneProjects;
import org.apache.cayenne.unit.di.runtime.RuntimeCase;
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertTrue;
/**
* @since 4.0
*/
-@UseCayenneRuntime(CayenneProjects.DATE_TIME_PROJECT)
+@UseCayenneRuntime(CayenneProjects.LEGACY_DATE_TIME_PROJECT)
public class ASTExtractIT extends RuntimeCase {
@Inject
diff --git
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallDateIT.java
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallDateIT.java
index 08d864355..282b3dbdc 100644
---
a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallDateIT.java
+++
b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTFunctionCallDateIT.java
@@ -28,7 +28,7 @@ import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.exp.ExpressionFactory;
import org.apache.cayenne.query.ObjectSelect;
import org.apache.cayenne.test.jdbc.DBHelper;
-import org.apache.cayenne.testdo.date_time.DateTestEntity;
+import org.apache.cayenne.testdo.legacy_datetime.DateTestEntity;
import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.runtime.CayenneProjects;
import org.apache.cayenne.unit.di.runtime.RuntimeCase;
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertNotNull;
/**
* @since 4.0
*/
-@UseCayenneRuntime(CayenneProjects.DATE_TIME_PROJECT)
+@UseCayenneRuntime(CayenneProjects.LEGACY_DATE_TIME_PROJECT)
public class ASTFunctionCallDateIT extends RuntimeCase {
@Inject
diff --git
a/cayenne/src/test/java/org/apache/cayenne/testdo/java8/DurationTestEntity.java
b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/DurationTestEntity.java
similarity index 90%
rename from
cayenne/src/test/java/org/apache/cayenne/testdo/java8/DurationTestEntity.java
rename to
cayenne/src/test/java/org/apache/cayenne/testdo/datetime/DurationTestEntity.java
index a1048b02e..fa52f2fa8 100644
---
a/cayenne/src/test/java/org/apache/cayenne/testdo/java8/DurationTestEntity.java
+++
b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/DurationTestEntity.java
@@ -17,9 +17,9 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.testdo.java8;
+package org.apache.cayenne.testdo.datetime;
-import org.apache.cayenne.testdo.java8.auto._DurationTestEntity;
+import org.apache.cayenne.testdo.datetime.auto._DurationTestEntity;
public class DurationTestEntity extends _DurationTestEntity {
diff --git
a/cayenne/src/test/java/org/apache/cayenne/testdo/java8/LocalDateTestEntity.java
b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/LocalDateTestEntity.java
similarity index 90%
rename from
cayenne/src/test/java/org/apache/cayenne/testdo/java8/LocalDateTestEntity.java
rename to
cayenne/src/test/java/org/apache/cayenne/testdo/datetime/LocalDateTestEntity.java
index 0c9c68d05..d27437cbb 100644
---
a/cayenne/src/test/java/org/apache/cayenne/testdo/java8/LocalDateTestEntity.java
+++
b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/LocalDateTestEntity.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.testdo.java8;
+package org.apache.cayenne.testdo.datetime;
-import org.apache.cayenne.testdo.java8.auto._LocalDateTestEntity;
+import org.apache.cayenne.testdo.datetime.auto._LocalDateTestEntity;
public class LocalDateTestEntity extends _LocalDateTestEntity {
diff --git
a/cayenne/src/test/java/org/apache/cayenne/testdo/java8/LocalDateTimeTestEntity.java
b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/LocalDateTimeTestEntity.java
similarity index 90%
rename from
cayenne/src/test/java/org/apache/cayenne/testdo/java8/LocalDateTimeTestEntity.java
rename to
cayenne/src/test/java/org/apache/cayenne/testdo/datetime/LocalDateTimeTestEntity.java
index 4370c1bd4..4917e8887 100644
---
a/cayenne/src/test/java/org/apache/cayenne/testdo/java8/LocalDateTimeTestEntity.java
+++
b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/LocalDateTimeTestEntity.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.testdo.java8;
+package org.apache.cayenne.testdo.datetime;
-import org.apache.cayenne.testdo.java8.auto._LocalDateTimeTestEntity;
+import org.apache.cayenne.testdo.datetime.auto._LocalDateTimeTestEntity;
public class LocalDateTimeTestEntity extends _LocalDateTimeTestEntity {
diff --git
a/cayenne/src/test/java/org/apache/cayenne/testdo/java8/LocalTimeTestEntity.java
b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/LocalTimeTestEntity.java
similarity index 90%
rename from
cayenne/src/test/java/org/apache/cayenne/testdo/java8/LocalTimeTestEntity.java
rename to
cayenne/src/test/java/org/apache/cayenne/testdo/datetime/LocalTimeTestEntity.java
index 18b3d8508..f30987658 100644
---
a/cayenne/src/test/java/org/apache/cayenne/testdo/java8/LocalTimeTestEntity.java
+++
b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/LocalTimeTestEntity.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.testdo.java8;
+package org.apache.cayenne.testdo.datetime;
-import org.apache.cayenne.testdo.java8.auto._LocalTimeTestEntity;
+import org.apache.cayenne.testdo.datetime.auto._LocalTimeTestEntity;
public class LocalTimeTestEntity extends _LocalTimeTestEntity {
diff --git
a/cayenne/src/test/java/org/apache/cayenne/testdo/java8/PeriodTestEntity.java
b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/PeriodTestEntity.java
similarity index 90%
rename from
cayenne/src/test/java/org/apache/cayenne/testdo/java8/PeriodTestEntity.java
rename to
cayenne/src/test/java/org/apache/cayenne/testdo/datetime/PeriodTestEntity.java
index 54e720e82..f7d312386 100644
---
a/cayenne/src/test/java/org/apache/cayenne/testdo/java8/PeriodTestEntity.java
+++
b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/PeriodTestEntity.java
@@ -17,9 +17,9 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.testdo.java8;
+package org.apache.cayenne.testdo.datetime;
-import org.apache.cayenne.testdo.java8.auto._PeriodTestEntity;
+import org.apache.cayenne.testdo.datetime.auto._PeriodTestEntity;
public class PeriodTestEntity extends _PeriodTestEntity {
diff --git
a/cayenne/src/test/java/org/apache/cayenne/testdo/java8/auto/_DurationTestEntity.java
b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_DurationTestEntity.java
similarity index 98%
rename from
cayenne/src/test/java/org/apache/cayenne/testdo/java8/auto/_DurationTestEntity.java
rename to
cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_DurationTestEntity.java
index 60602e47d..969751618 100644
---
a/cayenne/src/test/java/org/apache/cayenne/testdo/java8/auto/_DurationTestEntity.java
+++
b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_DurationTestEntity.java
@@ -1,4 +1,4 @@
-package org.apache.cayenne.testdo.java8.auto;
+package org.apache.cayenne.testdo.datetime.auto;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -10,7 +10,7 @@ import org.apache.cayenne.exp.property.BaseProperty;
import org.apache.cayenne.exp.property.NumericIdProperty;
import org.apache.cayenne.exp.property.PropertyFactory;
import org.apache.cayenne.exp.property.SelfProperty;
-import org.apache.cayenne.testdo.java8.DurationTestEntity;
+import org.apache.cayenne.testdo.datetime.DurationTestEntity;
/**
* Class _DurationTestEntity was generated by Cayenne.
diff --git
a/cayenne/src/test/java/org/apache/cayenne/testdo/java8/auto/_LocalDateTestEntity.java
b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_LocalDateTestEntity.java
similarity index 96%
rename from
cayenne/src/test/java/org/apache/cayenne/testdo/java8/auto/_LocalDateTestEntity.java
rename to
cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_LocalDateTestEntity.java
index 59cdfd474..bc76df12a 100644
---
a/cayenne/src/test/java/org/apache/cayenne/testdo/java8/auto/_LocalDateTestEntity.java
+++
b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_LocalDateTestEntity.java
@@ -1,4 +1,4 @@
-package org.apache.cayenne.testdo.java8.auto;
+package org.apache.cayenne.testdo.datetime.auto;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -10,7 +10,7 @@ import org.apache.cayenne.exp.property.DateProperty;
import org.apache.cayenne.exp.property.NumericIdProperty;
import org.apache.cayenne.exp.property.PropertyFactory;
import org.apache.cayenne.exp.property.SelfProperty;
-import org.apache.cayenne.testdo.java8.LocalDateTestEntity;
+import org.apache.cayenne.testdo.datetime.LocalDateTestEntity;
/**
* Class _LocalDateTestEntity was generated by Cayenne.
diff --git
a/cayenne/src/test/java/org/apache/cayenne/testdo/java8/auto/_LocalDateTimeTestEntity.java
b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_LocalDateTimeTestEntity.java
similarity index 96%
rename from
cayenne/src/test/java/org/apache/cayenne/testdo/java8/auto/_LocalDateTimeTestEntity.java
rename to
cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_LocalDateTimeTestEntity.java
index 67939dd3e..7de9350ad 100644
---
a/cayenne/src/test/java/org/apache/cayenne/testdo/java8/auto/_LocalDateTimeTestEntity.java
+++
b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_LocalDateTimeTestEntity.java
@@ -1,4 +1,4 @@
-package org.apache.cayenne.testdo.java8.auto;
+package org.apache.cayenne.testdo.datetime.auto;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -10,7 +10,7 @@ import org.apache.cayenne.exp.property.DateProperty;
import org.apache.cayenne.exp.property.NumericIdProperty;
import org.apache.cayenne.exp.property.PropertyFactory;
import org.apache.cayenne.exp.property.SelfProperty;
-import org.apache.cayenne.testdo.java8.LocalDateTimeTestEntity;
+import org.apache.cayenne.testdo.datetime.LocalDateTimeTestEntity;
/**
* Class _LocalDateTimeTestEntity was generated by Cayenne.
diff --git
a/cayenne/src/test/java/org/apache/cayenne/testdo/java8/auto/_LocalTimeTestEntity.java
b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_LocalTimeTestEntity.java
similarity index 96%
rename from
cayenne/src/test/java/org/apache/cayenne/testdo/java8/auto/_LocalTimeTestEntity.java
rename to
cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_LocalTimeTestEntity.java
index c671a682c..a3b875815 100644
---
a/cayenne/src/test/java/org/apache/cayenne/testdo/java8/auto/_LocalTimeTestEntity.java
+++
b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_LocalTimeTestEntity.java
@@ -1,4 +1,4 @@
-package org.apache.cayenne.testdo.java8.auto;
+package org.apache.cayenne.testdo.datetime.auto;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -10,7 +10,7 @@ import org.apache.cayenne.exp.property.DateProperty;
import org.apache.cayenne.exp.property.NumericIdProperty;
import org.apache.cayenne.exp.property.PropertyFactory;
import org.apache.cayenne.exp.property.SelfProperty;
-import org.apache.cayenne.testdo.java8.LocalTimeTestEntity;
+import org.apache.cayenne.testdo.datetime.LocalTimeTestEntity;
/**
* Class _LocalTimeTestEntity was generated by Cayenne.
diff --git
a/cayenne/src/test/java/org/apache/cayenne/testdo/java8/auto/_PeriodTestEntity.java
b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_PeriodTestEntity.java
similarity index 96%
rename from
cayenne/src/test/java/org/apache/cayenne/testdo/java8/auto/_PeriodTestEntity.java
rename to
cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_PeriodTestEntity.java
index ba1ba390b..4c63b2e69 100644
---
a/cayenne/src/test/java/org/apache/cayenne/testdo/java8/auto/_PeriodTestEntity.java
+++
b/cayenne/src/test/java/org/apache/cayenne/testdo/datetime/auto/_PeriodTestEntity.java
@@ -1,4 +1,4 @@
-package org.apache.cayenne.testdo.java8.auto;
+package org.apache.cayenne.testdo.datetime.auto;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -10,7 +10,7 @@ import org.apache.cayenne.exp.property.BaseProperty;
import org.apache.cayenne.exp.property.NumericIdProperty;
import org.apache.cayenne.exp.property.PropertyFactory;
import org.apache.cayenne.exp.property.SelfProperty;
-import org.apache.cayenne.testdo.java8.PeriodTestEntity;
+import org.apache.cayenne.testdo.datetime.PeriodTestEntity;
/**
* Class _PeriodTestEntity was generated by Cayenne.
diff --git
a/cayenne/src/test/java/org/apache/cayenne/testdo/date_time/CalendarEntity.java
b/cayenne/src/test/java/org/apache/cayenne/testdo/legacy_datetime/CalendarEntity.java
similarity index 89%
rename from
cayenne/src/test/java/org/apache/cayenne/testdo/date_time/CalendarEntity.java
rename to
cayenne/src/test/java/org/apache/cayenne/testdo/legacy_datetime/CalendarEntity.java
index 5ff4b2475..317880135 100644
---
a/cayenne/src/test/java/org/apache/cayenne/testdo/date_time/CalendarEntity.java
+++
b/cayenne/src/test/java/org/apache/cayenne/testdo/legacy_datetime/CalendarEntity.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.testdo.date_time;
+package org.apache.cayenne.testdo.legacy_datetime;
-import org.apache.cayenne.testdo.date_time.auto._CalendarEntity;
+import org.apache.cayenne.testdo.legacy_datetime.auto._CalendarEntity;
public class CalendarEntity extends _CalendarEntity {
diff --git
a/cayenne/src/test/java/org/apache/cayenne/testdo/date_time/DateTestEntity.java
b/cayenne/src/test/java/org/apache/cayenne/testdo/legacy_datetime/DateTestEntity.java
similarity index 89%
rename from
cayenne/src/test/java/org/apache/cayenne/testdo/date_time/DateTestEntity.java
rename to
cayenne/src/test/java/org/apache/cayenne/testdo/legacy_datetime/DateTestEntity.java
index da93e8b54..4cd944f26 100644
---
a/cayenne/src/test/java/org/apache/cayenne/testdo/date_time/DateTestEntity.java
+++
b/cayenne/src/test/java/org/apache/cayenne/testdo/legacy_datetime/DateTestEntity.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.testdo.date_time;
+package org.apache.cayenne.testdo.legacy_datetime;
-import org.apache.cayenne.testdo.date_time.auto._DateTestEntity;
+import org.apache.cayenne.testdo.legacy_datetime.auto._DateTestEntity;
public class DateTestEntity extends _DateTestEntity {
diff --git
a/cayenne/src/test/java/org/apache/cayenne/testdo/date_time/auto/_CalendarEntity.java
b/cayenne/src/test/java/org/apache/cayenne/testdo/legacy_datetime/auto/_CalendarEntity.java
similarity index 96%
rename from
cayenne/src/test/java/org/apache/cayenne/testdo/date_time/auto/_CalendarEntity.java
rename to
cayenne/src/test/java/org/apache/cayenne/testdo/legacy_datetime/auto/_CalendarEntity.java
index aa8adbdf4..f1e3cdb3f 100644
---
a/cayenne/src/test/java/org/apache/cayenne/testdo/date_time/auto/_CalendarEntity.java
+++
b/cayenne/src/test/java/org/apache/cayenne/testdo/legacy_datetime/auto/_CalendarEntity.java
@@ -1,4 +1,4 @@
-package org.apache.cayenne.testdo.date_time.auto;
+package org.apache.cayenne.testdo.legacy_datetime.auto;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -10,7 +10,7 @@ import org.apache.cayenne.exp.property.BaseProperty;
import org.apache.cayenne.exp.property.NumericIdProperty;
import org.apache.cayenne.exp.property.PropertyFactory;
import org.apache.cayenne.exp.property.SelfProperty;
-import org.apache.cayenne.testdo.date_time.CalendarEntity;
+import org.apache.cayenne.testdo.legacy_datetime.CalendarEntity;
/**
* Class _CalendarEntity was generated by Cayenne.
diff --git
a/cayenne/src/test/java/org/apache/cayenne/testdo/date_time/auto/_DateTestEntity.java
b/cayenne/src/test/java/org/apache/cayenne/testdo/legacy_datetime/auto/_DateTestEntity.java
similarity index 97%
rename from
cayenne/src/test/java/org/apache/cayenne/testdo/date_time/auto/_DateTestEntity.java
rename to
cayenne/src/test/java/org/apache/cayenne/testdo/legacy_datetime/auto/_DateTestEntity.java
index e062a7711..d8d0bdee8 100644
---
a/cayenne/src/test/java/org/apache/cayenne/testdo/date_time/auto/_DateTestEntity.java
+++
b/cayenne/src/test/java/org/apache/cayenne/testdo/legacy_datetime/auto/_DateTestEntity.java
@@ -1,4 +1,4 @@
-package org.apache.cayenne.testdo.date_time.auto;
+package org.apache.cayenne.testdo.legacy_datetime.auto;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -10,7 +10,7 @@ import org.apache.cayenne.exp.property.DateProperty;
import org.apache.cayenne.exp.property.NumericIdProperty;
import org.apache.cayenne.exp.property.PropertyFactory;
import org.apache.cayenne.exp.property.SelfProperty;
-import org.apache.cayenne.testdo.date_time.DateTestEntity;
+import org.apache.cayenne.testdo.legacy_datetime.DateTestEntity;
/**
* Class _DateTestEntity was generated by Cayenne.
diff --git
a/cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/CayenneProjects.java
b/cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/CayenneProjects.java
index e21c26935..014ee11dc 100644
---
a/cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/CayenneProjects.java
+++
b/cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/CayenneProjects.java
@@ -40,6 +40,7 @@ public class CayenneProjects {
public static final String INHERITANCE_SINGLE_TABLE1_PROJECT =
"cayenne-inheritance-single-table1.xml";
public static final String INHERITANCE_VERTICAL_PROJECT =
"cayenne-inheritance-vertical.xml";
public static final String JSON_PROJECT = "cayenne-json.xml";
+ public static final String LEGACY_DATE_TIME_PROJECT =
"cayenne-legacy-date-time.xml";
public static final String LIFECYCLE_CALLBACKS_ORDER_PROJECT =
"cayenne-lifecycle-callbacks-order.xml";
public static final String LIFECYCLES_PROJECT = "cayenne-lifecycles.xml";
public static final String LOB_PROJECT = "cayenne-lob.xml";
@@ -81,7 +82,6 @@ public class CayenneProjects {
public static final String CUSTOM_NAME_PROJECT = "custom-name-file.xml";
public static final String WEIGHTED_SORT_PROJECT =
"cayenne-weighted-sort.xml";
public static final String HYBRID_DATA_OBJECT_PROJECT =
"cayenne-hybrid-data-object.xml";
- public static final String JAVA8 = "cayenne-java8.xml";
public static final String INHERITANCE_WITH_ENUM_PROJECT =
"cayenne-inheritance-with-enum.xml";
public static final String LAZY_ATTRIBUTES_PROJECT =
"cayenne-lazy-attributes.xml";
public static final String CAY_2666 = "cay2666/cayenne-cay-2666.xml";
diff --git
a/cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/SchemaBuilder.java
b/cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/SchemaBuilder.java
index 407534259..c147c7a74 100644
---
a/cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/SchemaBuilder.java
+++
b/cayenne/src/test/java/org/apache/cayenne/unit/di/runtime/SchemaBuilder.java
@@ -83,7 +83,7 @@ public class SchemaBuilder {
"map-db2.map.xml", "embeddable.map.xml", "qualified.map.xml",
"quoted-identifiers.map.xml",
"inheritance-single-table1.map.xml",
"inheritance-vertical.map.xml", "oneway-rels.map.xml",
"unsupported-distinct-types.map.xml", "array-type.map.xml",
"cay-2032.map.xml",
- "weighted-sort.map.xml", "hybrid-data-object.map.xml",
"java8.map.xml", "inheritance-with-enum.map.xml",
+ "weighted-sort.map.xml", "hybrid-data-object.map.xml",
"legacy-date-time.map.xml", "inheritance-with-enum.map.xml",
"lazy-attributes.map.xml", "cay2666/datamap.map.xml",
"cay2641/datamapLazy.map.xml",
"annotation/datamapAnnotation.map.xml" };
diff --git a/cayenne/src/test/resources/cayenne-java8.xml
b/cayenne/src/test/resources/cayenne-legacy-date-time.xml
similarity index 90%
rename from cayenne/src/test/resources/cayenne-java8.xml
rename to cayenne/src/test/resources/cayenne-legacy-date-time.xml
index d71706b60..09d6d0f6c 100644
--- a/cayenne/src/test/resources/cayenne-java8.xml
+++ b/cayenne/src/test/resources/cayenne-legacy-date-time.xml
@@ -3,5 +3,5 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://cayenne.apache.org/schema/11/domain
https://cayenne.apache.org/schema/11/domain.xsd";
project-version="11">
- <map name="java8"/>
+ <map name="legacy-date-time"/>
</domain>
diff --git a/cayenne/src/test/resources/date-time.map.xml
b/cayenne/src/test/resources/date-time.map.xml
index bb31821b1..7351208e7 100644
--- a/cayenne/src/test/resources/date-time.map.xml
+++ b/cayenne/src/test/resources/date-time.map.xml
@@ -3,29 +3,50 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
https://cayenne.apache.org/schema/11/modelMap.xsd";
project-version="11">
- <property name="defaultPackage"
value="org.apache.cayenne.testdo.date_time"/>
- <property name="defaultSuperclass"
value="org.apache.cayenne.GenericPersistentObject"/>
- <db-entity name="CALENDAR_TEST">
- <db-attribute name="CALENDAR_FIELD" type="TIMESTAMP"/>
+ <property name="defaultPackage"
value="org.apache.cayenne.testdo.datetime"/>
+ <db-entity name="DURATION_TEST">
+ <db-attribute name="DURATION_BIG_INT" type="BIGINT"/>
+ <db-attribute name="DURATION_DECIMAL" type="DECIMAL"
length="19" scale="2"/>
+ <db-attribute name="DURATION_INT" type="INTEGER"/>
+ <db-attribute name="DURATION_LONG_VARCHAR" type="LONGVARCHAR"/>
+ <db-attribute name="DURATION_NUMERIC" type="NUMERIC"
length="19" scale="2"/>
+ <db-attribute name="DURATION_VARCHAR" type="VARCHAR"
length="255"/>
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true"/>
</db-entity>
- <db-entity name="DATE_TEST">
- <db-attribute name="DATE_COLUMN" type="DATE"/>
- <db-attribute name="DATE_TEST_ID" type="INTEGER"
isPrimaryKey="true" isMandatory="true"/>
- <db-attribute name="TIMESTAMP_COLUMN" type="TIMESTAMP"/>
- <db-attribute name="TIME_COLUMN" type="TIME"/>
+ <db-entity name="LOCAL_DATETIME_TEST">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true"/>
+ <db-attribute name="TimestampField" type="TIMESTAMP"/>
+ </db-entity>
+ <db-entity name="LOCAL_DATE_TEST">
+ <db-attribute name="DateField" type="DATE"/>
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true"/>
+ </db-entity>
+ <db-entity name="LOCAL_TIME_TEST">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true"/>
+ <db-attribute name="TimeField" type="TIME" scale="3"/>
</db-entity>
- <obj-entity name="CalendarEntity"
className="org.apache.cayenne.testdo.date_time.CalendarEntity"
dbEntityName="CALENDAR_TEST">
- <obj-attribute name="calendarField" type="java.util.Calendar"
db-attribute-path="CALENDAR_FIELD"/>
+ <db-entity name="PERIOD_TEST">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true"/>
+ <db-attribute name="PeriodField" type="VARCHAR" length="100"/>
+ </db-entity>
+ <obj-entity name="DurationTest"
className="org.apache.cayenne.testdo.datetime.DurationTestEntity"
dbEntityName="DURATION_TEST">
+ <obj-attribute name="durationBigInt" type="java.time.Duration"
db-attribute-path="DURATION_BIG_INT"/>
+ <obj-attribute name="durationDecimal" type="java.time.Duration"
db-attribute-path="DURATION_DECIMAL"/>
+ <obj-attribute name="durationInt" type="java.time.Duration"
db-attribute-path="DURATION_INT"/>
+ <obj-attribute name="durationLongVarchar"
type="java.time.Duration" db-attribute-path="DURATION_LONG_VARCHAR"/>
+ <obj-attribute name="durationNumeric" type="java.time.Duration"
db-attribute-path="DURATION_NUMERIC"/>
+ <obj-attribute name="durationVarchar" type="java.time.Duration"
db-attribute-path="DURATION_VARCHAR"/>
+ </obj-entity>
+ <obj-entity name="LocalDateTest"
className="org.apache.cayenne.testdo.datetime.LocalDateTestEntity"
dbEntityName="LOCAL_DATE_TEST">
+ <obj-attribute name="date" type="java.time.LocalDate"
db-attribute-path="DateField"/>
+ </obj-entity>
+ <obj-entity name="LocalDateTimeTest"
className="org.apache.cayenne.testdo.datetime.LocalDateTimeTestEntity"
dbEntityName="LOCAL_DATETIME_TEST">
+ <obj-attribute name="timestamp" type="java.time.LocalDateTime"
db-attribute-path="TimestampField"/>
+ </obj-entity>
+ <obj-entity name="LocalTimeTest"
className="org.apache.cayenne.testdo.datetime.LocalTimeTestEntity"
dbEntityName="LOCAL_TIME_TEST">
+ <obj-attribute name="time" type="java.time.LocalTime"
db-attribute-path="TimeField"/>
</obj-entity>
- <obj-entity name="DateTestEntity"
className="org.apache.cayenne.testdo.date_time.DateTestEntity"
dbEntityName="DATE_TEST">
- <obj-attribute name="dateColumn" type="java.util.Date"
db-attribute-path="DATE_COLUMN"/>
- <obj-attribute name="timeColumn" type="java.util.Date"
db-attribute-path="TIME_COLUMN"/>
- <obj-attribute name="timestampColumn" type="java.util.Date"
db-attribute-path="TIMESTAMP_COLUMN"/>
+ <obj-entity name="PeriodTest"
className="org.apache.cayenne.testdo.datetime.PeriodTestEntity"
dbEntityName="PERIOD_TEST">
+ <obj-attribute name="periodField" type="java.time.Period"
db-attribute-path="PeriodField"/>
</obj-entity>
- <query name="SelectDateTest" type="SQLTemplate" root="data-map"
root-name="date-time">
- <property name="cayenne.SQLTemplate.columnNameCapitalization"
value="UPPER"/>
- <property name="cayenne.GenericSelectQuery.fetchingDataRows"
value="true"/>
- <sql><![CDATA[SELECT * FROM DATE_TEST]]></sql>
- </query>
</data-map>
diff --git a/cayenne/src/test/resources/java8.map.xml
b/cayenne/src/test/resources/java8.map.xml
deleted file mode 100644
index 7a7e14927..000000000
--- a/cayenne/src/test/resources/java8.map.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/11/modelMap";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
https://cayenne.apache.org/schema/11/modelMap.xsd";
- project-version="11">
- <property name="defaultPackage"
value="org.apache.cayenne.testdo.java8"/>
- <db-entity name="DURATION_TEST">
- <db-attribute name="DURATION_BIG_INT" type="BIGINT"/>
- <db-attribute name="DURATION_DECIMAL" type="DECIMAL"
length="19" scale="2"/>
- <db-attribute name="DURATION_INT" type="INTEGER"/>
- <db-attribute name="DURATION_LONG_VARCHAR" type="LONGVARCHAR"/>
- <db-attribute name="DURATION_NUMERIC" type="NUMERIC"
length="19" scale="2"/>
- <db-attribute name="DURATION_VARCHAR" type="VARCHAR"
length="255"/>
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true"/>
- </db-entity>
- <db-entity name="LOCAL_DATETIME_TEST">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true"/>
- <db-attribute name="TimestampField" type="TIMESTAMP"/>
- </db-entity>
- <db-entity name="LOCAL_DATE_TEST">
- <db-attribute name="DateField" type="DATE"/>
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true"/>
- </db-entity>
- <db-entity name="LOCAL_TIME_TEST">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true"/>
- <db-attribute name="TimeField" type="TIME" scale="3"/>
- </db-entity>
- <db-entity name="PERIOD_TEST">
- <db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true"/>
- <db-attribute name="PeriodField" type="VARCHAR" length="100"/>
- </db-entity>
- <obj-entity name="DurationTest"
className="org.apache.cayenne.testdo.java8.DurationTestEntity"
dbEntityName="DURATION_TEST">
- <obj-attribute name="durationBigInt" type="java.time.Duration"
db-attribute-path="DURATION_BIG_INT"/>
- <obj-attribute name="durationDecimal" type="java.time.Duration"
db-attribute-path="DURATION_DECIMAL"/>
- <obj-attribute name="durationInt" type="java.time.Duration"
db-attribute-path="DURATION_INT"/>
- <obj-attribute name="durationLongVarchar"
type="java.time.Duration" db-attribute-path="DURATION_LONG_VARCHAR"/>
- <obj-attribute name="durationNumeric" type="java.time.Duration"
db-attribute-path="DURATION_NUMERIC"/>
- <obj-attribute name="durationVarchar" type="java.time.Duration"
db-attribute-path="DURATION_VARCHAR"/>
- </obj-entity>
- <obj-entity name="LocalDateTest"
className="org.apache.cayenne.testdo.java8.LocalDateTestEntity"
dbEntityName="LOCAL_DATE_TEST">
- <obj-attribute name="date" type="java.time.LocalDate"
db-attribute-path="DateField"/>
- </obj-entity>
- <obj-entity name="LocalDateTimeTest"
className="org.apache.cayenne.testdo.java8.LocalDateTimeTestEntity"
dbEntityName="LOCAL_DATETIME_TEST">
- <obj-attribute name="timestamp" type="java.time.LocalDateTime"
db-attribute-path="TimestampField"/>
- </obj-entity>
- <obj-entity name="LocalTimeTest"
className="org.apache.cayenne.testdo.java8.LocalTimeTestEntity"
dbEntityName="LOCAL_TIME_TEST">
- <obj-attribute name="time" type="java.time.LocalTime"
db-attribute-path="TimeField"/>
- </obj-entity>
- <obj-entity name="PeriodTest"
className="org.apache.cayenne.testdo.java8.PeriodTestEntity"
dbEntityName="PERIOD_TEST">
- <obj-attribute name="periodField" type="java.time.Period"
db-attribute-path="PeriodField"/>
- </obj-entity>
-</data-map>
diff --git a/cayenne/src/test/resources/date-time.map.xml
b/cayenne/src/test/resources/legacy-date-time.map.xml
similarity index 91%
copy from cayenne/src/test/resources/date-time.map.xml
copy to cayenne/src/test/resources/legacy-date-time.map.xml
index bb31821b1..02627ef45 100644
--- a/cayenne/src/test/resources/date-time.map.xml
+++ b/cayenne/src/test/resources/legacy-date-time.map.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://cayenne.apache.org/schema/11/modelMap
https://cayenne.apache.org/schema/11/modelMap.xsd";
project-version="11">
- <property name="defaultPackage"
value="org.apache.cayenne.testdo.date_time"/>
+ <property name="defaultPackage"
value="org.apache.cayenne.testdo.legacy_datetime"/>
<property name="defaultSuperclass"
value="org.apache.cayenne.GenericPersistentObject"/>
<db-entity name="CALENDAR_TEST">
<db-attribute name="CALENDAR_FIELD" type="TIMESTAMP"/>
@@ -15,10 +15,10 @@
<db-attribute name="TIMESTAMP_COLUMN" type="TIMESTAMP"/>
<db-attribute name="TIME_COLUMN" type="TIME"/>
</db-entity>
- <obj-entity name="CalendarEntity"
className="org.apache.cayenne.testdo.date_time.CalendarEntity"
dbEntityName="CALENDAR_TEST">
+ <obj-entity name="CalendarEntity"
className="org.apache.cayenne.testdo.legacy_datetime.CalendarEntity"
dbEntityName="CALENDAR_TEST">
<obj-attribute name="calendarField" type="java.util.Calendar"
db-attribute-path="CALENDAR_FIELD"/>
</obj-entity>
- <obj-entity name="DateTestEntity"
className="org.apache.cayenne.testdo.date_time.DateTestEntity"
dbEntityName="DATE_TEST">
+ <obj-entity name="DateTestEntity"
className="org.apache.cayenne.testdo.legacy_datetime.DateTestEntity"
dbEntityName="DATE_TEST">
<obj-attribute name="dateColumn" type="java.util.Date"
db-attribute-path="DATE_COLUMN"/>
<obj-attribute name="timeColumn" type="java.util.Date"
db-attribute-path="TIME_COLUMN"/>
<obj-attribute name="timestampColumn" type="java.util.Date"
db-attribute-path="TIMESTAMP_COLUMN"/>
diff --git
a/maven-plugins/cayenne-tools-itest/src/test/resources/testmap.map.xml
b/maven-plugins/cayenne-tools-itest/src/test/resources/testmap.map.xml
index e5c941a64..fbcb740fc 100644
--- a/maven-plugins/cayenne-tools-itest/src/test/resources/testmap.map.xml
+++ b/maven-plugins/cayenne-tools-itest/src/test/resources/testmap.map.xml
@@ -324,7 +324,7 @@
<obj-entity name="BooleanTestEntity"
className="org.apache.cayenne.testdo.numeric_types.BooleanTestEntity"
dbEntityName="BOOLEAN_TEST">
<obj-attribute name="booleanColumn" type="java.lang.Boolean"
db-attribute-path="BOOLEAN_COLUMN"/>
</obj-entity>
- <obj-entity name="CalendarEntity"
className="org.apache.cayenne.testdo.date_time.CalendarEntity"
dbEntityName="CALENDAR_TEST">
+ <obj-entity name="CalendarEntity"
className="org.apache.cayenne.testdo.legacy_datetime.CalendarEntity"
dbEntityName="CALENDAR_TEST">
<obj-attribute name="calendarField" type="java.util.Calendar"
db-attribute-path="CALENDAR_FIELD"/>
</obj-entity>
<obj-entity name="CharFkTestEntity"
className="org.apache.cayenne.testdo.compound.CharFkTestEntity"
dbEntityName="CHAR_FK_TEST">
@@ -359,7 +359,7 @@
<obj-attribute name="key2" type="java.lang.String"
db-attribute-path="KEY2"/>
<obj-attribute name="name" type="java.lang.String"
db-attribute-path="NAME"/>
</obj-entity>
- <obj-entity name="DateTestEntity"
className="org.apache.cayenne.testdo.date_time.DateTestEntity"
dbEntityName="DATE_TEST">
+ <obj-entity name="DateTestEntity"
className="org.apache.cayenne.testdo.legacy_datetime.DateTestEntity"
dbEntityName="DATE_TEST">
<obj-attribute name="dateColumn" type="java.util.Date"
db-attribute-path="DATE_COLUMN"/>
<obj-attribute name="timeColumn" type="java.util.Date"
db-attribute-path="TIME_COLUMN"/>
<obj-attribute name="timestampColumn" type="java.util.Date"
db-attribute-path="TIMESTAMP_COLUMN"/>
