Skip to content

Commit d88486c

Browse files
committed
migrate spring-boot
1 parent 052fa91 commit d88486c

File tree

11 files changed

+173
-175
lines changed

11 files changed

+173
-175
lines changed
Lines changed: 80 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,80 @@
1-
package org.woehlke.simpleworklist.oodm.services.impl;
2-
3-
import org.springframework.stereotype.Service;
4-
import org.springframework.transaction.annotation.Propagation;
5-
import org.springframework.transaction.annotation.Transactional;
6-
import org.woehlke.simpleworklist.model.beans.NewContextForm;
7-
import org.woehlke.simpleworklist.oodm.entities.Context;
8-
import org.woehlke.simpleworklist.oodm.entities.UserAccount;
9-
import org.woehlke.simpleworklist.oodm.repository.ContextRepository;
10-
import org.woehlke.simpleworklist.oodm.repository.ProjectRepository;
11-
import org.woehlke.simpleworklist.oodm.repository.TaskRepository;
12-
import org.woehlke.simpleworklist.oodm.services.ContextService;
13-
14-
import org.springframework.beans.factory.annotation.Autowired;
15-
import java.util.List;
16-
17-
/**
18-
* Created by tw on 13.03.16.
19-
*/
20-
@Service
21-
@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
22-
public class ContextServiceImpl implements ContextService {
23-
24-
private final ContextRepository contextRepository;
25-
26-
private final TaskRepository taskRepository;
27-
28-
private final ProjectRepository projectRepository;
29-
30-
@Autowired
31-
public ContextServiceImpl(ContextRepository contextRepository, TaskRepository taskRepository, ProjectRepository projectRepository) {
32-
this.contextRepository = contextRepository;
33-
this.taskRepository = taskRepository;
34-
this.projectRepository = projectRepository;
35-
}
36-
37-
@Override
38-
public List<Context> getAllForUser(UserAccount user) {
39-
return contextRepository.findByUserAccount(user);
40-
}
41-
42-
@Override
43-
public Context findByIdAndUserAccount(long newContextId, UserAccount userAccount) {
44-
if(newContextId == 0){
45-
newContextId = userAccount.getDefaultContext().getId();
46-
}
47-
return contextRepository.findByIdAndUserAccount(newContextId,userAccount);
48-
}
49-
50-
@Override
51-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
52-
public void createNewContext(NewContextForm newContext, UserAccount user) {
53-
Context context = new Context();
54-
context.setNameEn(newContext.getNameEn());
55-
context.setNameDe(newContext.getNameDe());
56-
context.setUserAccount(user);
57-
contextRepository.saveAndFlush(context);
58-
}
59-
60-
@Override
61-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
62-
public void updateContext(Context context) {
63-
contextRepository.saveAndFlush(context);
64-
}
65-
66-
@Override
67-
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
68-
public boolean delete(Context context) {
69-
long contextId = context.getId();
70-
contextRepository.delete(context);
71-
return (!contextRepository.existsById(contextId));
72-
}
73-
74-
@Override
75-
public boolean contextHasItems(Context context) {
76-
long numberOfTasks = taskRepository.findByContext(context).size();
77-
int numberOfProjects = projectRepository.findByContext(context).size();
78-
return ((numberOfTasks + numberOfProjects) > 0);
79-
}
80-
}
1+
package org.woehlke.simpleworklist.oodm.services.impl;
2+
3+
import org.springframework.stereotype.Service;
4+
import org.springframework.transaction.annotation.Propagation;
5+
import org.springframework.transaction.annotation.Transactional;
6+
import org.woehlke.simpleworklist.model.beans.NewContextForm;
7+
import org.woehlke.simpleworklist.oodm.entities.Context;
8+
import org.woehlke.simpleworklist.oodm.entities.UserAccount;
9+
import org.woehlke.simpleworklist.oodm.repository.ContextRepository;
10+
import org.woehlke.simpleworklist.oodm.repository.ProjectRepository;
11+
import org.woehlke.simpleworklist.task.TaskRepository;
12+
import org.woehlke.simpleworklist.oodm.services.ContextService;
13+
14+
import org.springframework.beans.factory.annotation.Autowired;
15+
import java.util.List;
16+
17+
/**
18+
* Created by tw on 13.03.16.
19+
*/
20+
@Service
21+
@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
22+
public class ContextServiceImpl implements ContextService {
23+
24+
private final ContextRepository contextRepository;
25+
26+
private final TaskRepository taskRepository;
27+
28+
private final ProjectRepository projectRepository;
29+
30+
@Autowired
31+
public ContextServiceImpl(ContextRepository contextRepository, TaskRepository taskRepository, ProjectRepository projectRepository) {
32+
this.contextRepository = contextRepository;
33+
this.taskRepository = taskRepository;
34+
this.projectRepository = projectRepository;
35+
}
36+
37+
@Override
38+
public List<Context> getAllForUser(UserAccount user) {
39+
return contextRepository.findByUserAccount(user);
40+
}
41+
42+
@Override
43+
public Context findByIdAndUserAccount(long newContextId, UserAccount userAccount) {
44+
if(newContextId == 0){
45+
newContextId = userAccount.getDefaultContext().getId();
46+
}
47+
return contextRepository.findByIdAndUserAccount(newContextId,userAccount);
48+
}
49+
50+
@Override
51+
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
52+
public void createNewContext(NewContextForm newContext, UserAccount user) {
53+
Context context = new Context();
54+
context.setNameEn(newContext.getNameEn());
55+
context.setNameDe(newContext.getNameDe());
56+
context.setUserAccount(user);
57+
contextRepository.saveAndFlush(context);
58+
}
59+
60+
@Override
61+
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
62+
public void updateContext(Context context) {
63+
contextRepository.saveAndFlush(context);
64+
}
65+
66+
@Override
67+
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
68+
public boolean delete(Context context) {
69+
long contextId = context.getId();
70+
contextRepository.delete(context);
71+
return (!contextRepository.existsById(contextId));
72+
}
73+
74+
@Override
75+
public boolean contextHasItems(Context context) {
76+
long numberOfTasks = taskRepository.findByContext(context).size();
77+
int numberOfProjects = projectRepository.findByContext(context).size();
78+
return ((numberOfTasks + numberOfProjects) > 0);
79+
}
80+
}

