Skip to content

Commit 9d7e339

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent 99daf1d commit 9d7e339

15 files changed

+47
-46
lines changed

‎src/main/java/org/woehlke/simpleworklist/common/domain/AuditModel.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import java.io.Serializable;
1212
import java.util.Date;
1313
import java.util.Objects;
14+
import java.util.UUID;
1415

1516
@MappedSuperclass
1617
@EntityListeners(AuditingEntityListener.class)
@@ -27,7 +28,7 @@ public class AuditModel extends Object implements Serializable {
2728
private static final long serialVersionUID = 4399373914714726911L;
2829

2930
@Column(name="uuid", nullable = false)
30-
protected String uuid;
31+
protected UUID uuid;
3132

3233
@CreatedDate
3334
@Temporal(TemporalType.TIMESTAMP)

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.woehlke.simpleworklist.domain.task.TaskEnergy;
1919
import org.woehlke.simpleworklist.domain.task.TaskState;
2020
import org.woehlke.simpleworklist.domain.task.TaskTime;
21-
import org.woehlke.simpleworklist.services.TaskProjektService;
21+
import org.woehlke.simpleworklist.services.TransformTaskIntoProjektService;
2222
import org.woehlke.simpleworklist.domain.task.TaskService;
2323
import org.woehlke.simpleworklist.user.domain.account.UserAccount;
2424
import org.woehlke.simpleworklist.domain.breadcrumb.Breadcrumb;
@@ -41,17 +41,17 @@ public class ProjectIdController extends AbstractController {
4141

4242
private final ProjectControllerService projectControllerService;
4343
private final TaskService taskService;
44-
private final TaskProjektService taskProjektService;
44+
private final TransformTaskIntoProjektService transformTaskIntoProjektService;
4545

4646
@Autowired
4747
public ProjectIdController(
4848
ProjectControllerService projectControllerService,
4949
TaskService taskService,
50-
TaskProjektService taskProjektService
50+
TransformTaskIntoProjektService transformTaskIntoProjektService
5151
) {
5252
this.projectControllerService = projectControllerService;
5353
this.taskService = taskService;
54-
this.taskProjektService = taskProjektService;
54+
this.transformTaskIntoProjektService = transformTaskIntoProjektService;
5555
}
5656

5757
@RequestMapping(path = "/task/add", method = RequestMethod.GET)
@@ -671,6 +671,6 @@ public final String transformTaskIntoProjectGet(
671671
userSession.setLastProjectId(thisProject.getId());
672672
userSession.setLastTaskState(task.getTaskState());
673673
userSession.setLastTaskId(task.getId());
674-
return taskProjektService.transformTaskIntoProjectGet(task, userSession, model);
674+
return transformTaskIntoProjektService.transformTaskIntoProjectGet(task, userSession, model);
675675
}
676676
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.woehlke.simpleworklist.domain.task.TaskEnergy;
2121
import org.woehlke.simpleworklist.domain.task.TaskState;
2222
import org.woehlke.simpleworklist.domain.task.TaskTime;
23-
import org.woehlke.simpleworklist.services.TaskProjektService;
23+
import org.woehlke.simpleworklist.services.TransformTaskIntoProjektService;
2424
import org.woehlke.simpleworklist.domain.task.TaskService;
2525
import org.woehlke.simpleworklist.user.session.UserSessionBean;
2626
import org.woehlke.simpleworklist.user.domain.account.UserAccount;
@@ -41,13 +41,13 @@ public class ProjectRootController extends AbstractController {
4141

4242
private final ProjectControllerService projectControllerService;
4343
private final TaskService taskService;
44-
private final TaskProjektService taskProjektService;
44+
private final TransformTaskIntoProjektService transformTaskIntoProjektService;
4545

4646
@Autowired
47-
public ProjectRootController(ProjectControllerService projectControllerService, TaskService taskService, TaskProjektService taskProjektService) {
47+
public ProjectRootController(ProjectControllerService projectControllerService, TaskService taskService, TransformTaskIntoProjektService transformTaskIntoProjektService) {
4848
this.projectControllerService = projectControllerService;
4949
this.taskService = taskService;
50-
this.taskProjektService = taskProjektService;
50+
this.transformTaskIntoProjektService = transformTaskIntoProjektService;
5151
}
5252

5353
@RequestMapping(path="", method = RequestMethod.GET)
@@ -514,7 +514,7 @@ public final String transformTaskIntoProjectGet(
514514
userSession.setLastProjectId(rootProjectId);
515515
userSession.setLastTaskState(task.getTaskState());
516516
userSession.setLastTaskId(task.getId());
517-
return taskProjektService.transformTaskIntoProjectGet(task, userSession, model);
517+
return transformTaskIntoProjektService.transformTaskIntoProjectGet(task, userSession, model);
518518
}
519519

520520
@RequestMapping(path = "/task/{taskId}/complete", method = RequestMethod.GET)

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.springframework.web.bind.annotation.RequestMethod;
1212
import org.woehlke.simpleworklist.common.domain.AbstractController;
1313
import org.woehlke.simpleworklist.domain.context.Context;
14-
import org.woehlke.simpleworklist.services.TaskStateControllerService;
14+
import org.woehlke.simpleworklist.services.MoveTaskToTaskInTaskstateService;
1515
import org.woehlke.simpleworklist.user.session.UserSessionBean;
1616

1717
import lombok.extern.slf4j.Slf4j;
@@ -23,11 +23,11 @@
2323
@RequestMapping(path = "/taskstate")
2424
public class TaskStateTabController extends AbstractController {
2525

26-
private final TaskStateControllerService taskStateControllerService;
26+
private final MoveTaskToTaskInTaskstateService moveTaskToTaskInTaskstateService;
2727

2828
@Autowired
29-
public TaskStateTabController(TaskStateControllerService taskStateControllerService) {
30-
this.taskStateControllerService = taskStateControllerService;
29+
public TaskStateTabController(MoveTaskToTaskInTaskstateService moveTaskToTaskInTaskstateService) {
30+
this.moveTaskToTaskInTaskstateService = moveTaskToTaskInTaskstateService;
3131
}
3232

3333
@RequestMapping(path = "/inbox", method = RequestMethod.GET)
@@ -38,7 +38,7 @@ public final String inbox(
3838
Model model
3939
) {
4040
Context context = super.getContext(userSession);
41-
return taskStateControllerService.getTaskStatePage(
41+
return moveTaskToTaskInTaskstateService.getTaskStatePage(
4242
TaskState.INBOX,
4343
context, pageable, userSession, locale, model);
4444
}
@@ -51,7 +51,7 @@ public final String today(
5151
Model model
5252
) {
5353
Context context = super.getContext(userSession);
54-
return taskStateControllerService.getTaskStatePage(
54+
return moveTaskToTaskInTaskstateService.getTaskStatePage(
5555
TaskState.TODAY,
5656
context, pageable, userSession, locale, model);
5757
}
@@ -64,7 +64,7 @@ public final String next(
6464
Model model
6565
) {
6666
Context context = super.getContext(userSession);
67-
return taskStateControllerService.getTaskStatePage(
67+
return moveTaskToTaskInTaskstateService.getTaskStatePage(
6868
TaskState.NEXT,
6969
context, pageable, userSession, locale, model);
7070
}
@@ -77,7 +77,7 @@ public final String waiting(
7777
Model model
7878
) {
7979
Context context = super.getContext(userSession);
80-
return taskStateControllerService.getTaskStatePage(
80+
return moveTaskToTaskInTaskstateService.getTaskStatePage(
8181
TaskState.WAITING,
8282
context, pageable, userSession, locale, model);
8383
}
@@ -90,7 +90,7 @@ public final String scheduled(
9090
Model model
9191
) {
9292
Context context = super.getContext(userSession);
93-
return taskStateControllerService.getTaskStatePage(TaskState.SCHEDULED, context, pageable, userSession, locale, model);
93+
return moveTaskToTaskInTaskstateService.getTaskStatePage(TaskState.SCHEDULED, context, pageable, userSession, locale, model);
9494
}
9595

9696
@RequestMapping(path = "/someday", method = RequestMethod.GET)
@@ -101,7 +101,7 @@ public final String someday(
101101
Model model
102102
) {
103103
Context context = super.getContext(userSession);
104-
return taskStateControllerService.getTaskStatePage(
104+
return moveTaskToTaskInTaskstateService.getTaskStatePage(
105105
TaskState.SOMEDAY,
106106
context, pageable, userSession, locale, model);
107107
}
@@ -114,7 +114,7 @@ public final String completed(
114114
Model model
115115
) {
116116
Context context = super.getContext(userSession);
117-
return taskStateControllerService.getTaskStatePage(
117+
return moveTaskToTaskInTaskstateService.getTaskStatePage(
118118
TaskState.COMPLETED,
119119
context, pageable, userSession, locale, model);
120120
}
@@ -127,7 +127,7 @@ public final String trash(
127127
Model model
128128
) {
129129
Context context = super.getContext(userSession);
130-
return taskStateControllerService.getTaskStatePage(
130+
return moveTaskToTaskInTaskstateService.getTaskStatePage(
131131
TaskState.TRASH,
132132
context, pageable, userSession, locale, model);
133133
}
@@ -140,7 +140,7 @@ public final String focus(
140140
Model model
141141
) {
142142
Context context = super.getContext(userSession);
143-
return taskStateControllerService.getTaskStatePage(
143+
return moveTaskToTaskInTaskstateService.getTaskStatePage(
144144
TaskState.FOCUS,
145145
context, pageable, userSession, locale, model);
146146
}

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import org.woehlke.simpleworklist.common.domain.AbstractController;
1212
import org.woehlke.simpleworklist.domain.context.Context;
1313
import org.woehlke.simpleworklist.domain.project.Project;
14-
import org.woehlke.simpleworklist.services.TaskProjektService;
15-
import org.woehlke.simpleworklist.services.TaskStateControllerService;
14+
import org.woehlke.simpleworklist.services.TransformTaskIntoProjektService;
15+
import org.woehlke.simpleworklist.services.MoveTaskToTaskInTaskstateService;
1616
import org.woehlke.simpleworklist.user.session.UserSessionBean;
1717

1818
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,17 +32,17 @@
3232
@RequestMapping(path = "/taskstate/task")
3333
public class TaskStateTaskController extends AbstractController {
3434

35-
private final TaskStateControllerService taskStateControllerService;
35+
private final MoveTaskToTaskInTaskstateService moveTaskToTaskInTaskstateService;
3636
private final TaskService taskService;
37-
private final TaskProjektService taskProjektService;
37+
private final TransformTaskIntoProjektService transformTaskIntoProjektService;
3838

3939
@Autowired
4040
public TaskStateTaskController(
41-
TaskStateControllerService taskStateControllerService, TaskService taskService,
42-
TaskProjektService taskProjektService) {
43-
this.taskStateControllerService = taskStateControllerService;
41+
MoveTaskToTaskInTaskstateService moveTaskToTaskInTaskstateService, TaskService taskService,
42+
TransformTaskIntoProjektService transformTaskIntoProjektService) {
43+
this.moveTaskToTaskInTaskstateService = moveTaskToTaskInTaskstateService;
4444
this.taskService = taskService;
45-
this.taskProjektService = taskProjektService;
45+
this.transformTaskIntoProjektService = transformTaskIntoProjektService;
4646
}
4747

4848
@RequestMapping(path = "/add", method = RequestMethod.GET)
@@ -200,7 +200,7 @@ public String changeTaskOrderId(
200200
log.info("---------------------------------------------");
201201
log.info("destination Task: "+destinationTask.toString());
202202
log.info("---------------------------------------------");
203-
taskStateControllerService.moveTaskToTaskAndChangeTaskOrderInTaskstate(sourceTask, destinationTask);
203+
moveTaskToTaskInTaskstateService.moveTaskToTaskAndChangeTaskOrderInTaskstate(sourceTask, destinationTask);
204204
userSession.setLastTaskState(sourceTask.getTaskState());
205205
model.addAttribute("userSession", userSession);
206206
return sourceTask.getTaskState().getUrl();
@@ -371,7 +371,7 @@ public final String transformTaskIntoProjectGet(
371371
Model model
372372
) {
373373
log.info("transformTaskIntoProjectGet");
374-
return taskProjektService.transformTaskIntoProjectGet(task, userSession, model);
374+
return transformTaskIntoProjektService.transformTaskIntoProjectGet(task, userSession, model);
375375
}
376376

377377
@RequestMapping(path = "/{taskId}/complete", method = RequestMethod.GET)

‎src/main/java/org/woehlke/simpleworklist/services/TaskStateControllerService.java‎ renamed to ‎src/main/java/org/woehlke/simpleworklist/services/MoveTaskToTaskInTaskstateService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import java.util.Locale;
1111

12-
public interface TaskStateControllerService {
12+
public interface MoveTaskToTaskInTaskstateService {
1313

1414
String getTaskStatePage(
1515
TaskState taskState,

‎src/main/java/org/woehlke/simpleworklist/services/TaskStateControllerServiceImpl.java‎ renamed to ‎src/main/java/org/woehlke/simpleworklist/services/MoveTaskToTaskInTaskstateServiceImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121

2222
@Slf4j
2323
@Service
24-
public class TaskStateControllerServiceImpl implements TaskStateControllerService {
24+
public class MoveTaskToTaskInTaskstateServiceImpl implements MoveTaskToTaskInTaskstateService {
2525

2626
private final BreadcrumbService breadcrumbService;
2727
private final TaskService taskService;
2828

2929
@Autowired
30-
public TaskStateControllerServiceImpl(
30+
public MoveTaskToTaskInTaskstateServiceImpl(
3131
BreadcrumbService breadcrumbService,
3232
TaskService taskService
3333
) {

‎src/main/java/org/woehlke/simpleworklist/services/SearchRequestServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public SearchRequestServiceImpl(SearchRequestRepository searchRequestRepository)
2424
@Override
2525
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
2626
public SearchRequest add(SearchRequest searchRequest) {
27-
searchRequest.setUuid(UUID.randomUUID().toString());
27+
searchRequest.setUuid(UUID.randomUUID());
2828
return searchRequestRepository.saveAndFlush(searchRequest);
2929
}
3030

‎src/main/java/org/woehlke/simpleworklist/services/SearchResultServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void resetSearchIndex() {
3030
@Override
3131
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
3232
public SearchResult add(SearchResult searchResult) {
33-
searchResult.setUuid(UUID.randomUUID().toString());
33+
searchResult.setUuid(UUID.randomUUID());
3434
return searchResultRepository.saveAndFlush(searchResult);
3535
}
3636

‎src/main/java/org/woehlke/simpleworklist/services/TaskProjektService.java‎ renamed to ‎src/main/java/org/woehlke/simpleworklist/services/TransformTaskIntoProjektService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.woehlke.simpleworklist.domain.task.Task;
55
import org.woehlke.simpleworklist.user.session.UserSessionBean;
66

7-
public interface TaskProjektService {
7+
public interface TransformTaskIntoProjektService {
88

99
String transformTaskIntoProjectGet(Task task, UserSessionBean userSession, Model model);
1010
}

0 commit comments

Comments
 (0)