Skip to content

Commit 5236871

Browse files
thomaswoehlkethomaswoehlke
committed
migrate spring-boot
1 parent 7e63814 commit 5236871

21 files changed

+173
-185
lines changed

‎src/main/java/org/woehlke/simpleworklist/common/AbstractController.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
import org.woehlke.simpleworklist.oodm.entities.UserAccount;
1212
import org.woehlke.simpleworklist.task.TaskEnergy;
1313
import org.woehlke.simpleworklist.task.TaskTime;
14-
import org.woehlke.simpleworklist.oodm.services.ContextService;
15-
import org.woehlke.simpleworklist.oodm.services.ProjectService;
16-
import org.woehlke.simpleworklist.oodm.services.User2UserMessageService;
17-
import org.woehlke.simpleworklist.oodm.services.UserAccountService;
14+
import org.woehlke.simpleworklist.context.ContextService;
15+
import org.woehlke.simpleworklist.project.ProjectService;
16+
import org.woehlke.simpleworklist.user.messages.User2UserMessageService;
17+
import org.woehlke.simpleworklist.user.UserAccountService;
1818
import org.woehlke.simpleworklist.user.UserSessionBean;
1919

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

‎src/main/java/org/woehlke/simpleworklist/context/ContextController.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import org.woehlke.simpleworklist.common.AbstractController;
1010
import org.woehlke.simpleworklist.oodm.entities.Context;
1111
import org.woehlke.simpleworklist.user.UserSessionBean;
12-
import org.woehlke.simpleworklist.oodm.services.ContextService;
1312

1413
import org.springframework.beans.factory.annotation.Autowired;
1514

‎src/main/java/org/woehlke/simpleworklist/oodm/services/ContextService.java‎ renamed to ‎src/main/java/org/woehlke/simpleworklist/context/ContextService.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.context;
22

33
import org.woehlke.simpleworklist.oodm.entities.Context;
44
import org.woehlke.simpleworklist.oodm.entities.UserAccount;

‎src/main/java/org/woehlke/simpleworklist/oodm/services/impl/ContextServiceImpl.java‎ renamed to ‎src/main/java/org/woehlke/simpleworklist/context/ContextServiceImpl.java‎

Lines changed: 2 additions & 2 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.context;
22

33
import org.springframework.stereotype.Service;
44
import org.springframework.transaction.annotation.Propagation;
@@ -9,7 +9,7 @@
99
import org.woehlke.simpleworklist.oodm.repository.ContextRepository;
1010
import org.woehlke.simpleworklist.oodm.repository.ProjectRepository;
1111
import org.woehlke.simpleworklist.task.TaskRepository;
12-
import org.woehlke.simpleworklist.oodm.services.ContextService;
12+
import org.woehlke.simpleworklist.context.ContextService;
1313

1414
import org.springframework.beans.factory.annotation.Autowired;
1515
import java.util.List;

‎src/main/java/org/woehlke/simpleworklist/oodm/services/ProjectService.java‎ renamed to ‎src/main/java/org/woehlke/simpleworklist/project/ProjectService.java‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
package org.woehlke.simpleworklist.oodm.services;
2-
3-
import java.util.List;
4-
5-
import org.woehlke.simpleworklist.oodm.entities.Context;
6-
import org.woehlke.simpleworklist.oodm.entities.Project;
7-
//import org.woehlke.simpleworklist.oodm.entities.UserAccount;
8-
9-
public interface ProjectService {
10-
11-
List<Project> findRootProjectsByContext(Context context);
12-
13-
List<Project> findAllProjectsByContext(Context context);
14-
15-
//@Deprecated
16-
//List<Project> findRootProjectsByUserAccount(UserAccount userAccount);
17-
18-
//@Deprecated
19-
//List<Project> findAllProjectsByUserAccount(UserAccount user);
20-
21-
void moveProjectToAnotherProject(Project thisProject, Project targetProject);
22-
23-
Project findByProjectId(long categoryId);
24-
25-
Project saveAndFlush(Project project);
26-
27-
void delete(Project project);
28-
29-
void moveProjectToAnotherContext(Project thisProject, Context newContext);
30-
31-
}
1+
package org.woehlke.simpleworklist.project;
2+
3+
import java.util.List;
4+
5+
import org.woehlke.simpleworklist.oodm.entities.Context;
6+
import org.woehlke.simpleworklist.oodm.entities.Project;
7+
//import org.woehlke.simpleworklist.oodm.entities.UserAccount;
8+
9+
public interface ProjectService {
10+
11+
List<Project> findRootProjectsByContext(Context context);
12+
13+
List<Project> findAllProjectsByContext(Context context);
14+
15+
//@Deprecated
16+
//List<Project> findRootProjectsByUserAccount(UserAccount userAccount);
17+
18+
//@Deprecated
19+
//List<Project> findAllProjectsByUserAccount(UserAccount user);
20+
21+
void moveProjectToAnotherProject(Project thisProject, Project targetProject);
22+
23+
Project findByProjectId(long categoryId);
24+
25+
Project saveAndFlush(Project project);
26+
27+
void delete(Project project);
28+
29+
void moveProjectToAnotherContext(Project thisProject, Context newContext);
30+
31+
}

