Skip to content

Commit 8130a9c

Browse files
committed
Issue #91 Increase to 7.0.0
Removes the JpaMapping. Adds a FAQ Section in README regarding java.sql.Timestamp conversion. Bumps version to 7.0.0 and updates the README accordingly.
1 parent c83919f commit 8130a9c

15 files changed

Lines changed: 79 additions & 1015 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# CHANGELOG #
22

3+
## 7.0.0 ##
4+
5+
* The ``JpaMapping<>`` has been dropped from the library.
6+
37
## 6.0.1 ##
48

59
* Adding ``SimpleRow#setTime`` for mapping ``LocalTime``

PgBulkInsert/pgbulkinsert-bulkprocessor/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>de.bytefish.pgbulkinsert</groupId>
1010
<artifactId>pgbulkinsert-parent</artifactId>
11-
<version>6.0.1</version>
11+
<version>7.0.0</version>
1212
<relativePath>..</relativePath>
1313
</parent>
1414

PgBulkInsert/pgbulkinsert-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>de.bytefish.pgbulkinsert</groupId>
1010
<artifactId>pgbulkinsert-parent</artifactId>
11-
<version>6.0.1</version>
11+
<version>7.0.0</version>
1212
<relativePath>..</relativePath>
1313
</parent>
1414

PgBulkInsert/pgbulkinsert-core/src/test/java/de/bytefish/pgbulkinsert/test/integration/TimestampConversionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public static class EMailMapping extends AbstractMapping<EMail>
4646
public EMailMapping(String schema) {
4747
super(schema, "unit_test");
4848

49-
mapTimeStamp("email_create_time", x -> x != null ? Objects.requireNonNull(x.getEmailCreateTime(), "email_create_time").toLocalDateTime() : null);
49+
mapTimeStamp("email_create_time", x -> x.getEmailCreateTime() != null ? x.getEmailCreateTime().toLocalDateTime() : null);
5050
}
5151
}
5252

PgBulkInsert/pgbulkinsert-core/src/test/java/de/bytefish/pgbulkinsert/test/issues/TimestampMappingIssueTest.java

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -59,34 +59,34 @@ private static class Ticket {
5959
public String errorCode;
6060
}
6161

62-
private static class TicketMapping extends AbstractMapping<Ticket> {
63-
public TicketMapping(String schema) {
64-
super(schema, "unit_test");
65-
66-
mapText("job_id", x -> x.jobId);
67-
mapText("entity_id", x -> x.entityId);
68-
mapNumeric("step_no", x -> x.stepNo);
69-
mapText("status", x -> x.status != null ? x.status.name() : null);
70-
mapText("op_type", x -> x.opType);
71-
mapText("created_by", x -> x.createdBy);
72-
mapText("reset_by", x -> x.resetBy);
73-
mapTimeStamp("scheduled_end_time", x -> x.scheduledEndTime != null ? x.scheduledEndTime.toLocalDateTime() : null);
74-
mapTimeStamp("scheduled_start_time", x -> x.scheduledStartTime != null ? x.scheduledStartTime.toLocalDateTime() : null);
75-
mapTimeStamp("start_time", x -> x.startTime != null ? x.startTime.toLocalDateTime() : null);
76-
mapTimeStamp("end_time", x -> x.endTime != null ? x.endTime.toLocalDateTime() : null);
77-
mapBoolean("retryable", x -> x != null ? x.retryable : null);
78-
mapNumeric("retry_count", x -> x.retryCount);
79-
mapNumeric("cleanup_step", x -> x.cleanupStep);
80-
mapText("assigned_to", x -> x.assignedTo);
81-
mapText("external_ref_id", x -> x.externalRefId);
82-
mapText("ticket_detail", x -> x.ticketDetail);
83-
mapTimeStamp("created_time", x -> x.createdTime != null ? x.createdTime.toLocalDateTime() : null);
84-
mapText("updated_by", x -> x.updatedBy);
85-
mapBoolean("dry_run", x -> x != null ? x.dryRun : null);
86-
mapBoolean("cancel_requested", x -> x != null ? x.cancelRequested : null);
87-
mapText("abort_code", x -> x.abortCode);
88-
mapText("error_code", x -> x.errorCode);
89-
}
62+
private static class TicketMapping extends AbstractMapping<Ticket> {
63+
public TicketMapping(String schema) {
64+
super(schema, "unit_test");
65+
66+
mapText("job_id", x -> x.jobId);
67+
mapText("entity_id", x -> x.entityId);
68+
mapNumeric("step_no", x -> x.stepNo);
69+
mapText("status", x -> x.status != null ? x.status.name() : null);
70+
mapText("op_type", x -> x.opType);
71+
mapText("created_by", x -> x.createdBy);
72+
mapText("reset_by", x -> x.resetBy);
73+
mapTimeStamp("scheduled_end_time", x -> x.scheduledEndTime != null ? x.scheduledEndTime.toLocalDateTime() : null);
74+
mapTimeStamp("scheduled_start_time", x -> x.scheduledStartTime != null ? x.scheduledStartTime.toLocalDateTime() : null);
75+
mapTimeStamp("start_time", x -> x.startTime != null ? x.startTime.toLocalDateTime() : null);
76+
mapTimeStamp("end_time", x -> x.endTime != null ? x.endTime.toLocalDateTime() : null);
77+
mapBoolean("retryable", x -> x != null ? x.retryable : null);
78+
mapNumeric("retry_count", x -> x.retryCount);
79+
mapNumeric("cleanup_step", x -> x.cleanupStep);
80+
mapText("assigned_to", x -> x.assignedTo);
81+
mapText("external_ref_id", x -> x.externalRefId);
82+
mapText("ticket_detail", x -> x.ticketDetail);
83+
mapTimeStamp("created_time", x -> x.createdTime != null ? x.createdTime.toLocalDateTime() : null);
84+
mapText("updated_by", x -> x.updatedBy);
85+
mapBoolean("dry_run", x -> x != null ? x.dryRun : null);
86+
mapBoolean("cancel_requested", x -> x != null ? x.cancelRequested : null);
87+
mapText("abort_code", x -> x.abortCode);
88+
mapText("error_code", x -> x.errorCode);
89+
}
9090

9191

9292
}

PgBulkInsert/pgbulkinsert-jpa/pom.xml

Lines changed: 0 additions & 65 deletions
This file was deleted.

PgBulkInsert/pgbulkinsert-jpa/src/main/java/de/bytefish/pgbulkinsert/jpa/JpaMapping.java

Lines changed: 0 additions & 226 deletions
This file was deleted.

0 commit comments

Comments
 (0)