Skip to content

Commit 0d59d37

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent 68bd8d6 commit 0d59d37

File tree

13 files changed

+1
-143
lines changed

13 files changed

+1
-143
lines changed

‎src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbService.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import org.woehlke.java.simpleworklist.domain.context.Context;
44
import org.woehlke.java.simpleworklist.domain.project.Project;
5-
import org.woehlke.java.simpleworklist.domain.task.Task;
65
import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState;
76
import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
87

@@ -16,12 +15,6 @@ public interface BreadcrumbService {
1615

1716
Breadcrumb getBreadcrumbForTaskstate(TaskState taskstate, Locale locale, UserSessionBean userSession);
1817

19-
Breadcrumb getBreadcrumbForTaskstateAll(Locale locale, UserSessionBean userSession);
20-
21-
Breadcrumb getBreadcrumbForTaskInTaskstate(String taskstate, Task task, Locale locale, UserSessionBean userSession);
22-
23-
Breadcrumb getBreadcrumbForTaskInProject(Project thisProject, Task task, Locale local, UserSessionBean userSession);
24-
2518
Breadcrumb getBreadcrumbForUserProfileAndMenu(Locale locale,UserSessionBean userSession);
2619

2720
Breadcrumb getBreadcrumbForUserChangeName(Locale locale, UserSessionBean userSession);

‎src/main/java/org/woehlke/java/simpleworklist/domain/breadcrumb/BreadcrumbServiceImpl.java

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -85,37 +85,6 @@ public Breadcrumb getBreadcrumbForTaskstate(
8585
return breadcrumb;
8686
}
8787

88-
@Override
89-
public Breadcrumb getBreadcrumbForTaskInTaskstate(String taskstate, Task task, Locale locale, UserSessionBean userSession) {
90-
log.info("getBreadcrumbForTaskInTaskstate");
91-
Optional<Context> context = contextService.getContextFor(userSession);
92-
Breadcrumb breadcrumb = new Breadcrumb(locale, context.get());
93-
breadcrumb.addTaskstate(taskstate);
94-
breadcrumb.addTask(task);
95-
return breadcrumb;
96-
}
97-
98-
@Override
99-
public Breadcrumb getBreadcrumbForTaskstateAll(Locale locale, UserSessionBean userSession) {
100-
log.info("getBreadcrumbForTaskstateAll");
101-
Optional<Context> context = contextService.getContextFor(userSession);
102-
Breadcrumb breadcrumb = new Breadcrumb(locale, context.get());
103-
String code="layout.page.all";
104-
String name= messageSource.getMessage(code,null,locale);
105-
String url="/taskstate/all";
106-
breadcrumb.addPage(name,url);
107-
return breadcrumb;
108-
}
109-
110-
@Override
111-
public Breadcrumb getBreadcrumbForTaskInProject(Project thisProject, Task task, Locale locale, UserSessionBean userSession) {
112-
log.info("getBreadcrumbForTaskInProject");
113-
Breadcrumb breadcrumb = new Breadcrumb(locale,thisProject.getContext());
114-
breadcrumb.addProject(thisProject);
115-
breadcrumb.addTask(task);
116-
return breadcrumb;
117-
}
118-
11988
@Override
12089
public Breadcrumb getBreadcrumbForUserProfileAndMenu(Locale locale, UserSessionBean userSession) {
12190
log.info("getBreadcrumbForUserProfileAndMenu");

‎src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessage.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public class ChatMessage extends AuditModel implements Serializable {
4747
)
4848
private Long id;
4949

50-
//@SafeHtml(whitelistType= SafeHtml.WhiteListType.SIMPLE_TEXT)
5150
@NotBlank
5251
@Length(min=1,max=65535)
5352
@Column(name="message_text", nullable = false, length = 65535, columnDefinition="text")

‎src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageForm.java

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

44
import lombok.*;
55
import org.hibernate.validator.constraints.Length;
6-
//import org.hibernate.validator.constraints.SafeHtml;
76

87
import javax.validation.constraints.NotBlank;
98
import java.io.Serializable;
@@ -18,7 +17,6 @@ public class ChatMessageForm implements Serializable {
1817

1918
private static final long serialVersionUID = 1576610181966480168L;
2019

21-
//@SafeHtml(whitelistType= SafeHtml.WhiteListType.SIMPLE_TEXT)
2220
@NotBlank
2321
@Length(min=1,max=65535)
2422
private String messageText;

‎src/main/java/org/woehlke/java/simpleworklist/domain/chat/ChatMessageRepository.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,8 @@ List<ChatMessage> findByReceiverAndReadByReceiver(
3333
boolean readByReceiver
3434
);
3535

36-
Page<ChatMessage> findByReceiverAndReadByReceiver(
37-
UserAccount receiver,
38-
boolean readByReceiver,
39-
Pageable request
40-
);
41-
4236
List<ChatMessage> findBySenderAndReceiverAndReadByReceiver(
4337
UserAccount sender, UserAccount receiver, boolean readByReceiver
4438
);
4539

46-
Page<ChatMessage> findBySenderAndReceiverAndReadByReceiver(
47-
UserAccount sender, UserAccount receiver, boolean readByReceiver, Pageable request
48-
);
4940
}

‎src/main/java/org/woehlke/java/simpleworklist/domain/context/Context.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import org.hibernate.annotations.LazyToOne;
55
import org.hibernate.validator.constraints.Length;
66

7-
//import org.hibernate.validator.constraints.SafeHtml;
87
import org.woehlke.java.simpleworklist.application.framework.AuditModel;
98
import org.woehlke.java.simpleworklist.application.framework.ComparableById;
109
import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
@@ -62,14 +61,10 @@ public class Context extends AuditModel implements Serializable, ComparableById<
6261
@LazyToOne(PROXY)
6362
private UserAccount userAccount;
6463

65-
//@SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE)
66-
//@NotBlank
6764
@Length(min = 1, max = 255)
6865
@Column(name = "name_de", nullable = false)
6966
private String nameDe;
7067

71-
//@SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE)
72-
//@NotBlank
7368
@Length(min = 1, max = 255)
7469
@Column(name = "name_en", nullable = false)
7570
private String nameEn;

‎src/main/java/org/woehlke/java/simpleworklist/domain/context/ContextRepository.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
public interface ContextRepository extends JpaRepository<Context, Long> {
1616

1717
List<Context> findByUserAccount(UserAccount user);
18-
Page<Context> findByUserAccount(UserAccount user, Pageable pageRequest);
1918

2019
Context findByIdAndUserAccount(long newContextId, UserAccount userAccount);
2120

‎src/main/java/org/woehlke/java/simpleworklist/domain/context/NewContextForm.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import lombok.*;
44
import org.hibernate.validator.constraints.Length;
55
import javax.validation.constraints.NotBlank;
6-
//import org.hibernate.validator.constraints.SafeHtml;
76

87
import java.io.Serializable;
98

@@ -20,12 +19,10 @@ public class NewContextForm implements Serializable {
2019

2120
private static final long serialVersionUID = -937143305653156981L;
2221

23-
//@SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE)
2422
@NotBlank
2523
@Length(min = 1, max = 255)
2624
private String nameDe;
2725

28-
//@SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE)
2926
@NotBlank
3027
@Length(min = 1, max = 255)
3128
private String nameEn;

‎src/main/java/org/woehlke/java/simpleworklist/domain/project/Project.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.hibernate.annotations.OnDeleteAction;
1717
import org.hibernate.validator.constraints.Length;
1818
import javax.validation.constraints.NotBlank;
19-
//import org.hibernate.validator.constraints.SafeHtml;
2019
import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
2120
import org.woehlke.java.simpleworklist.domain.context.Context;
2221
import org.woehlke.java.simpleworklist.application.framework.AuditModel;
@@ -80,13 +79,11 @@ public class Project extends AuditModel implements Serializable, ComparableById<
8079
@OnDelete(action = OnDeleteAction.NO_ACTION)
8180
private Context context;
8281

83-
//@SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE)
8482
@NotBlank
8583
@Length(min = 1, max = 255)
8684
@Column(name = "name", nullable = false)
8785
private String name;
8886

89-
//@SafeHtml(whitelistType= SafeHtml.WhiteListType.RELAXED)
9087
@Length(min = 0, max = 65535)
9188
@Column(name = "description", nullable = true, length = 65535, columnDefinition = "text")
9289
private String description;
@@ -147,7 +144,6 @@ public boolean equalsByUuid(Project otherObject) {
147144
public static Project newProjectFactoryForParentProject(Project parent) {
148145
Project thisProject = new Project();
149146
thisProject.setUuid(UUID.randomUUID());
150-
//thisProject.setName("name");
151147
thisProject.setParent(parent);
152148
thisProject.setContext(parent.getContext());
153149
return thisProject;

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

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010
import lombok.Getter;
1111
import lombok.Setter;
1212
import lombok.ToString;
13-
//import org.hibernate.annotations.*;
14-
//import org.hibernate.annotations.CascadeType;
15-
//import org.hibernate.annotations.NamedQueries;
16-
//import org.hibernate.annotations.NamedQuery;
1713
import org.hibernate.annotations.LazyToOne;
1814
import org.hibernate.annotations.OnDelete;
1915
import org.hibernate.annotations.OnDeleteAction;
@@ -27,8 +23,6 @@
2723
import javax.validation.constraints.NotBlank;
2824
import javax.validation.constraints.NotNull;
2925

30-
//import org.hibernate.validator.constraints.SafeHtml;
31-
//import org.springframework.data.jpa.repository.Temporal;
3226
import org.springframework.format.annotation.DateTimeFormat;
3327
import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState;
3428
import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
@@ -48,15 +42,7 @@
4842
@UniqueConstraint(
4943
name="ux_task",
5044
columnNames = {"uuid", "context_id" }
51-
)/*,
52-
@UniqueConstraint(
53-
name="ux_task_order_id_project",
54-
columnNames = {"order_id_project", "project_id", "context_id", "user_account_id"}
55-
),
56-
@UniqueConstraint(
57-
name="ux_task_order_id_task_state",
58-
columnNames = {"order_id_task_state", "task_state", "context_id", "user_account_id"}
59-
)*/
45+
)
6046
},
6147
indexes = {
6248
@Index(name = "ix_task_uuid", columnList = "uuid"),
@@ -153,7 +139,6 @@ public class Task extends AuditModel implements Serializable, ComparableById<Tas
153139
private Context context;
154140

155141

156-
//@SafeHtml(whitelistType= SafeHtml.WhiteListType.NONE)
157142
@NotBlank
158143
@Length(min=1,max=255)
159144
@Column(name = "title", nullable = false)

‎src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskRepository.java

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ public interface TaskRepository extends JpaRepository<Task, Long> {
2121
Page<Task> findByProjectIsNullAndContext(Context context, Pageable request);
2222

2323
List<Task> findByContext(Context context);
24-
Page<Task> findByContext(Context context, Pageable pageable);
2524

2625
Task findTopByTaskStateAndContextOrderByOrderIdTaskStateDesc(TaskState taskState, Context context);
2726
Task findTopByProjectIsNullAndContextOrderByOrderIdProjectDesc(Context context);
@@ -36,14 +35,7 @@ public interface TaskRepository extends JpaRepository<Task, Long> {
3635
List<Task> findByTaskStateAndContextOrderByOrderIdTaskStateAsc(
3736
TaskState taskState, Context context
3837
);
39-
Page<Task> findByTaskStateAndContextOrderByOrderIdTaskStateAsc(
40-
TaskState taskState, Context context, Pageable request
41-
);
4238

43-
//TODO: #249 move the JQL Query-String to Entity as Prepared Statement
44-
//@Query("select t from Task t"
45-
// + " where t.orderIdTaskState > :lowerOrderIdTaskState and t.orderIdTaskState < :higherOrderIdTaskState"
46-
// + " and t.taskState = :taskState and t.context = :context")
4739
@Query(name="queryGetTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask")
4840
List<Task> getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(
4941
@Param("lowerOrderIdTaskState") long lowerOrderIdTaskState,
@@ -52,57 +44,19 @@ List<Task> getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(
5244
@Param("context") Context context
5345
);
5446

55-
//TODO: #249 move the JQL Query-String to Entity as Prepared Statement
56-
@Query(name="queryGetTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask")
57-
Page<Task> getTasksByOrderIdTaskStateBetweenLowerTaskAndHigherTask(
58-
@Param("lowerOrderIdTaskState") long lowerOrderIdTaskState,
59-
@Param("higherOrderIdTaskState") long higherOrderIdTaskState,
60-
@Param("taskState") TaskState taskState,
61-
@Param("context") Context context,
62-
Pageable request
63-
);
64-
65-
//TODO: #249 move the JQL Query-String to Entity as Prepared Statement
6647
@Query(name="queryGetTasksByOrderIdProjectBetweenLowerTaskAndHigherTask")
6748
List<Task> getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
6849
@Param("lowerOrderIdProject") long lowerOrderIdProject,
6950
@Param("higherOrderIdProject") long higherOrderIdProject,
7051
@Param("project") Project project
7152
);
7253

73-
//TODO: #249 move the JQL Query-String to Entity as Prepared Statement
74-
//@Query("select t from Task t"
75-
// + " where t.orderIdProject > :lowerOrderIdProject and t.orderIdProject < :higherOrderIdProject"
76-
// + " and t.project = :project")
77-
@Query(name="queryGetTasksByOrderIdProjectBetweenLowerTaskAndHigherTask")
78-
Page<Task> getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
79-
@Param("lowerOrderIdProject") long lowerOrderIdProject,
80-
@Param("higherOrderIdProject") long higherOrderIdProject,
81-
@Param("project") Project project,
82-
Pageable request
83-
);
84-
85-
//TODO: #249 move the JQL Query-String to Entity as Prepared Statement
86-
//@Query("select t from Task t"
87-
// + " where t.orderIdProject > :lowerOrderIdProject and t.orderIdProject < :higherOrderIdProject"
88-
// + " and t.project is null and t.context = :context ")
8954
@Query(name = "queryGetTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask")
9055
List<Task> getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(
9156
@Param("lowerOrderIdProject") long lowerOrderIdProject,
9257
@Param("higherOrderIdProject") long higherOrderIdProject,
9358
@Param("context") Context context
9459
);
9560

96-
//TODO: #249 move the JQL Query-String to Entity as Prepared Statement
97-
//@Query("select t from Task t"
98-
// + " where t.orderIdProject > :lowerOrderIdProject and t.orderIdProject < :higherOrderIdProject"
99-
// + " and t.project is null and t.context = :context ")
100-
@Query(name = "queryGetTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask")
101-
Page<Task> getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(
102-
@Param("lowerOrderIdProject") long lowerOrderIdProject,
103-
@Param("higherOrderIdProject") long higherOrderIdProject,
104-
@Param("context") Context context,
105-
Pageable request
106-
);
10761

10862
}

‎src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskServiceImpl.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ public Task findOne(@Min(1L) long taskId) {
8989
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
9090
public Task updatedViaTaskstate(@NotNull Task task) {
9191
log.info("updatedViaTaskstate");
92-
//long maxOrderIdTaskState = this.getMaxOrderIdTaskState(task.getTaskState(),task.getContext());
93-
//task.setOrderIdTaskState(++maxOrderIdTaskState);
9492
task = taskRepository.saveAndFlush(task);
9593
log.info("persisted: " + task.outTaskstate());
9694
return task;
@@ -100,8 +98,6 @@ public Task updatedViaTaskstate(@NotNull Task task) {
10098
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
10199
public Task updatedViaProject(@NotNull Task task) {
102100
log.info("updatedViaProject");
103-
//long maxOrderIdProject = this.getMaxOrderIdProject(task.getProject(), task.getContext());
104-
//task.setOrderIdProject(++maxOrderIdProject);
105101
task = taskRepository.saveAndFlush(task);
106102
log.info("persisted Task: " + task.outProject());
107103
return task;
@@ -111,8 +107,6 @@ public Task updatedViaProject(@NotNull Task task) {
111107
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
112108
public Task updatedViaProjectRoot(@NotNull Task task) {
113109
log.info("updatedViaProject");
114-
//long maxOrderIdProject = this.getMaxOrderIdProjectRoot(task.getContext());
115-
//task.setOrderIdProject(++maxOrderIdProject);
116110
task = taskRepository.saveAndFlush(task);
117111
log.info("persisted Task: " + task.outProject());
118112
return task;
@@ -332,14 +326,11 @@ public void moveTasksUpByProjectRoot(@NotNull Task sourceTask, @NotNull Task des
332326
Context context = sourceTask.getContext();
333327
long lowerOrderIdProject = destinationTask.getOrderIdProject();
334328
long higherOrderIdProject = sourceTask.getOrderIdProject();
335-
//TODO: #244 change List<Task> to Page<Task>
336-
//noinspection deprecation
337329
List<Task> tasks = taskRepository.getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(
338330
lowerOrderIdProject,
339331
higherOrderIdProject,
340332
context
341333
);
342-
//TODO: #244 change List<Task> to Page<Task>
343334
List<Task> tasksMoved = new ArrayList<>(tasks.size()+2);
344335
for(Task task:tasks){
345336
task.moveUpByProject();
@@ -366,14 +357,11 @@ public void moveTasksDownByProjectRoot(@NotNull Task sourceTask, @NotNull Task d
366357
Context context = sourceTask.getContext();
367358
final long lowerOrderIdProject = sourceTask.getOrderIdProject();
368359
final long higherOrderIdProject = destinationTask.getOrderIdProject();
369-
//TODO: #244 change List<Task> to Page<Task>
370-
//noinspection deprecation
371360
List<Task> tasks = taskRepository.getTasksByOrderIdProjectRootBetweenLowerTaskAndHigherTask(
372361
lowerOrderIdProject,
373362
higherOrderIdProject,
374363
context
375364
);
376-
//TODO: #244 change List<Task> to Page<Task>
377365
List<Task> tasksMoved = new ArrayList<>(tasks.size()+2);
378366
for(Task task:tasks){
379367
task.moveDownByProject();
@@ -401,14 +389,11 @@ public void moveTasksUpByProject(@NotNull Task sourceTask, @NotNull Task destina
401389
log.info("-------------------------------------------------------------------------------");
402390
long lowerOrderIdProject = destinationTask.getOrderIdProject();
403391
long higherOrderIdProject = sourceTask.getOrderIdProject();
404-
//TODO: #244 change List<Task> to Page<Task>
405-
//noinspection deprecation
406392
List<Task> tasks = taskRepository.getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
407393
lowerOrderIdProject,
408394
higherOrderIdProject,
409395
project
410396
);
411-
//TODO: #244 change List<Task> to Page<Task>
412397
List<Task> tasksMoved = new ArrayList<>(tasks.size()+2);
413398
for(Task task:tasks){
414399
task.moveUpByProject();
@@ -437,13 +422,11 @@ public void moveTasksDownByProject(@NotNull Task sourceTask, @NotNull Task desti
437422
log.info("-------------------------------------------------------------------------------");
438423
final long lowerOrderIdProject = sourceTask.getOrderIdProject();
439424
final long higherOrderIdProject = destinationTask.getOrderIdProject();
440-
//TODO: #244 change List<Task> to Page<Task>
441425
List<Task> tasks = taskRepository.getTasksByOrderIdProjectBetweenLowerTaskAndHigherTask(
442426
lowerOrderIdProject,
443427
higherOrderIdProject,
444428
project
445429
);
446-
//TODO: #244 change List<Task> to Page<Task>
447430
List<Task> tasksMoved = new ArrayList<>(tasks.size()+2);
448431
for(Task task:tasks){
449432
task.moveDownByProject();

0 commit comments

Comments
 (0)