Skip to content

Commit 8a7a737

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent c1d5638 commit 8a7a737

File tree

2 files changed

+43
-31
lines changed

2 files changed

+43
-31
lines changed

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import javax.persistence.*;
1010
import javax.persistence.Index;
1111

12-
import lombok.EqualsAndHashCode;
1312
import lombok.Getter;
1413
import lombok.Setter;
1514
import lombok.ToString;
@@ -164,6 +163,18 @@ public String out(){
164163
return "Project: "+name+" ("+id+")";
165164
}
166165

167-
166+
@Override
167+
public boolean equals(Object o) {
168+
if (this == o) return true;
169+
if (!(o instanceof Project)) return false;
170+
if (!super.equals(o)) return false;
171+
Project project = (Project) o;
172+
return Objects.equals(getParent(), project.getParent()) && Objects.equals(getContext(), project.getContext()) && Objects.equals(getName(), project.getName()) && Objects.equals(getDescription(), project.getDescription());
173+
}
174+
175+
@Override
176+
public int hashCode() {
177+
return Objects.hash(super.hashCode(), getParent(), getContext(), getName(), getDescription());
178+
}
168179
}
169180

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

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.woehlke.java.simpleworklist.domain.project.ProjectRepository;
1313
import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState;
1414

15+
import javax.validation.Valid;
1516
import javax.validation.constraints.Min;
1617
import javax.validation.constraints.NotNull;
1718
import java.util.*;
@@ -58,7 +59,7 @@ public Page<Task> findbyTaskstate(
5859
@Override
5960
@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
6061
public Page<Task> findByProject(
61-
@NotNull Project thisProject, @NotNull Pageable request
62+
@NotNull Project thisProject,Pageable request
6263
) {
6364
log.info("findByProject: ");
6465
log.info("---------------------------------");
@@ -69,7 +70,7 @@ public Page<Task> findByProject(
6970

7071
@Override
7172
@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
72-
public Page<Task> findByRootProject(@NotNull Context context, @NotNull Pageable request) {
73+
public Page<Task> findByRootProject( Context context,Pageable request) {
7374
log.info("findByRootProject: ");
7475
return taskRepository.findByProjectIsNullAndContext(context, request);
7576
}
@@ -87,7 +88,7 @@ public Task findOne(@Min(1L) long taskId) {
8788

8889
@Override
8990
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
90-
public Task updatedViaTaskstate(@NotNull Task task) {
91+
public Task updatedViaTaskstate(Task task) {
9192
log.info("updatedViaTaskstate");
9293
if(task.getProject() != null){
9394
Long projectId = task.getProject().getId();
@@ -106,7 +107,7 @@ public Task updatedViaTaskstate(@NotNull Task task) {
106107

107108
@Override
108109
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
109-
public Task updatedViaProject(@NotNull Task task) {
110+
public Task updatedViaProject( @Valid Task task) {
110111
log.info("updatedViaProject");
111112
task = taskRepository.saveAndFlush(task);
112113
log.info("persisted Task: " + task.outProject());
@@ -115,7 +116,7 @@ public Task updatedViaProject(@NotNull Task task) {
115116

116117
@Override
117118
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
118-
public Task updatedViaProjectRoot(@NotNull Task task) {
119+
public Task updatedViaProjectRoot( @Valid Task task) {
119120
log.info("updatedViaProject");
120121
task = taskRepository.saveAndFlush(task);
121122
log.info("persisted Task: " + task.outProject());
@@ -124,7 +125,7 @@ public Task updatedViaProjectRoot(@NotNull Task task) {
124125

125126
@Override
126127
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
127-
public Task addToInbox(@NotNull Task task) {
128+
public Task addToInbox( @Valid Task task) {
128129
log.info("addToInbox");
129130
task.setUuid(UUID.randomUUID());
130131
task.setRootProject();
@@ -142,7 +143,7 @@ public Task addToInbox(@NotNull Task task) {
142143

143144
@Override
144145
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
145-
public Task addToProject(@NotNull Task task) {
146+
public Task addToProject( @Valid Task task) {
146147
log.info("addToProject");
147148
task.setUuid(UUID.randomUUID());
148149
task.unsetFocus();
@@ -157,7 +158,7 @@ public Task addToProject(@NotNull Task task) {
157158

158159
@Override
159160
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
160-
public Task addToRootProject(@NotNull Task task) {
161+
public Task addToRootProject( @Valid Task task) {
161162
log.info("addToRootProject");
162163
task.setUuid(UUID.randomUUID());
163164
task.setRootProject();
@@ -174,7 +175,7 @@ public Task addToRootProject(@NotNull Task task) {
174175

175176
@Override
176177
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
177-
public Task moveTaskToRootProject(@NotNull Task task) {
178+
public Task moveTaskToRootProject( @Valid Task task) {
178179
task.moveTaskToRootProject();
179180
long maxOrderIdProject = this.getMaxOrderIdProjectRoot(task.getContext());
180181
task.setOrderIdProject(++maxOrderIdProject);
@@ -183,7 +184,7 @@ public Task moveTaskToRootProject(@NotNull Task task) {
183184

184185
@Override
185186
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
186-
public Task moveTaskToAnotherProject(@NotNull Task task, @NotNull Project project) {
187+
public Task moveTaskToAnotherProject( @Valid Task task,@Valid Project project) {
187188
boolean okContext = task.hasSameContextAs(project);
188189
if(okContext) {
189190
task.moveTaskToAnotherProject(project);
@@ -199,7 +200,7 @@ public Task moveTaskToAnotherProject(@NotNull Task task, @NotNull Project projec
199200

200201
@Override
201202
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
202-
public void moveAllCompletedToTrash(@NotNull Context context) {
203+
public void moveAllCompletedToTrash( Context context) {
203204
long maxOrderIdTaskState = this.getMaxOrderIdTaskState(
204205
TaskState.TRASH,
205206
context
@@ -219,7 +220,7 @@ public void moveAllCompletedToTrash(@NotNull Context context) {
219220

220221
@Override
221222
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
222-
public void emptyTrash(@NotNull Context context) {
223+
public void emptyTrash( Context context) {
223224
List<Task> taskList = taskRepository.findByTaskStateAndContext(
224225
TaskState.TRASH,
225226
context
@@ -239,7 +240,7 @@ public void emptyTrash(@NotNull Context context) {
239240

240241
@Override
241242
@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
242-
public long getMaxOrderIdTaskState(@NotNull TaskState taskState, @NotNull Context context) {
243+
public long getMaxOrderIdTaskState( TaskState taskState,Context context) {
243244
Task task = taskRepository.findTopByTaskStateAndContextOrderByOrderIdTaskStateDesc(
244245
taskState,
245246
context
@@ -249,7 +250,7 @@ public long getMaxOrderIdTaskState(@NotNull TaskState taskState, @NotNull Contex
249250

250251
@Override
251252
@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
252-
public long getMaxOrderIdProject(@NotNull Project project, @NotNull Context context) {
253+
public long getMaxOrderIdProject( Project project,Context context) {
253254
Task task = taskRepository.findTopByProjectAndContextOrderByOrderIdProjectDesc(
254255
project,
255256
context
@@ -259,7 +260,7 @@ public long getMaxOrderIdProject(@NotNull Project project, @NotNull Context cont
259260

260261
@Override
261262
@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
262-
public long getMaxOrderIdProjectRoot(@NotNull Context context) {
263+
public long getMaxOrderIdProjectRoot( Context context) {
263264
Task task = taskRepository.findTopByProjectIsNullAndContextOrderByOrderIdProjectDesc(
264265
context
265266
);
@@ -268,7 +269,7 @@ public long getMaxOrderIdProjectRoot(@NotNull Context context) {
268269

269270
@Override
270271
@Transactional(propagation = Propagation.REQUIRED, readOnly = false)
271-
public void moveTasksUpByTaskState(@NotNull Task sourceTask, @NotNull Task destinationTask ) {
272+
public void moveTasksUpByTaskState(Task sourceTask, Task destinationTask ) {
272273
TaskState taskState = sourceTask.getTaskState();
273274
Context context = sourceTask.getContext();
274275
final long lowerOrderIdTaskState = destinationTask.getOrderIdTaskState();
@@ -297,7 +298,7 @@ public void moveTasksUpByTaskState(@NotNull Task sourceTask, @NotNull Task desti
297298

298299
@Override
299300
@Transactional(propagation = Propagation.REQUIRED, readOnly = false)
300-
public void moveTasksDownByTaskState(@NotNull Task sourceTask, @NotNull Task destinationTask ) {
301+
public void moveTasksDownByTaskState(Task sourceTask, Task destinationTask ) {
301302
log.info("-------------------------------------------------------------------------------");
302303
log.info(" moveTasks DOWN By TaskState: "+sourceTask.getId() +" -> "+ destinationTask.getId());
303304
log.info("-------------------------------------------------------------------------------");
@@ -330,7 +331,7 @@ public void moveTasksDownByTaskState(@NotNull Task sourceTask, @NotNull Task des
330331

331332
@Override
332333
@Transactional(propagation = Propagation.REQUIRED, readOnly = false)
333-
public void moveTasksUpByProjectRoot(@NotNull Task sourceTask, @NotNull Task destinationTask ) {
334+
public void moveTasksUpByProjectRoot(Task sourceTask, Task destinationTask ) {
334335
log.info("-------------------------------------------------------------------------------");
335336
log.info(" moveTasks UP By ProjectRoot: "+sourceTask.getId() +" -> "+ destinationTask.getId());
336337
log.info("-------------------------------------------------------------------------------");
@@ -360,7 +361,7 @@ public void moveTasksUpByProjectRoot(@NotNull Task sourceTask, @NotNull Task des
360361

361362
@Override
362363
@Transactional(propagation = Propagation.REQUIRED, readOnly = false)
363-
public void moveTasksDownByProjectRoot(@NotNull Task sourceTask, @NotNull Task destinationTask) {
364+
public void moveTasksDownByProjectRoot(Task sourceTask, Task destinationTask) {
364365
log.info("-------------------------------------------------------------------------------");
365366
log.info(" START moveTasks UP By Project Root");
366367
log.info(" "+sourceTask.outProject() +" -> "+ destinationTask.outProject());
@@ -392,7 +393,7 @@ public void moveTasksDownByProjectRoot(@NotNull Task sourceTask, @NotNull Task d
392393

393394
@Override
394395
@Transactional(propagation = Propagation.REQUIRED, readOnly = false)
395-
public void moveTasksUpByProject(@NotNull Task sourceTask, @NotNull Task destinationTask ) {
396+
public void moveTasksUpByProject(Task sourceTask, Task destinationTask ) {
396397
Project project = sourceTask.getProject();
397398
log.info("-------------------------------------------------------------------------------");
398399
log.info(" START moveTasks UP By Project("+project.out()+"):");
@@ -425,7 +426,7 @@ public void moveTasksUpByProject(@NotNull Task sourceTask, @NotNull Task destina
425426

426427
@Override
427428
@Transactional(propagation = Propagation.REQUIRED, readOnly = false)
428-
public void moveTasksDownByProject(@NotNull Task sourceTask, @NotNull Task destinationTask) {
429+
public void moveTasksDownByProject(Task sourceTask, Task destinationTask) {
429430
Project project = sourceTask.getProject();
430431
log.info("-------------------------------------------------------------------------------");
431432
log.info(" START moveTasks DOWN By Project("+project.out()+"):");
@@ -457,7 +458,7 @@ public void moveTasksDownByProject(@NotNull Task sourceTask, @NotNull Task desti
457458

458459
@Override
459460
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
460-
public Task moveTaskToInbox(@NotNull Task task) {
461+
public Task moveTaskToInbox(Task task) {
461462
long newOrderIdTaskState = this.getMaxOrderIdTaskState(
462463
TaskState.INBOX,
463464
task.getContext()
@@ -471,7 +472,7 @@ public Task moveTaskToInbox(@NotNull Task task) {
471472

472473
@Override
473474
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
474-
public Task moveTaskToToday(@NotNull Task task) {
475+
public Task moveTaskToToday(Task task) {
475476
Date now = new Date();
476477
long newOrderIdTaskState = this.getMaxOrderIdTaskState(
477478
TaskState.TODAY,
@@ -486,7 +487,7 @@ public Task moveTaskToToday(@NotNull Task task) {
486487

487488
@Override
488489
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
489-
public Task moveTaskToNext(@NotNull Task task) {
490+
public Task moveTaskToNext(Task task) {
490491
long newOrderIdTaskState = this.getMaxOrderIdTaskState(
491492
TaskState.NEXT,
492493
task.getContext()
@@ -500,7 +501,7 @@ public Task moveTaskToNext(@NotNull Task task) {
500501

501502
@Override
502503
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
503-
public Task moveTaskToWaiting(@NotNull Task task) {
504+
public Task moveTaskToWaiting(Task task) {
504505
long newOrderIdTaskState = this.getMaxOrderIdTaskState(
505506
TaskState.WAITING,
506507
task.getContext()
@@ -514,7 +515,7 @@ public Task moveTaskToWaiting(@NotNull Task task) {
514515

515516
@Override
516517
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
517-
public Task moveTaskToSomeday(@NotNull Task task) {
518+
public Task moveTaskToSomeday(Task task) {
518519
long newOrderIdTaskState = this.getMaxOrderIdTaskState(
519520
TaskState.SOMEDAY,
520521
task.getContext()
@@ -528,7 +529,7 @@ public Task moveTaskToSomeday(@NotNull Task task) {
528529

529530
@Override
530531
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
531-
public Task moveTaskToFocus(@NotNull Task task) {
532+
public Task moveTaskToFocus(Task task) {
532533
long newOrderIdTaskState = this.getMaxOrderIdTaskState(
533534
TaskState.FOCUS,
534535
task.getContext()
@@ -542,7 +543,7 @@ public Task moveTaskToFocus(@NotNull Task task) {
542543

543544
@Override
544545
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
545-
public Task moveTaskToCompleted(@NotNull Task task) {
546+
public Task moveTaskToCompleted(Task task) {
546547
long newOrderIdTaskState = this.getMaxOrderIdTaskState(
547548
TaskState.COMPLETED,
548549
task.getContext()
@@ -556,7 +557,7 @@ public Task moveTaskToCompleted(@NotNull Task task) {
556557

557558
@Override
558559
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
559-
public Task moveTaskToTrash(@NotNull Task task) {
560+
public Task moveTaskToTrash(Task task) {
560561
long newOrderIdTaskState = this.getMaxOrderIdTaskState(
561562
TaskState.TRASH,
562563
task.getContext()

0 commit comments

Comments
 (0)