‎src/main/java/org/woehlke/simpleworklist/oodm/services/impl/ProjectServiceImpl.java‎ renamed to ‎src/main/java/org/woehlke/simpleworklist/project/ProjectServiceImpl.java‎

Lines changed: 1 addition & 2 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.project;
22

33
import java.util.ArrayList;
44
import java.util.List;
@@ -15,7 +15,6 @@
1515
import org.woehlke.simpleworklist.task.Task;
1616
import org.woehlke.simpleworklist.oodm.repository.ProjectRepository;
1717
import org.woehlke.simpleworklist.task.TaskRepository;
18-
import org.woehlke.simpleworklist.oodm.services.ProjectService;
1918

2019
@Service
2120
@Transactional(propagation = Propagation.REQUIRED, readOnly = true)

‎src/main/java/org/woehlke/simpleworklist/oodm/services/UserAccountService.java‎ renamed to ‎src/main/java/org/woehlke/simpleworklist/user/UserAccountService.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.user;
22

33
import java.util.Map;
44

‎src/main/java/org/woehlke/simpleworklist/oodm/services/impl/UserAccountServiceImpl.java‎ renamed to ‎src/main/java/org/woehlke/simpleworklist/user/UserAccountServiceImpl.java‎

Lines changed: 1 addition & 3 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.user;
22

33

44
import java.util.Date;
@@ -17,15 +17,13 @@
1717
import org.springframework.stereotype.Service;
1818
import org.springframework.transaction.annotation.Propagation;
1919
import org.springframework.transaction.annotation.Transactional;
20-
import org.woehlke.simpleworklist.user.UserAccountForm;
2120
import org.woehlke.simpleworklist.oodm.entities.Context;
2221
import org.woehlke.simpleworklist.oodm.entities.UserAccount;
2322
import org.woehlke.simpleworklist.oodm.entities.User2UserMessage;
2423
import org.woehlke.simpleworklist.language.Language;
2524
import org.woehlke.simpleworklist.oodm.repository.ContextRepository;
2625
import org.woehlke.simpleworklist.oodm.repository.UserAccountRepository;
2726
import org.woehlke.simpleworklist.oodm.repository.User2UserMessageRepository;
28-
import org.woehlke.simpleworklist.oodm.services.UserAccountService;
2927

3028
@Service("userAccountService")
3129
@Transactional(propagation = Propagation.REQUIRED, readOnly = true)

‎src/main/java/org/woehlke/simpleworklist/oodm/services/User2UserMessageService.java‎ renamed to ‎src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessageService.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.user.messages;
22

33
import org.springframework.data.domain.Page;
44
import org.springframework.data.domain.Pageable;

‎src/main/java/org/woehlke/simpleworklist/oodm/services/impl/User2UserMessageServiceImpl.java‎ renamed to ‎src/main/java/org/woehlke/simpleworklist/user/messages/User2UserMessageServiceImpl.java‎

Lines changed: 1 addition & 3 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.user.messages;
22

33
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;
@@ -7,11 +7,9 @@
77
import org.springframework.stereotype.Service;
88
import org.springframework.transaction.annotation.Propagation;
99
import org.springframework.transaction.annotation.Transactional;
10-
import org.woehlke.simpleworklist.user.messages.NewUser2UserMessage;
1110
import org.woehlke.simpleworklist.oodm.entities.User2UserMessage;
1211
import org.woehlke.simpleworklist.oodm.entities.UserAccount;
1312
import org.woehlke.simpleworklist.oodm.repository.User2UserMessageRepository;
14-
import org.woehlke.simpleworklist.oodm.services.User2UserMessageService;
1513

1614
import org.springframework.beans.factory.annotation.Autowired;
1715
import java.util.List;

0 commit comments

Comments
 (0)