Skip to content

Commit 389fc29

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent 492b943 commit 389fc29

File tree

8 files changed

+2
-58
lines changed

8 files changed

+2
-58
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.woehlke.java.simpleworklist.domain.db.data.task;
22

33
import java.io.Serializable;
4-
import java.util.ArrayList;
54
import java.util.Arrays;
65
import java.util.List;
76

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
import org.springframework.beans.factory.annotation.Autowired;
55
import org.springframework.context.MessageSource;
66
import org.springframework.stereotype.Service;
7-
//import org.springframework.transaction.annotation.Propagation;
8-
//import org.springframework.transaction.annotation.Transactional;
97
import org.woehlke.java.simpleworklist.domain.db.data.Context;
108
import org.woehlke.java.simpleworklist.domain.db.data.Project;
119
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskState;
@@ -18,7 +16,6 @@
1816

1917
@Slf4j
2018
@Service
21-
//@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
2219
public class BreadcrumbServiceImpl implements BreadcrumbService {
2320

2421
private final MessageSource messageSource;

‎src/main/java/org/woehlke/java/simpleworklist/domain/meso/project/ProjectControllerServiceImpl.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
import org.springframework.data.domain.Page;
66
import org.springframework.data.domain.Pageable;
77
import org.springframework.stereotype.Service;
8-
//import org.springframework.transaction.annotation.Propagation;
9-
//import org.springframework.transaction.annotation.Transactional;
10-
import org.springframework.transaction.annotation.Propagation;
11-
import org.springframework.transaction.annotation.Transactional;
128
import org.springframework.ui.Model;
139
import org.springframework.validation.BindingResult;
1410
import org.woehlke.java.simpleworklist.domain.db.data.Project;
@@ -68,7 +64,6 @@ public void addNewProjectToProjectIdForm(
6864
model.addAttribute("userSession", userSession);
6965
}
7066

71-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
7267
public String addNewProjectToProjectIdPersist(
7368
@Min(1L) long projectId,
7469
@NotNull UserSessionBean userSession,
@@ -119,7 +114,6 @@ public List<Task> findByProject(Project thisProject) {
119114
}
120115

121116
@Override
122-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
123117
public Project moveProjectToAnotherProject(
124118
@NotNull Project thisProject,
125119
@NotNull Project targetProject
@@ -154,7 +148,6 @@ public Project update(Project project) {
154148
}
155149

156150
@Override
157-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
158151
public Project delete(@NotNull Project thisProject) {
159152
log.info("delete");
160153
Project oldParent = thisProject.getParent();
@@ -167,7 +160,6 @@ public Project delete(@NotNull Project thisProject) {
167160
}
168161

169162
@Override
170-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
171163
public void addNewProjectToProjectRootForm(
172164
@NotNull UserSessionBean userSession,
173165
@NotNull Context context,
@@ -189,7 +181,6 @@ public void addNewProjectToProjectRootForm(
189181
}
190182

191183
@Override
192-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
193184
public String addNewProjectToProjectRootPersist(
194185
@NotNull UserSessionBean userSession,
195186
@NotNull Project project,
@@ -208,7 +199,6 @@ public String addNewProjectToProjectRootPersist(
208199
}
209200

210201
@Override
211-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
212202
public void moveTaskToTaskAndChangeTaskOrderInProjectId(@NotNull Task sourceTask, @NotNull Task destinationTask) {
213203
Project project = sourceTask.getProject();
214204
log.info("-------------------------------------------------------------------------------");
@@ -238,7 +228,6 @@ public void moveTaskToTaskAndChangeTaskOrderInProjectId(@NotNull Task sourceTask
238228
}
239229

240230
@Override
241-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
242231
public void moveTaskToTaskAndChangeTaskOrderInProjectRoot(@NotNull Task sourceTask, @NotNull Task destinationTask) {
243232
log.info("-------------------------------------------------------------------------------");
244233
log.info(" START: moveTaskToTaskAndChangeTaskOrderIn Project Root");
@@ -266,7 +255,6 @@ public void moveTaskToTaskAndChangeTaskOrderInProjectRoot(@NotNull Task sourceTa
266255
}
267256

268257
@Override
269-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
270258
public Project moveProjectToAnotherContext(@NotNull Project thisProject, @NotNull Context newContext) {
271259
log.info("----------------------------------------------------");
272260
log.info("moveProjectToAnotherContext: Project: " + thisProject.toString());

‎src/main/java/org/woehlke/java/simpleworklist/domain/meso/task/TaskLifecycleServiceImpl.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.beans.factory.annotation.Autowired;
55
import org.springframework.stereotype.Service;
6-
//import org.springframework.transaction.annotation.Propagation;
7-
//import org.springframework.transaction.annotation.Transactional;
86
import org.springframework.ui.Model;
97
import org.woehlke.java.simpleworklist.domain.db.data.Context;
108
import org.woehlke.java.simpleworklist.domain.db.data.Project;
@@ -32,7 +30,6 @@ public TaskLifecycleServiceImpl(TaskService taskService, ProjectService projectS
3230
}
3331

3432
@Override
35-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
3633
public Task addToInbox(@Valid Task task) {
3734
log.info("addToInbox");
3835
task.setUuid(UUID.randomUUID());
@@ -50,7 +47,6 @@ public Task addToInbox(@Valid Task task) {
5047
}
5148

5249
@Override
53-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
5450
public Task addToProject( @Valid Task task) {
5551
log.info("addToProject");
5652
task.setUuid(UUID.randomUUID());
@@ -65,7 +61,6 @@ public Task addToProject( @Valid Task task) {
6561
}
6662

6763
@Override
68-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
6964
public Task addToRootProject( @Valid Task task) {
7065
log.info("addToRootProject");
7166
task.setUuid(UUID.randomUUID());
@@ -82,21 +77,18 @@ public Task addToRootProject( @Valid Task task) {
8277
}
8378

8479
@Override
85-
//@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
8680
public long getMaxOrderIdTaskState(TaskState taskState, Context context) {
8781
Task task = taskService.findTopByTaskStateAndContextOrderByOrderIdTaskStateDesc(taskState, context);
8882
return (task==null) ? 0 : task.getOrderIdTaskState();
8983
}
9084

9185
@Override
92-
//@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
9386
public long getMaxOrderIdProject(Project project,Context context) {
9487
Task task = taskService.findTopByProjectAndContextOrderByOrderIdProjectDesc(project,context);
9588
return (task==null) ? 0 : task.getOrderIdProject();
9689
}
9790

9891
@Override
99-
//@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
10092
public long getMaxOrderIdProjectRoot(Context context) {
10193
Task task = taskService.findTopByProjectIsNullAndContextOrderByOrderIdProjectDesc(context);
10294
return (task==null) ? 0 : task.getOrderIdProject();
@@ -129,7 +121,6 @@ public String transformTaskIntoProjectGet(
129121
}
130122

131123
@Override
132-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
133124
public Task updatedViaTaskstate(Task task) {
134125
log.info("updatedViaTaskstate");
135126
if(task.getProject() != null){
@@ -148,7 +139,6 @@ public Task updatedViaTaskstate(Task task) {
148139
}
149140

150141
@Override
151-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
152142
public Task updatedViaProjectRoot( @Valid Task task) {
153143
log.info("updatedViaProject");
154144
if(task.getProject() != null){
@@ -167,7 +157,6 @@ public Task updatedViaProjectRoot( @Valid Task task) {
167157
}
168158

169159
@Override
170-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
171160
public Task updatedViaProject(Task task) {
172161
log.info("updatedViaProject");
173162
if(task.getProject() != null){

‎src/main/java/org/woehlke/java/simpleworklist/domain/meso/task/TaskMove2TaskServiceImpl.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ public TaskMove2TaskServiceImpl(TaskService taskService) {
2424
}
2525

2626
@Override
27-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
2827
public void moveTasksUpByProjectRoot(Task sourceTask, Task destinationTask ) {
2928
log.info("-------------------------------------------------------------------------------");
3029
log.info(" moveTasks UP By ProjectRoot: "+sourceTask.toString() +" -> "+ destinationTask.toString());
@@ -54,7 +53,6 @@ public void moveTasksUpByProjectRoot(Task sourceTask, Task destinationTask ) {
5453
}
5554

5655
@Override
57-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
5856
public void moveTasksDownByProjectRoot(Task sourceTask, Task destinationTask) {
5957
log.info("-------------------------------------------------------------------------------");
6058
log.info(" START moveTasks UP By Project Root");
@@ -86,7 +84,6 @@ public void moveTasksDownByProjectRoot(Task sourceTask, Task destinationTask) {
8684
}
8785

8886
@Override
89-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
9087
public void moveTasksUpByProjectId(Task sourceTask, Task destinationTask ) {
9188
Project project = sourceTask.getProject();
9289
log.info("-------------------------------------------------------------------------------");
@@ -119,7 +116,6 @@ public void moveTasksUpByProjectId(Task sourceTask, Task destinationTask ) {
119116
}
120117

121118
@Override
122-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
123119
public void moveTasksDownByProjectId(Task sourceTask, Task destinationTask) {
124120
Project project = sourceTask.getProject();
125121
log.info("-------------------------------------------------------------------------------");
@@ -151,7 +147,6 @@ public void moveTasksDownByProjectId(Task sourceTask, Task destinationTask) {
151147
}
152148

153149
@Override
154-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
155150
public void moveTaskToTaskAndChangeTaskOrderInTaskstate(Task sourceTask, Task destinationTask ) {
156151
log.info("-------------------------------------------------------------------------------");
157152
log.info(" START: moveTaskToTask AndChangeTaskOrder In Taskstate ");
@@ -179,7 +174,6 @@ public void moveTaskToTaskAndChangeTaskOrderInTaskstate(Task sourceTask, Task de
179174
}
180175

181176
@Override
182-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
183177
public void moveTasksUpByTaskState(Task sourceTask, Task destinationTask ) {
184178
TaskState taskState = sourceTask.getTaskState();
185179
log.info("-------------------------------------------------------------------------------");
@@ -214,7 +208,6 @@ public void moveTasksUpByTaskState(Task sourceTask, Task destinationTask ) {
214208

215209

216210
@Override
217-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
218211
public void moveTasksDownByTaskState(Task sourceTask, Task destinationTask ) {
219212
TaskState taskState = sourceTask.getTaskState();
220213
log.info("-------------------------------------------------------------------------------");

‎src/main/java/org/woehlke/java/simpleworklist/domain/meso/task/TaskMoveServiceImpl.java‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
import lombok.extern.slf4j.Slf4j;
55
import org.springframework.beans.factory.annotation.Autowired;
66
import org.springframework.stereotype.Service;
7-
//import org.springframework.transaction.annotation.Propagation;
8-
//import org.springframework.transaction.annotation.Transactional;
97
import org.woehlke.java.simpleworklist.domain.db.data.Context;
108
import org.woehlke.java.simpleworklist.domain.db.data.Project;
119
import org.woehlke.java.simpleworklist.domain.db.data.Task;
@@ -31,7 +29,6 @@ public TaskMoveServiceImpl(TaskLifecycleService taskLifecycleService, TaskServic
3129
}
3230

3331
@Override
34-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
3532
public Task moveTaskToRootProject(@Valid Task task) {
3633
task.moveTaskToRootProject();
3734
long maxOrderIdProject = taskLifecycleService.getMaxOrderIdProjectRoot(task.getContext());
@@ -40,7 +37,6 @@ public Task moveTaskToRootProject(@Valid Task task) {
4037
}
4138

4239
@Override
43-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
4440
public Task moveTaskToAnotherProject( @Valid Task task, @Valid Project project) {
4541
boolean okContext = task.hasSameContextAs(project);
4642
if(okContext) {
@@ -53,7 +49,6 @@ public Task moveTaskToAnotherProject( @Valid Task task, @Valid Project project)
5349
}
5450

5551
@Override
56-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
5752
public Task moveTaskToInbox(Task task) {
5853
long newOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(TaskState.INBOX, task.getContext()
5954
);
@@ -65,7 +60,6 @@ public Task moveTaskToInbox(Task task) {
6560
}
6661

6762
@Override
68-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
6963
public Task moveTaskToToday(Task task) {
7064
Date now = new Date();
7165
long newOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(TaskState.TODAY,task.getContext());
@@ -77,7 +71,6 @@ public Task moveTaskToToday(Task task) {
7771
}
7872

7973
@Override
80-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
8174
public Task moveTaskToNext(Task task) {
8275
long newOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(TaskState.NEXT,task.getContext());
8376
task.moveToNext();
@@ -88,7 +81,6 @@ public Task moveTaskToNext(Task task) {
8881
}
8982

9083
@Override
91-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
9284
public Task moveTaskToWaiting(Task task) {
9385
long newOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(TaskState.WAITING,task.getContext());
9486
task.moveToWaiting();
@@ -99,7 +91,6 @@ public Task moveTaskToWaiting(Task task) {
9991
}
10092

10193
@Override
102-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
10394
public Task moveTaskToSomeday(Task task) {
10495
long newOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(TaskState.SOMEDAY,task.getContext());
10596
task.moveToSomeday();
@@ -110,7 +101,6 @@ public Task moveTaskToSomeday(Task task) {
110101
}
111102

112103
@Override
113-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
114104
public Task moveTaskToFocus(Task task) {
115105
long newOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(TaskState.FOCUS,task.getContext()
116106
);
@@ -122,7 +112,6 @@ public Task moveTaskToFocus(Task task) {
122112
}
123113

124114
@Override
125-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
126115
public Task moveTaskToCompleted(Task task) {
127116
long newOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(TaskState.COMPLETED,task.getContext()
128117
);
@@ -134,7 +123,6 @@ public Task moveTaskToCompleted(Task task) {
134123
}
135124

136125
@Override
137-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
138126
public Task moveTaskToTrash(Task task) {
139127
long newOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(TaskState.TRASH, task.getContext());
140128
task.moveToTrash();
@@ -145,7 +133,6 @@ public Task moveTaskToTrash(Task task) {
145133
}
146134

147135
@Override
148-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
149136
public void moveAllCompletedToTrash( Context context) {
150137
long maxOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(TaskState.TRASH,context);
151138
long newOrderIdTaskState = maxOrderIdTaskState;
@@ -162,7 +149,6 @@ public void moveAllCompletedToTrash( Context context) {
162149
}
163150

164151
@Override
165-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
166152
public void emptyTrash( Context context) {
167153
List<Task> taskList = taskService.findByTaskStateTrash(context);
168154
List<Task> taskListChanged = new ArrayList<>(taskList.size());

‎src/main/java/org/woehlke/java/simpleworklist/domain/meso/taskstate/TaskStateTabControllerServiceImpl.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import org.springframework.data.domain.Page;
66
import org.springframework.data.domain.Pageable;
77
import org.springframework.stereotype.Service;
8-
//import org.springframework.transaction.annotation.Propagation;
9-
//import org.springframework.transaction.annotation.Transactional;
108
import org.springframework.ui.Model;
119
import org.woehlke.java.simpleworklist.domain.db.data.Context;
1210
import org.woehlke.java.simpleworklist.domain.db.data.Task;
@@ -21,7 +19,6 @@
2119

2220
@Slf4j
2321
@Service
24-
//@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
2522
public class TaskStateTabControllerServiceImpl implements TaskStateTabControllerService {
2623

2724
private final BreadcrumbService breadcrumbService;

‎src/main/java/org/woehlke/java/simpleworklist/domain/meso/testdata/TestDataServiceImpl.java‎

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

33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.stereotype.Service;
5-
//import org.springframework.transaction.annotation.Propagation;
6-
//import org.springframework.transaction.annotation.Transactional;
7-
import org.springframework.transaction.annotation.Propagation;
85
import org.woehlke.java.simpleworklist.domain.db.data.Context;
96
import org.woehlke.java.simpleworklist.domain.db.data.Project;
107
import org.woehlke.java.simpleworklist.domain.db.data.Task;
@@ -26,16 +23,14 @@ public class TestDataServiceImpl implements TestDataService {
2623

2724
private final ProjectRepository projectRepository;
2825
private final TaskRepository taskRepository;
29-
private final ContextRepository contextRepository;
3026

3127
@Autowired
32-
public TestDataServiceImpl(ProjectRepository projectRepository, TaskRepository taskRepository, ContextRepository contextRepository) {
28+
public TestDataServiceImpl(ProjectRepository projectRepository, TaskRepository taskRepository) {
3329
this.projectRepository = projectRepository;
3430
this.taskRepository = taskRepository;
35-
this.contextRepository = contextRepository;
3631
}
3732

38-
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
33+
@Override
3934
public void createTestData(UserAccount userAccount) {
4035
log.info("----------------------------------------------");
4136
log.info("createTestCategoryTreeForUserAccount");

0 commit comments

Comments
 (0)