Skip to content

Commit 13cf7a4

Browse files
thomaswoehlkethomaswoehlke
committed
bugfixing
1 parent db4179f commit 13cf7a4

File tree

8 files changed

+33
-31
lines changed

8 files changed

+33
-31
lines changed

‎src/main/java/org/woehlke/java/simpleworklist/domain/db/search/service/SearchServiceImpl.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
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;
6+
//import org.springframework.transaction.annotation.Propagation;
7+
//import org.springframework.transaction.annotation.Transactional;
88
import org.woehlke.java.simpleworklist.domain.db.data.Context;
99
import org.woehlke.java.simpleworklist.domain.db.search.SearchRequest;
1010
import org.woehlke.java.simpleworklist.domain.db.search.SearchResult;
@@ -29,7 +29,7 @@ public SearchServiceImpl(SearchRequestService searchRequestService, SearchResult
2929
}
3030

3131
@Override
32-
@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
32+
//@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
3333
public SearchResult search(SearchRequest searchRequest) {
3434
log.info("search");
3535
searchRequest = searchRequestService.update(searchRequest);
@@ -39,7 +39,7 @@ public SearchResult search(SearchRequest searchRequest) {
3939
}
4040

4141
@Override
42-
@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
42+
//@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
4343
public SearchResult search(String searchterm, Context context) {
4444
log.info("search");
4545
SearchRequest searchRequest = new SearchRequest();
@@ -52,7 +52,7 @@ public SearchResult search(String searchterm, Context context) {
5252
}
5353

5454
@Override
55-
@Transactional(propagation = Propagation.REQUIRES_NEW)
55+
//@Transactional(propagation = Propagation.REQUIRES_NEW)
5656
public void resetSearchIndex() {
5757
log.info("resetSearchIndex");
5858
searchResultService.resetSearchIndex();

‎src/main/java/org/woehlke/java/simpleworklist/domain/db/user/account/UserAccountServiceImpl.java

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

2222
@Slf4j
2323
@Service("userAccountService")
24-
@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
24+
//@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
2525
public class UserAccountServiceImpl implements UserAccountService {
2626

2727
private final UserAccountRepository userAccountRepository;
@@ -43,7 +43,7 @@ public boolean isEmailAvailable(String email) {
4343
}
4444

4545
@Override
46-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
46+
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
4747
public void createUser(UserAccountForm userAccountForm) {
4848
String userEmail = userAccountForm.getUserEmail();
4949
String userFullname = userAccountForm.getUserFullname();
@@ -64,7 +64,7 @@ public void createUser(UserAccountForm userAccountForm) {
6464
}
6565

6666
@Override
67-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
67+
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
6868
public UserAccount saveAndFlush(UserAccount u) {
6969
return userAccountRepository.saveAndFlush(u);
7070
}
@@ -80,7 +80,7 @@ public Page<UserAccount> findAll(Pageable request) {
8080
}
8181

8282
@Override
83-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
83+
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
8484
public void changeUsersPassword(UserAccountForm userAccount) {
8585
UserAccount ua = userAccountRepository.findByUserEmail(userAccount.getUserEmail());
8686
if(ua != null) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
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;
7+
//import org.springframework.transaction.annotation.Propagation;
8+
//import org.springframework.transaction.annotation.Transactional;
99
import org.woehlke.java.simpleworklist.domain.db.data.Context;
1010
import org.woehlke.java.simpleworklist.domain.db.data.Project;
1111
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskState;
@@ -18,7 +18,7 @@
1818

1919
@Slf4j
2020
@Service
21-
@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
21+
//@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
2222
public class BreadcrumbServiceImpl implements BreadcrumbService {
2323

2424
private final MessageSource messageSource;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
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;
8+
//import org.springframework.transaction.annotation.Propagation;
9+
//import org.springframework.transaction.annotation.Transactional;
1010
import org.springframework.ui.Model;
1111
import org.springframework.validation.BindingResult;
1212
import org.woehlke.java.simpleworklist.domain.db.data.Project;

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
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;
6+
//import org.springframework.transaction.annotation.Propagation;
7+
//import org.springframework.transaction.annotation.Transactional;
88
import org.springframework.ui.Model;
99
import org.woehlke.java.simpleworklist.domain.db.data.Context;
1010
import org.woehlke.java.simpleworklist.domain.db.data.Project;
@@ -32,7 +32,7 @@ public TaskLifecycleServiceImpl(TaskService taskService, ProjectService projectS
3232
}
3333

3434
@Override
35-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
35+
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
3636
public Task addToInbox(@Valid Task task) {
3737
log.info("addToInbox");
3838
task.setUuid(UUID.randomUUID());
@@ -50,7 +50,7 @@ public Task addToInbox(@Valid Task task) {
5050
}
5151

5252
@Override
53-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
53+
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
5454
public Task addToProject( @Valid Task task) {
5555
log.info("addToProject");
5656
task.setUuid(UUID.randomUUID());
@@ -65,7 +65,7 @@ public Task addToProject( @Valid Task task) {
6565
}
6666

6767
@Override
68-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
68+
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
6969
public Task addToRootProject( @Valid Task task) {
7070
log.info("addToRootProject");
7171
task.setUuid(UUID.randomUUID());
@@ -82,21 +82,21 @@ public Task addToRootProject( @Valid Task task) {
8282
}
8383

8484
@Override
85-
@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
85+
//@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
8686
public long getMaxOrderIdTaskState(TaskState taskState, Context context) {
8787
Task task = taskService.findTopByTaskStateAndContextOrderByOrderIdTaskStateDesc(taskState, context);
8888
return (task==null) ? 0 : task.getOrderIdTaskState();
8989
}
9090

9191
@Override
92-
@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
92+
//@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
9393
public long getMaxOrderIdProject(Project project,Context context) {
9494
Task task = taskService.findTopByProjectAndContextOrderByOrderIdProjectDesc(project,context);
9595
return (task==null) ? 0 : task.getOrderIdProject();
9696
}
9797

9898
@Override
99-
@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
99+
//@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
100100
public long getMaxOrderIdProjectRoot(Context context) {
101101
Task task = taskService.findTopByProjectIsNullAndContextOrderByOrderIdProjectDesc(context);
102102
return (task==null) ? 0 : task.getOrderIdProject();
@@ -129,7 +129,7 @@ public String transformTaskIntoProjectGet(
129129
}
130130

131131
@Override
132-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
132+
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
133133
public Task updatedViaTaskstate(Task task) {
134134
log.info("updatedViaTaskstate");
135135
if(task.getProject() != null){
@@ -148,7 +148,7 @@ public Task updatedViaTaskstate(Task task) {
148148
}
149149

150150
@Override
151-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
151+
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
152152
public Task updatedViaProjectRoot( @Valid Task task) {
153153
log.info("updatedViaProject");
154154
if(task.getProject() != null){
@@ -167,7 +167,7 @@ public Task updatedViaProjectRoot( @Valid Task task) {
167167
}
168168

169169
@Override
170-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
170+
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
171171
public Task updatedViaProject(Task task) {
172172
log.info("updatedViaProject");
173173
if(task.getProject() != null){

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
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;
7+
//import org.springframework.transaction.annotation.Propagation;
8+
//import org.springframework.transaction.annotation.Transactional;
99
import org.woehlke.java.simpleworklist.domain.db.data.Context;
1010
import org.woehlke.java.simpleworklist.domain.db.data.Project;
1111
import org.woehlke.java.simpleworklist.domain.db.data.Task;

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
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;
810
import org.springframework.transaction.annotation.Propagation;
9-
import org.springframework.transaction.annotation.Transactional;
1011
import org.springframework.ui.Model;
1112
import org.woehlke.java.simpleworklist.domain.db.data.Context;
1213
import org.woehlke.java.simpleworklist.domain.db.data.Task;
@@ -21,7 +22,7 @@
2122

2223
@Slf4j
2324
@Service
24-
@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
25+
//@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
2526
public class TaskStateTabControllerServiceImpl implements TaskStateTabControllerService {
2627

2728
private final BreadcrumbService breadcrumbService;

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
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;
57
import org.springframework.transaction.annotation.Propagation;
6-
import org.springframework.transaction.annotation.Transactional;
78
import org.woehlke.java.simpleworklist.domain.db.data.Context;
89
import org.woehlke.java.simpleworklist.domain.db.data.Project;
910
import org.woehlke.java.simpleworklist.domain.db.data.Task;
@@ -34,7 +35,7 @@ public TestDataServiceImpl(ProjectRepository projectRepository, TaskRepository t
3435
this.contextRepository = contextRepository;
3536
}
3637

37-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
38+
//@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
3839
public void createTestData(UserAccount userAccount) {
3940
log.info("----------------------------------------------");
4041
log.info("createTestCategoryTreeForUserAccount");

0 commit comments

Comments
 (0)