Skip to content

Commit aaf61da

Browse files
thomaswoehlkethomaswoehlke
committed
migrate spring-bootfrom 2 to 3
1 parent fea9c8b commit aaf61da

File tree

8 files changed

+83
-50
lines changed

8 files changed

+83
-50
lines changed

‎src/main/java/org/woehlke/java/simpleworklist/application/framework/AuditModel.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import jakarta.persistence.*;
1111
import java.io.Serializable;
12-
import java.util.Date;
12+
import java.time.LocalDateTime;
1313
import java.util.Objects;
1414
import java.util.UUID;
1515

@@ -29,14 +29,14 @@ public class AuditModel extends Object implements Serializable {
2929
protected UUID uuid;
3030

3131
@CreatedDate
32-
@Temporal(TemporalType.TIMESTAMP)
32+
//@Temporal(TemporalType.TIMESTAMP)
3333
@Column(name = "row_created_at", nullable = false, updatable = false)
34-
protected Date rowCreatedAt;
34+
protected LocalDateTime rowCreatedAt;
3535

3636
@LastModifiedDate
37-
@Temporal(TemporalType.TIMESTAMP)
37+
//@Temporal(TemporalType.TIMESTAMP)
3838
@Column(name = "row_updated_at", nullable = false)
39-
protected Date rowUpdatedAt;
39+
protected LocalDateTime rowUpdatedAt;
4040

4141
@Override
4242
public boolean equals(Object o) {

‎src/main/java/org/woehlke/java/simpleworklist/domain/db/data/Project.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
import jakarta.validation.constraints.NotBlank;
1616
import jakarta.validation.constraints.NotNull;
1717
import java.io.Serializable;
18+
import java.time.LocalDateTime;
19+
import java.time.ZoneId;
1820
import java.util.*;
1921

2022
import static java.lang.Boolean.FALSE;
@@ -91,7 +93,8 @@ public class Project extends AuditModel implements Serializable, ComparableById<
9193

9294
public static Project getRootProject(Context projectsContext) {
9395
List<Project> children = new ArrayList<>();
94-
Date now = new Date();
96+
ZoneId zone = ZoneId.of("Europe/Paris");
97+
LocalDateTime now = LocalDateTime.now(zone);
9598
Project thisProject = new Project();
9699
thisProject.setId(0L);
97100
thisProject.setContext(projectsContext);

‎src/main/java/org/woehlke/java/simpleworklist/domain/db/data/Task.java‎

Lines changed: 55 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.woehlke.java.simpleworklist.domain.db.data;
22

3+
import java.io.Serial;
34
import java.io.Serializable;
45
import java.util.Date;
56

@@ -57,94 +58,107 @@
5758
@NamedQueries({
5859
@NamedQuery(
5960
name = "queryGetTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask",
60-
query = "select t from Task t"
61-
+ " where t.orderIdTaskState > :lowerOrderIdTaskState and t.orderIdTaskState < :higherOrderIdTaskState"
62-
+ " and t.taskState = :taskState and t.context = :context order by t.orderIdTaskState ",
61+
query = "SELECT t FROM org.woehlke.java.simpleworklist.domain.db.data.Task t"
62+
+ " WHERE t.orderIdTaskState > :lowerOrderIdTaskState AND t.orderIdTaskState < :higherOrderIdTaskState"
63+
+ " AND t.taskState = :taskState AND t.context = :context"
64+
+ " ORDER BY t.orderIdTaskState",
6365
lockMode = LockModeType.READ
6466
),
6567
@NamedQuery(
6668
name = "queryGetTasksByOrderIdProjectBetweenLowerTaskAndHigherTask",
67-
query = "select t from Task t"
68-
+ " where t.orderIdProject > :lowerOrderIdProject and t.orderIdProject < :higherOrderIdProject"
69-
+ " and t.project = :project order by t.orderIdProject DESC ",
69+
query = "SELECT t FROM org.woehlke.java.simpleworklist.domain.db.data.Task t"
70+
+ " WHERE t.orderIdProject > :lowerOrderIdProject AND t.orderIdProject < :higherOrderIdProject"
71+
+ " AND t.project = :project"
72+
+ " ORDER BY t.orderIdProject DESC",
7073
lockMode = LockModeType.READ
7174
),
7275
@NamedQuery(
7376
name = "queryGetTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask",
74-
query = "select t from Task t"
75-
+ " where t.orderIdProject > :lowerOrderIdProject and t.orderIdProject < :higherOrderIdProject"
76-
+ " and t.project is null and t.context = :context order by t.orderIdProject DESC ",
77+
query = "SELECT t FROM org.woehlke.java.simpleworklist.domain.db.data.Task t"
78+
+ " WHERE t.orderIdProject > :lowerOrderIdProject AND t.orderIdProject < :higherOrderIdProject"
79+
+ " AND t.project IS NULL AND t.context = :context"
80+
+ " ORDER BY t.orderIdProject DESC",
7781
lockMode = LockModeType.READ
7882
),
7983
@NamedQuery(
8084
name = "findByTaskStateInbox",
81-
query = "select t from Task t " +
82-
"where t.taskState = org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.INBOX " +
83-
"and t.context = :context order by t.orderIdTaskState DESC ",
85+
query = "SELECT t FROM org.woehlke.java.simpleworklist.domain.db.data.Task t"
86+
+ " WHERE t.taskState = org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.INBOX"
87+
+ " AND t.context = :context"
88+
+ " ORDER BY t.orderIdTaskState DESC",
8489
lockMode = LockModeType.READ
8590
),
8691
@NamedQuery(
8792
name = "findByTaskStateToday",
88-
query = "select t from Task t " +
89-
"where t.taskState = org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.TODAY " +
90-
"and t.context = :context order by t.orderIdTaskState DESC ",
93+
query = "SELECT t FROM org.woehlke.java.simpleworklist.domain.db.data.Task t "
94+
+ " WHERE t.taskState = org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.TODAY"
95+
+ " AND t.context = :context "
96+
+ " ORDER BY t.orderIdTaskState DESC",
9197
lockMode = LockModeType.READ
9298
),
9399
@NamedQuery(
94100
name = "findByTaskStateNext",
95-
query = "select t from Task t " +
96-
"where t.taskState = org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.NEXT " +
97-
"and t.context = :context order by t.orderIdTaskState DESC ",
101+
query = "SELECT t FROM org.woehlke.java.simpleworklist.domain.db.data.Task t "
102+
+ " WHERE t.taskState = org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.NEXT"
103+
+ " AND t.context = :context"
104+
+ " ORDER BY t.orderIdTaskState DESC",
98105
lockMode = LockModeType.READ
99106
),
100107
@NamedQuery(
101108
name = "findByTaskStateWaiting",
102-
query = "select t from Task t " +
103-
"where t.taskState = org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.WAITING " +
104-
"and t.context = :context order by t.orderIdTaskState DESC ",
109+
query = "SELECT t FROM org.woehlke.java.simpleworklist.domain.db.data.Task t"
110+
+ " WHERE t.taskState = org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.WAITING"
111+
+ " AND t.context = :context"
112+
+ " ORDER BY t.orderIdTaskState DESC",
105113
lockMode = LockModeType.READ
106114
),
107115
@NamedQuery(
108116
name = "findByTaskStateScheduled",
109-
query = "select t from Task t " +
110-
"where t.taskState = org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.SCHEDULED " +
111-
"and t.context = :context order by t.orderIdTaskState DESC ",
117+
query = "SELECT t FROM org.woehlke.java.simpleworklist.domain.db.data.Task t"
118+
+ " WHERE t.taskState = org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.SCHEDULED"
119+
+ " AND t.context = :context"
120+
+ " ORDER BY t.orderIdTaskState DESC",
112121
lockMode = LockModeType.READ
113122
),
114123
@NamedQuery(
115124
name = "findByTaskStateSomeday",
116-
query = "select t from Task t " +
117-
"where t.taskState = org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.SOMEDAY " +
118-
"and t.context = :context order by t.orderIdTaskState DESC ",
125+
query = "SELECT t FROM org.woehlke.java.simpleworklist.domain.db.data.Task t"
126+
+ " WHERE t.taskState = org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.SOMEDAY"
127+
+ " AND t.context = :context"
128+
+ " ORDER BY t.orderIdTaskState DESC",
119129
lockMode = LockModeType.READ
120130
),
121131
@NamedQuery(
122132
name = "findByTaskStateCompleted",
123-
query = "select t from Task t " +
124-
"where t.taskState = org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.COMPLETED " +
125-
"and t.context = :context order by t.orderIdTaskState DESC ",
133+
query = "SELECT t FROM org.woehlke.java.simpleworklist.domain.db.data.Task t"
134+
+ " WHERE t.taskState = org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.COMPLETED"
135+
+ " AND t.context = :context"
136+
+ " ORDER BY t.orderIdTaskState DESC",
126137
lockMode = LockModeType.READ
127138
),
128139
@NamedQuery(
129140
name = "findByTaskStateDeleted",
130-
query = "select t from Task t " +
131-
"where t.taskState = org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.DELETED " +
132-
"and t.context = :context order by t.orderIdTaskState DESC ",
141+
query = "SELECT t FROM org.woehlke.java.simpleworklist.domain.db.data.Task t"
142+
+ " WHERE t.taskState = org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.DELETED"
143+
+ " AND t.context = :context"
144+
+ " ORDER BY t.orderIdTaskState DESC",
133145
lockMode = LockModeType.READ
134146
),
135147
@NamedQuery(
136148
name = "findByTaskStateTrash",
137-
query = "select t from Task t " +
138-
"where t.taskState = org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.TRASH " +
139-
"or t.taskState = org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.DELETED " +
140-
"and t.context = :context order by t.orderIdTaskState DESC ",
149+
query = "SELECT t FROM org.woehlke.java.simpleworklist.domain.db.data.Task t"
150+
+ " WHERE t.taskState = org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.TRASH"
151+
+ " OR t.taskState = org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.DELETED"
152+
+ " AND t.context = :context"
153+
+ " ORDER BY t.orderIdTaskState DESC",
141154
lockMode = LockModeType.READ
142155
),
143156
@NamedQuery(
144157
name = "findByTaskStateProjects",
145-
query = "select t from Task t " +
146-
"where t.taskState = org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.PROJECTS " +
147-
"and t.context = :context order by t.orderIdTaskState DESC ",
158+
query = "SELECT t FROM org.woehlke.java.simpleworklist.domain.db.data.Task t"
159+
+ " WHERE t.taskState = org.woehlke.java.simpleworklist.domain.db.data.task.TaskState.PROJECTS"
160+
+ " AND t.context = :context"
161+
+ " ORDER BY t.orderIdTaskState DESC",
148162
lockMode = LockModeType.READ
149163
)
150164
})
@@ -154,6 +168,7 @@
154168
@ToString(callSuper = true, exclude="text")
155169
public class Task extends AuditModel implements Serializable, ComparableById<Task>, Comparable<Task> {
156170

171+
@Serial
157172
private static final long serialVersionUID = 5247710652586269801L;
158173

159174
@Id

‎src/main/java/org/woehlke/java/simpleworklist/domain/db/user/UserAccount.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.woehlke.java.simpleworklist.application.framework.AuditModel;
1313
import org.woehlke.java.simpleworklist.application.framework.ComparableById;
1414

15+
import java.io.Serial;
1516
import java.io.Serializable;
1617
import java.util.Date;
1718
import java.util.UUID;
@@ -37,8 +38,9 @@
3738
@Setter
3839
@EqualsAndHashCode(callSuper = true)
3940
@ToString(callSuper = true, exclude = {"userPassword","defaultLanguage","defaultContext","lastLoginTimestamp"})
40-
public class UserAccount extends AuditModel implements Serializable, ComparableById<UserAccount>,Comparable<UserAccount> {
41+
public class UserAccount extends AuditModel implements Serializable, ComparableById<UserAccount>, Comparable<UserAccount> {
4142

43+
@Serial
4244
private static final long serialVersionUID = 7860692526488291439L;
4345

4446
@Id

‎src/main/java/org/woehlke/java/simpleworklist/domain/db/user/UserAccountChatMessage.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
import jakarta.persistence.*;
99
import jakarta.validation.constraints.NotNull;
10+
11+
import java.io.Serial;
1012
import java.io.Serializable;
1113

1214
/**
@@ -29,9 +31,10 @@
2931
@NamedQueries({
3032
@NamedQuery(
3133
name = "queryFindAllMessagesBetweenCurrentAndOtherUser",
32-
query = "select m from org.woehlke.java.simpleworklist.domain.db.user.UserAccountChatMessage m " +
33-
"where (m.sender = :thisUser and m.receiver = :otherUser) " +
34-
"or (m.sender = :otherUser and m.receiver = :thisUser) order by m.rowCreatedAt desc"
34+
query = "SELECT m FROM org.woehlke.java.simpleworklist.domain.db.user.UserAccountChatMessage m"
35+
+ " WHERE (m.sender = :thisUser AND m.receiver = :otherUser)"
36+
+ " OR (m.sender = :otherUser AND m.receiver = :thisUser)"
37+
+ " ORDER BY m.rowCreatedAt DESC"
3538
)
3639
})
3740
@Getter
@@ -42,6 +45,7 @@
4245
@AllArgsConstructor
4346
public class UserAccountChatMessage extends AuditModel implements Serializable, Comparable<UserAccountChatMessage> {
4447

48+
@Serial
4549
private static final long serialVersionUID = 4263078228257938175L;
4650

4751
@Id

‎src/main/java/org/woehlke/java/simpleworklist/domain/db/user/UserAccountPassword.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
import jakarta.persistence.*;
99
import jakarta.validation.constraints.NotNull;
10+
11+
import java.io.Serial;
1012
import java.io.Serializable;
1113

1214
@Entity
@@ -27,6 +29,7 @@
2729
@Setter
2830
public class UserAccountPassword extends AuditModel implements Serializable, ComparableById<UserAccountPassword>, Comparable<UserAccountPassword> {
2931

32+
@Serial
3033
private static final long serialVersionUID = 7860692526488291439L;
3134

3235
@Id

‎src/main/java/org/woehlke/java/simpleworklist/domain/db/user/UserAccountPasswordRecovery.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
import jakarta.persistence.*;
99
import jakarta.validation.constraints.NotNull;
10+
11+
import java.io.Serial;
1012
import java.io.Serializable;
1113
import java.util.Objects;
1214

@@ -30,6 +32,7 @@
3032
)
3133
public class UserAccountPasswordRecovery extends AuditModel implements Serializable,Comparable<UserAccountPasswordRecovery> {
3234

35+
@Serial
3336
private static final long serialVersionUID = 6860716425733119940L;
3437

3538
@Id

‎src/main/java/org/woehlke/java/simpleworklist/domain/db/user/UserAccountRegistration.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
import jakarta.persistence.*;
99
import jakarta.validation.constraints.NotNull;
10+
11+
import java.io.Serial;
1012
import java.io.Serializable;
1113
import java.util.Objects;
1214

@@ -31,6 +33,7 @@
3133
)
3234
public class UserAccountRegistration extends AuditModel implements Serializable,Comparable<UserAccountRegistration> {
3335

36+
@Serial
3437
private static final long serialVersionUID = -1955967514018161878L;
3538

3639
@Id

0 commit comments

Comments
 (0)