src/main/java/org/woehlke/simpleworklist/oodm/services/impl/ProjectServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.woehlke.simpleworklist.oodm.entities.Project;
1515
import org.woehlke.simpleworklist.task.Task;
1616
import org.woehlke.simpleworklist.oodm.repository.ProjectRepository;
17-
import org.woehlke.simpleworklist.oodm.repository.TaskRepository;
17+
import org.woehlke.simpleworklist.task.TaskRepository;
1818
import org.woehlke.simpleworklist.oodm.services.ProjectService;
1919

2020
@Service

src/main/java/org/woehlke/simpleworklist/project/ProjectController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.woehlke.simpleworklist.oodm.entities.UserAccount;
1919
import org.woehlke.simpleworklist.model.beans.Breadcrumb;
2020
import org.woehlke.simpleworklist.model.beans.UserSessionBean;
21-
import org.woehlke.simpleworklist.oodm.services.TaskService;
21+
import org.woehlke.simpleworklist.task.TaskService;
2222

2323
import org.springframework.beans.factory.annotation.Autowired;
2424
import javax.validation.Valid;

src/main/java/org/woehlke/simpleworklist/task/TaskController.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.woehlke.simpleworklist.model.beans.Breadcrumb;
2424
import org.woehlke.simpleworklist.model.beans.UserSessionBean;
2525
import org.woehlke.simpleworklist.oodm.enumerations.TaskTime;
26-
import org.woehlke.simpleworklist.oodm.services.TaskService;
2726

2827
@Controller
2928
@RequestMapping(value = "/task")

src/main/java/org/woehlke/simpleworklist/oodm/repository/TaskRepository.java renamed to src/main/java/org/woehlke/simpleworklist/task/TaskRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.simpleworklist.oodm.repository;
1+
package org.woehlke.simpleworklist.task;
22

33
import java.util.List;
44

src/main/java/org/woehlke/simpleworklist/oodm/services/TaskService.java renamed to src/main/java/org/woehlke/simpleworklist/task/TaskService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.simpleworklist.oodm.services;
1+
package org.woehlke.simpleworklist.task;
22

33
import org.springframework.data.domain.Page;
44
import org.springframework.data.domain.Pageable;
Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.simpleworklist.oodm.services.impl;
1+
package org.woehlke.simpleworklist.task;
22

33
import org.springframework.beans.factory.annotation.Autowired;
44

@@ -12,10 +12,7 @@
1212
import org.springframework.transaction.annotation.Transactional;
1313
import org.woehlke.simpleworklist.oodm.entities.Context;
1414
import org.woehlke.simpleworklist.oodm.entities.Project;
15-
import org.woehlke.simpleworklist.task.Task;
1615
import org.woehlke.simpleworklist.oodm.enumerations.TaskState;
17-
import org.woehlke.simpleworklist.oodm.repository.TaskRepository;
18-
import org.woehlke.simpleworklist.oodm.services.TaskService;
1916

2017
import java.util.ArrayList;
2118

src/main/java/org/woehlke/simpleworklist/taskstate/TaskMoveServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.woehlke.simpleworklist.oodm.entities.Project;
1111
import org.woehlke.simpleworklist.task.Task;
1212
import org.woehlke.simpleworklist.oodm.enumerations.TaskState;
13-
import org.woehlke.simpleworklist.oodm.repository.TaskRepository;
13+
import org.woehlke.simpleworklist.task.TaskRepository;
1414

1515
import java.util.Date;
1616
import java.util.List;

src/main/java/org/woehlke/simpleworklist/taskstate/TaskStateServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.woehlke.simpleworklist.oodm.entities.Context;
99
import org.woehlke.simpleworklist.task.Task;
1010
import org.woehlke.simpleworklist.oodm.enumerations.TaskState;
11-
import org.woehlke.simpleworklist.oodm.repository.TaskRepository;
11+
import org.woehlke.simpleworklist.task.TaskRepository;
1212

1313
import org.springframework.beans.factory.annotation.Autowired;
1414

src/main/java/org/woehlke/simpleworklist/testdata/TestServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.woehlke.simpleworklist.oodm.entities.UserAccount;
1414
import org.woehlke.simpleworklist.oodm.enumerations.TaskTime;
1515
import org.woehlke.simpleworklist.oodm.repository.ContextRepository;
16-
import org.woehlke.simpleworklist.oodm.repository.TaskRepository;
16+
import org.woehlke.simpleworklist.task.TaskRepository;
1717
import org.woehlke.simpleworklist.oodm.repository.ProjectRepository;
1818

1919
import org.springframework.beans.factory.annotation.Autowired;

0 commit comments

Comments
 (0)