Skip to content

Commit 1b7d237

Browse files
committed
* Issue #249 TaskRepository: move the JQL Query-String to Entity as Prepared Statement
* Issue #234 Taskstate: Task Edit Form -> change Project via DropDown * Issue #235 Project/Root: Task Edit Form -> change Project via DropDown * Issue #236 Project/id: Task Edit Form -> change Project via DropDown
1 parent 948d8c6 commit 1b7d237

File tree

1 file changed

+18
-6
lines changed
  • src/main/java/org/woehlke/simpleworklist/domain/task

1 file changed

+18
-6
lines changed

src/main/java/org/woehlke/simpleworklist/domain/task/Task.java

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,40 @@
44
import java.util.Date;
55

66
import javax.persistence.*;
7-
import javax.persistence.Index;
87

98

109
import lombok.EqualsAndHashCode;
1110
import lombok.Getter;
1211
import lombok.Setter;
1312
import lombok.ToString;
14-
import org.hibernate.annotations.*;
13+
//simport org.hibernate.annotations.*;
14+
//import org.hibernate.annotations.CascadeType;
15+
//import org.hibernate.annotations.NamedQueries;
16+
//import org.hibernate.annotations.NamedQuery;
17+
import org.hibernate.annotations.LazyToOne;
18+
import org.hibernate.annotations.OnDelete;
19+
import org.hibernate.annotations.OnDeleteAction;
1520
import org.hibernate.validator.constraints.Length;
1621

22+
23+
import javax.persistence.Entity;
24+
import javax.persistence.Index;
25+
import javax.persistence.Table;
26+
import javax.persistence.Temporal;
1727
import javax.validation.constraints.NotBlank;
1828
import javax.validation.constraints.NotNull;
1929

2030
//import org.hibernate.validator.constraints.SafeHtml;
2131
import org.springframework.data.jpa.repository.*;
32+
//import org.springframework.data.jpa.repository.Temporal;
2233
import org.springframework.format.annotation.DateTimeFormat;
2334
import org.woehlke.simpleworklist.domain.context.Context;
2435
import org.woehlke.simpleworklist.domain.project.Project;
2536
import org.woehlke.simpleworklist.user.account.UserAccount;
2637
import org.woehlke.simpleworklist.application.common.AuditModel;
2738
import org.woehlke.simpleworklist.application.common.ComparableById;
2839

40+
import static javax.persistence.TemporalType.*;
2941
import static org.hibernate.annotations.LazyToOneOption.PROXY;
3042

3143
//TODO: test all three UniqueConstraints
@@ -58,21 +70,21 @@
5870
query = "select t from Task t"
5971
+ " where t.orderIdTaskState > :lowerOrderIdTaskState and t.orderIdTaskState < :higherOrderIdTaskState"
6072
+ " and t.taskState = :taskState and t.context = :context",
61-
readOnly = true
73+
lockMode = LockModeType.READ
6274
),
6375
@NamedQuery(
6476
name = "queryGetTasksByOrderIdProjectBetweenLowerTaskAndHigherTask",
6577
query = "select t from Task t"
6678
+ " where t.orderIdProject > :lowerOrderIdProject and t.orderIdProject < :higherOrderIdProject"
6779
+ " and t.project = :project",
68-
readOnly = true
80+
lockMode = LockModeType.READ
6981
),
7082
@NamedQuery(
7183
name = "queryGetTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask",
7284
query = "select t from Task t"
7385
+ " where t.orderIdProject > :lowerOrderIdProject and t.orderIdProject < :higherOrderIdProject"
7486
+ " and t.project is null and t.context = :context ",
75-
readOnly = true
87+
lockMode = LockModeType.READ
7688
)
7789
})
7890
@Getter
@@ -166,7 +178,7 @@ public class Task extends AuditModel implements Serializable, ComparableById<Tas
166178
@Enumerated(EnumType.STRING)
167179
private TaskTime taskTime;
168180

169-
@Temporal(value = TemporalType.DATE)
181+
@Temporal(DATE)
170182
@Column(name = "due_date", nullable = true)
171183
@DateTimeFormat(pattern="MM/dd/yyyy")
172184
private Date dueDate;

0 commit comments

Comments
 (0)