diff --git a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/Author.java b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/Author.java index 49db80e4fa..69b49e3d62 100644 --- a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/Author.java +++ b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/Author.java @@ -4,7 +4,7 @@ package org.jooq.example.flyway.ddl.db.h2.tables; -import java.sql.Date; +import java.time.LocalDate; import java.util.Arrays; import java.util.List; @@ -41,7 +41,7 @@ import org.jooq.impl.TableImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Author extends TableImpl { - private static final long serialVersionUID = 576523140; + private static final long serialVersionUID = 362279619; /** * The reference instance of FLYWAY_TEST.AUTHOR @@ -74,7 +74,7 @@ public class Author extends TableImpl { /** * The column FLYWAY_TEST.AUTHOR.DATE_OF_BIRTH. */ - public final TableField DATE_OF_BIRTH = createField(DSL.name("DATE_OF_BIRTH"), org.jooq.impl.SQLDataType.DATE, this, ""); + public final TableField DATE_OF_BIRTH = createField(DSL.name("DATE_OF_BIRTH"), org.jooq.impl.SQLDataType.LOCALDATE, this, ""); /** * The column FLYWAY_TEST.AUTHOR.YEAR_OF_BIRTH. @@ -170,7 +170,7 @@ public class Author extends TableImpl { // ------------------------------------------------------------------------- @Override - public Row6 fieldsRow() { + public Row6 fieldsRow() { return (Row6) super.fieldsRow(); } } diff --git a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/records/AuthorRecord.java b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/records/AuthorRecord.java index 20a7309a27..5ed211c8d9 100644 --- a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/records/AuthorRecord.java +++ b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/records/AuthorRecord.java @@ -4,7 +4,7 @@ package org.jooq.example.flyway.ddl.db.h2.tables.records; -import java.sql.Date; +import java.time.LocalDate; import javax.annotation.processing.Generated; @@ -27,9 +27,9 @@ import org.jooq.impl.UpdatableRecordImpl; comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class AuthorRecord extends UpdatableRecordImpl implements Record6 { +public class AuthorRecord extends UpdatableRecordImpl implements Record6 { - private static final long serialVersionUID = 1547569460; + private static final long serialVersionUID = -46707278; /** * Setter for FLYWAY_TEST.AUTHOR.ID. @@ -76,15 +76,15 @@ public class AuthorRecord extends UpdatableRecordImpl implements R /** * Setter for FLYWAY_TEST.AUTHOR.DATE_OF_BIRTH. */ - public void setDateOfBirth(Date value) { + public void setDateOfBirth(LocalDate value) { set(3, value); } /** * Getter for FLYWAY_TEST.AUTHOR.DATE_OF_BIRTH. */ - public Date getDateOfBirth() { - return (Date) get(3); + public LocalDate getDateOfBirth() { + return (LocalDate) get(3); } /** @@ -129,12 +129,12 @@ public class AuthorRecord extends UpdatableRecordImpl implements R // ------------------------------------------------------------------------- @Override - public Row6 fieldsRow() { + public Row6 fieldsRow() { return (Row6) super.fieldsRow(); } @Override - public Row6 valuesRow() { + public Row6 valuesRow() { return (Row6) super.valuesRow(); } @@ -154,7 +154,7 @@ public class AuthorRecord extends UpdatableRecordImpl implements R } @Override - public Field field4() { + public Field field4() { return Author.AUTHOR.DATE_OF_BIRTH; } @@ -184,7 +184,7 @@ public class AuthorRecord extends UpdatableRecordImpl implements R } @Override - public Date component4() { + public LocalDate component4() { return getDateOfBirth(); } @@ -214,7 +214,7 @@ public class AuthorRecord extends UpdatableRecordImpl implements R } @Override - public Date value4() { + public LocalDate value4() { return getDateOfBirth(); } @@ -247,7 +247,7 @@ public class AuthorRecord extends UpdatableRecordImpl implements R } @Override - public AuthorRecord value4(Date value) { + public AuthorRecord value4(LocalDate value) { setDateOfBirth(value); return this; } @@ -265,7 +265,7 @@ public class AuthorRecord extends UpdatableRecordImpl implements R } @Override - public AuthorRecord values(Integer value1, String value2, String value3, Date value4, Integer value5, String value6) { + public AuthorRecord values(Integer value1, String value2, String value3, LocalDate value4, Integer value5, String value6) { value1(value1); value2(value2); value3(value3); @@ -289,7 +289,7 @@ public class AuthorRecord extends UpdatableRecordImpl implements R /** * Create a detached, initialised AuthorRecord */ - public AuthorRecord(Integer id, String firstName, String lastName, Date dateOfBirth, Integer yearOfBirth, String address) { + public AuthorRecord(Integer id, String firstName, String lastName, LocalDate dateOfBirth, Integer yearOfBirth, String address) { super(Author.AUTHOR); set(0, id); diff --git a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/Author.java b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/Author.java index 947dacb47d..cb109e52dd 100644 --- a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/Author.java +++ b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/Author.java @@ -4,7 +4,7 @@ package org.jooq.example.db.h2.tables; -import java.sql.Date; +import java.time.LocalDate; import java.util.Arrays; import java.util.List; @@ -33,7 +33,7 @@ import org.jooq.impl.TableImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Author extends TableImpl { - private static final long serialVersionUID = -2056329379; + private static final long serialVersionUID = 43261682; /** * The reference instance of PUBLIC.AUTHOR @@ -66,7 +66,7 @@ public class Author extends TableImpl { /** * The column PUBLIC.AUTHOR.DATE_OF_BIRTH. */ - public final TableField DATE_OF_BIRTH = createField(DSL.name("DATE_OF_BIRTH"), org.jooq.impl.SQLDataType.DATE, this, ""); + public final TableField DATE_OF_BIRTH = createField(DSL.name("DATE_OF_BIRTH"), org.jooq.impl.SQLDataType.LOCALDATE, this, ""); /** * The column PUBLIC.AUTHOR.YEAR_OF_BIRTH. @@ -167,7 +167,7 @@ public class Author extends TableImpl { // ------------------------------------------------------------------------- @Override - public Row6 fieldsRow() { + public Row6 fieldsRow() { return (Row6) super.fieldsRow(); } } diff --git a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/Book.java b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/Book.java index 432d4ca85e..62cb06c94e 100644 --- a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/Book.java +++ b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/Book.java @@ -4,7 +4,7 @@ package org.jooq.example.db.h2.tables; -import java.sql.Timestamp; +import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; @@ -33,7 +33,7 @@ import org.jooq.impl.TableImpl; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Book extends TableImpl { - private static final long serialVersionUID = 594626133; + private static final long serialVersionUID = 184149473; /** * The reference instance of PUBLIC.BOOK @@ -101,7 +101,7 @@ public class Book extends TableImpl { /** * The column PUBLIC.BOOK.REC_TIMESTAMP. */ - public final TableField REC_TIMESTAMP = createField(DSL.name("REC_TIMESTAMP"), org.jooq.impl.SQLDataType.TIMESTAMP.precision(6), this, ""); + public final TableField REC_TIMESTAMP = createField(DSL.name("REC_TIMESTAMP"), org.jooq.impl.SQLDataType.LOCALDATETIME, this, ""); /** * Create a PUBLIC.BOOK table reference @@ -205,7 +205,7 @@ public class Book extends TableImpl { // ------------------------------------------------------------------------- @Override - public Row11 fieldsRow() { + public Row11 fieldsRow() { return (Row11) super.fieldsRow(); } } diff --git a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/pojos/Author.java b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/pojos/Author.java index 452def4c43..3da89ae7ae 100644 --- a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/pojos/Author.java +++ b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/pojos/Author.java @@ -5,7 +5,7 @@ package org.jooq.example.db.h2.tables.pojos; import java.io.Serializable; -import java.sql.Date; +import java.time.LocalDate; /** @@ -14,14 +14,14 @@ import java.sql.Date; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Author implements Serializable { - private static final long serialVersionUID = -1428731841; + private static final long serialVersionUID = 1287432081; - private Integer id; - private String firstName; - private String lastName; - private Date dateOfBirth; - private Integer yearOfBirth; - private String address; + private Integer id; + private String firstName; + private String lastName; + private LocalDate dateOfBirth; + private Integer yearOfBirth; + private String address; public Author() {} @@ -35,12 +35,12 @@ public class Author implements Serializable { } public Author( - Integer id, - String firstName, - String lastName, - Date dateOfBirth, - Integer yearOfBirth, - String address + Integer id, + String firstName, + String lastName, + LocalDate dateOfBirth, + Integer yearOfBirth, + String address ) { this.id = id; this.firstName = firstName; @@ -74,11 +74,11 @@ public class Author implements Serializable { this.lastName = lastName; } - public Date getDateOfBirth() { + public LocalDate getDateOfBirth() { return this.dateOfBirth; } - public void setDateOfBirth(Date dateOfBirth) { + public void setDateOfBirth(LocalDate dateOfBirth) { this.dateOfBirth = dateOfBirth; } diff --git a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/pojos/Book.java b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/pojos/Book.java index 92d501f780..a9c0fde8ac 100644 --- a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/pojos/Book.java +++ b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/pojos/Book.java @@ -5,7 +5,7 @@ package org.jooq.example.db.h2.tables.pojos; import java.io.Serializable; -import java.sql.Timestamp; +import java.time.LocalDateTime; /** @@ -14,19 +14,19 @@ import java.sql.Timestamp; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Book implements Serializable { - private static final long serialVersionUID = 1601595464; + private static final long serialVersionUID = 610281033; - private Integer id; - private Integer authorId; - private Integer coAuthorId; - private Integer detailsId; - private String title; - private Integer publishedIn; - private Integer languageId; - private String contentText; - private byte[] contentPdf; - private Integer recVersion; - private Timestamp recTimestamp; + private Integer id; + private Integer authorId; + private Integer coAuthorId; + private Integer detailsId; + private String title; + private Integer publishedIn; + private Integer languageId; + private String contentText; + private byte[] contentPdf; + private Integer recVersion; + private LocalDateTime recTimestamp; public Book() {} @@ -45,17 +45,17 @@ public class Book implements Serializable { } public Book( - Integer id, - Integer authorId, - Integer coAuthorId, - Integer detailsId, - String title, - Integer publishedIn, - Integer languageId, - String contentText, - byte[] contentPdf, - Integer recVersion, - Timestamp recTimestamp + Integer id, + Integer authorId, + Integer coAuthorId, + Integer detailsId, + String title, + Integer publishedIn, + Integer languageId, + String contentText, + byte[] contentPdf, + Integer recVersion, + LocalDateTime recTimestamp ) { this.id = id; this.authorId = authorId; @@ -138,7 +138,7 @@ public class Book implements Serializable { return this.contentPdf; } - public void setContentPdf(byte... contentPdf) { + public void setContentPdf(byte[] contentPdf) { this.contentPdf = contentPdf; } @@ -150,11 +150,11 @@ public class Book implements Serializable { this.recVersion = recVersion; } - public Timestamp getRecTimestamp() { + public LocalDateTime getRecTimestamp() { return this.recTimestamp; } - public void setRecTimestamp(Timestamp recTimestamp) { + public void setRecTimestamp(LocalDateTime recTimestamp) { this.recTimestamp = recTimestamp; } diff --git a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/records/AuthorRecord.java b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/records/AuthorRecord.java index 5cf8a52f8a..27357d465a 100644 --- a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/records/AuthorRecord.java +++ b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/records/AuthorRecord.java @@ -4,7 +4,7 @@ package org.jooq.example.db.h2.tables.records; -import java.sql.Date; +import java.time.LocalDate; import org.jooq.Field; import org.jooq.Record1; @@ -18,9 +18,9 @@ import org.jooq.impl.UpdatableRecordImpl; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class AuthorRecord extends UpdatableRecordImpl implements Record6 { +public class AuthorRecord extends UpdatableRecordImpl implements Record6 { - private static final long serialVersionUID = 1334443580; + private static final long serialVersionUID = -302075124; /** * Setter for PUBLIC.AUTHOR.ID. @@ -67,15 +67,15 @@ public class AuthorRecord extends UpdatableRecordImpl implements R /** * Setter for PUBLIC.AUTHOR.DATE_OF_BIRTH. */ - public void setDateOfBirth(Date value) { + public void setDateOfBirth(LocalDate value) { set(3, value); } /** * Getter for PUBLIC.AUTHOR.DATE_OF_BIRTH. */ - public Date getDateOfBirth() { - return (Date) get(3); + public LocalDate getDateOfBirth() { + return (LocalDate) get(3); } /** @@ -120,12 +120,12 @@ public class AuthorRecord extends UpdatableRecordImpl implements R // ------------------------------------------------------------------------- @Override - public Row6 fieldsRow() { + public Row6 fieldsRow() { return (Row6) super.fieldsRow(); } @Override - public Row6 valuesRow() { + public Row6 valuesRow() { return (Row6) super.valuesRow(); } @@ -145,7 +145,7 @@ public class AuthorRecord extends UpdatableRecordImpl implements R } @Override - public Field field4() { + public Field field4() { return Author.AUTHOR.DATE_OF_BIRTH; } @@ -175,7 +175,7 @@ public class AuthorRecord extends UpdatableRecordImpl implements R } @Override - public Date component4() { + public LocalDate component4() { return getDateOfBirth(); } @@ -205,7 +205,7 @@ public class AuthorRecord extends UpdatableRecordImpl implements R } @Override - public Date value4() { + public LocalDate value4() { return getDateOfBirth(); } @@ -238,7 +238,7 @@ public class AuthorRecord extends UpdatableRecordImpl implements R } @Override - public AuthorRecord value4(Date value) { + public AuthorRecord value4(LocalDate value) { setDateOfBirth(value); return this; } @@ -256,7 +256,7 @@ public class AuthorRecord extends UpdatableRecordImpl implements R } @Override - public AuthorRecord values(Integer value1, String value2, String value3, Date value4, Integer value5, String value6) { + public AuthorRecord values(Integer value1, String value2, String value3, LocalDate value4, Integer value5, String value6) { value1(value1); value2(value2); value3(value3); @@ -280,7 +280,7 @@ public class AuthorRecord extends UpdatableRecordImpl implements R /** * Create a detached, initialised AuthorRecord */ - public AuthorRecord(Integer id, String firstName, String lastName, Date dateOfBirth, Integer yearOfBirth, String address) { + public AuthorRecord(Integer id, String firstName, String lastName, LocalDate dateOfBirth, Integer yearOfBirth, String address) { super(Author.AUTHOR); set(0, id); diff --git a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/records/BookRecord.java b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/records/BookRecord.java index 0d7895e210..9cf59457a1 100644 --- a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/records/BookRecord.java +++ b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/records/BookRecord.java @@ -4,7 +4,7 @@ package org.jooq.example.db.h2.tables.records; -import java.sql.Timestamp; +import java.time.LocalDateTime; import org.jooq.Field; import org.jooq.Record1; @@ -18,9 +18,9 @@ import org.jooq.impl.UpdatableRecordImpl; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class BookRecord extends UpdatableRecordImpl implements Record11 { +public class BookRecord extends UpdatableRecordImpl implements Record11 { - private static final long serialVersionUID = 1300065611; + private static final long serialVersionUID = -1176296618; /** * Setter for PUBLIC.BOOK.ID. @@ -137,7 +137,7 @@ public class BookRecord extends UpdatableRecordImpl implements Recor /** * Setter for PUBLIC.BOOK.CONTENT_PDF. */ - public void setContentPdf(byte... value) { + public void setContentPdf(byte[] value) { set(8, value); } @@ -165,15 +165,15 @@ public class BookRecord extends UpdatableRecordImpl implements Recor /** * Setter for PUBLIC.BOOK.REC_TIMESTAMP. */ - public void setRecTimestamp(Timestamp value) { + public void setRecTimestamp(LocalDateTime value) { set(10, value); } /** * Getter for PUBLIC.BOOK.REC_TIMESTAMP. */ - public Timestamp getRecTimestamp() { - return (Timestamp) get(10); + public LocalDateTime getRecTimestamp() { + return (LocalDateTime) get(10); } // ------------------------------------------------------------------------- @@ -190,12 +190,12 @@ public class BookRecord extends UpdatableRecordImpl implements Recor // ------------------------------------------------------------------------- @Override - public Row11 fieldsRow() { + public Row11 fieldsRow() { return (Row11) super.fieldsRow(); } @Override - public Row11 valuesRow() { + public Row11 valuesRow() { return (Row11) super.valuesRow(); } @@ -250,7 +250,7 @@ public class BookRecord extends UpdatableRecordImpl implements Recor } @Override - public Field field11() { + public Field field11() { return Book.BOOK.REC_TIMESTAMP; } @@ -305,7 +305,7 @@ public class BookRecord extends UpdatableRecordImpl implements Recor } @Override - public Timestamp component11() { + public LocalDateTime component11() { return getRecTimestamp(); } @@ -360,7 +360,7 @@ public class BookRecord extends UpdatableRecordImpl implements Recor } @Override - public Timestamp value11() { + public LocalDateTime value11() { return getRecTimestamp(); } @@ -413,7 +413,7 @@ public class BookRecord extends UpdatableRecordImpl implements Recor } @Override - public BookRecord value9(byte... value) { + public BookRecord value9(byte[] value) { setContentPdf(value); return this; } @@ -425,13 +425,13 @@ public class BookRecord extends UpdatableRecordImpl implements Recor } @Override - public BookRecord value11(Timestamp value) { + public BookRecord value11(LocalDateTime value) { setRecTimestamp(value); return this; } @Override - public BookRecord values(Integer value1, Integer value2, Integer value3, Integer value4, String value5, Integer value6, Integer value7, String value8, byte[] value9, Integer value10, Timestamp value11) { + public BookRecord values(Integer value1, Integer value2, Integer value3, Integer value4, String value5, Integer value6, Integer value7, String value8, byte[] value9, Integer value10, LocalDateTime value11) { value1(value1); value2(value2); value3(value3); @@ -460,7 +460,7 @@ public class BookRecord extends UpdatableRecordImpl implements Recor /** * Create a detached, initialised BookRecord */ - public BookRecord(Integer id, Integer authorId, Integer coAuthorId, Integer detailsId, String title, Integer publishedIn, Integer languageId, String contentText, byte[] contentPdf, Integer recVersion, Timestamp recTimestamp) { + public BookRecord(Integer id, Integer authorId, Integer coAuthorId, Integer detailsId, String title, Integer publishedIn, Integer languageId, String contentText, byte[] contentPdf, Integer recVersion, LocalDateTime recTimestamp) { super(Book.BOOK); set(0, id); diff --git a/jOOQ-scala_2.13/pom.xml b/jOOQ-scala_2.13/pom.xml index 948f8b0bf4..251d326d4f 100644 --- a/jOOQ-scala_2.13/pom.xml +++ b/jOOQ-scala_2.13/pom.xml @@ -125,6 +125,7 @@ +