Skip to content

Commit 07062e5

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent ce704e9 commit 07062e5

File tree

118 files changed

+483
-443
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+483
-443
lines changed

‎src/main/java/org/woehlke/java/simpleworklist/application/listener/ApplicationContextRefreshedListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import org.springframework.context.ApplicationListener;
77
import org.springframework.context.event.ContextRefreshedEvent;
88
import org.springframework.stereotype.Component;
9-
import org.woehlke.java.simpleworklist.domain.search.SearchService;
9+
import org.woehlke.java.simpleworklist.domain.db.search.service.SearchService;
1010

1111

1212
/**

‎src/main/java/org/woehlke/java/simpleworklist/application/listener/ApplicationContextStartedListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.springframework.context.ApplicationListener;
66
import org.springframework.context.event.ContextStartedEvent;
77
import org.springframework.stereotype.Component;
8-
import org.woehlke.java.simpleworklist.domain.search.SearchService;
8+
import org.woehlke.java.simpleworklist.domain.db.search.service.SearchService;
99

1010
import org.springframework.beans.factory.annotation.Autowired;
1111

‎src/main/java/org/woehlke/java/simpleworklist/config/WebSecurityConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.springframework.security.crypto.password.PasswordEncoder;
2121
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
2222
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
23-
import org.woehlke.java.simpleworklist.domain.user.access.ApplicationUserDetailsService;
23+
import org.woehlke.java.simpleworklist.domain.security.access.ApplicationUserDetailsService;
2424

2525

2626
@Configuration

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,33 @@
44
import org.springframework.validation.BindingResult;
55
import org.springframework.web.bind.annotation.ModelAttribute;
66
import org.springframework.web.bind.annotation.SessionAttributes;
7-
import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
8-
import org.woehlke.java.simpleworklist.domain.breadcrumb.BreadcrumbService;
7+
import org.woehlke.java.simpleworklist.domain.db.data.Project;
8+
import org.woehlke.java.simpleworklist.domain.db.data.project.ProjectService;
9+
import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
10+
import org.woehlke.java.simpleworklist.domain.meso.breadcrumb.BreadcrumbService;
911
import org.woehlke.java.simpleworklist.config.SimpleworklistProperties;
10-
import org.woehlke.java.simpleworklist.domain.context.Context;
11-
import org.woehlke.java.simpleworklist.domain.project.Project;
12-
import org.woehlke.java.simpleworklist.domain.task.Task;
13-
import org.woehlke.java.simpleworklist.domain.task.TaskService;
14-
import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState;
15-
import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
16-
import org.woehlke.java.simpleworklist.domain.task.TaskEnergy;
17-
import org.woehlke.java.simpleworklist.domain.task.TaskTime;
18-
import org.woehlke.java.simpleworklist.domain.context.ContextService;
19-
import org.woehlke.java.simpleworklist.domain.project.ProjectService;
20-
import org.woehlke.java.simpleworklist.domain.chat.ChatMessageService;
21-
import org.woehlke.java.simpleworklist.domain.user.account.UserAccountService;
12+
import org.woehlke.java.simpleworklist.domain.db.data.Context;
13+
import org.woehlke.java.simpleworklist.domain.db.data.Task;
14+
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
15+
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState;
16+
import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
17+
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskEnergy;
18+
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskTime;
19+
import org.woehlke.java.simpleworklist.domain.db.data.context.ContextService;
20+
import org.woehlke.java.simpleworklist.domain.db.user.chat.ChatMessageService;
21+
import org.woehlke.java.simpleworklist.domain.db.user.account.UserAccountService;
2222

2323
import org.springframework.beans.factory.annotation.Autowired;
24-
import org.woehlke.java.simpleworklist.domain.user.access.UserAuthorizationService;
25-
import org.woehlke.java.simpleworklist.domain.user.login.LoginSuccessService;
24+
import org.woehlke.java.simpleworklist.domain.security.access.UserAuthorizationService;
25+
import org.woehlke.java.simpleworklist.domain.security.login.LoginSuccessService;
2626

2727
import javax.validation.constraints.NotNull;
2828
import java.util.ArrayList;
2929
import java.util.List;
3030
import java.util.Locale;
3131

3232
import static java.util.Locale.GERMAN;
33-
import static org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState.*;
33+
import static org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState.*;
3434

3535
/**
3636
* Created by tw on 14.02.16.

‎src/main/java/org/woehlke/java/simpleworklist/domain/ContextController.java‎ renamed to ‎src/main/java/org/woehlke/java/simpleworklist/domain/db/ContextController.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.java.simpleworklist.domain;
1+
package org.woehlke.java.simpleworklist.domain.db;
22

33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.stereotype.Controller;
@@ -7,9 +7,10 @@
77
import org.springframework.web.bind.annotation.PathVariable;
88
import org.springframework.web.bind.annotation.RequestMapping;
99
import org.springframework.web.bind.annotation.RequestMethod;
10-
import org.woehlke.java.simpleworklist.domain.context.Context;
11-
import org.woehlke.java.simpleworklist.domain.context.ContextService;
12-
import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
10+
import org.woehlke.java.simpleworklist.domain.AbstractController;
11+
import org.woehlke.java.simpleworklist.domain.db.data.Context;
12+
import org.woehlke.java.simpleworklist.domain.db.data.context.ContextService;
13+
import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
1314

1415
import org.springframework.beans.factory.annotation.Autowired;
1516

‎src/main/java/org/woehlke/java/simpleworklist/domain/ProjectIdController.java‎ renamed to ‎src/main/java/org/woehlke/java/simpleworklist/domain/db/ProjectIdController.java‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.java.simpleworklist.domain;
1+
package org.woehlke.java.simpleworklist.domain.db;
22

33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.data.domain.Page;
@@ -11,26 +11,27 @@
1111
import org.springframework.validation.FieldError;
1212
import org.springframework.validation.ObjectError;
1313
import org.springframework.web.bind.annotation.*;
14-
import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb;
15-
import org.woehlke.java.simpleworklist.domain.context.Context;
14+
import org.woehlke.java.simpleworklist.domain.AbstractController;
15+
import org.woehlke.java.simpleworklist.domain.meso.breadcrumb.Breadcrumb;
16+
import org.woehlke.java.simpleworklist.domain.db.data.Context;
1617
import org.woehlke.java.simpleworklist.domain.project.Project;
1718
import org.woehlke.java.simpleworklist.domain.project.ProjectControllerService;
18-
import org.woehlke.java.simpleworklist.domain.task.Task;
19-
import org.woehlke.java.simpleworklist.domain.task.TaskEnergy;
20-
import org.woehlke.java.simpleworklist.domain.task.TaskService;
21-
import org.woehlke.java.simpleworklist.domain.task.TaskTime;
22-
import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState;
23-
import org.woehlke.java.simpleworklist.domain.taskworkflow.TransformTaskIntoProjektService;
24-
import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
25-
import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
19+
import org.woehlke.java.simpleworklist.domain.db.data.Task;
20+
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskEnergy;
21+
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
22+
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskTime;
23+
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState;
24+
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TransformTaskIntoProjektService;
25+
import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
26+
import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
2627

2728
import org.springframework.beans.factory.annotation.Autowired;
2829

2930
import javax.validation.Valid;
3031
import java.util.List;
3132
import java.util.Locale;
3233

33-
import static org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState.PROJECTS;
34+
import static org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState.PROJECTS;
3435

3536
/**
3637
* Created by tw on 14.02.16.

‎src/main/java/org/woehlke/java/simpleworklist/domain/ProjectRootController.java‎ renamed to ‎src/main/java/org/woehlke/java/simpleworklist/domain/db/ProjectRootController.java‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.java.simpleworklist.domain;
1+
package org.woehlke.java.simpleworklist.domain.db;
22

33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,25 +12,26 @@
1212
import org.springframework.validation.FieldError;
1313
import org.springframework.validation.ObjectError;
1414
import org.springframework.web.bind.annotation.*;
15-
import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb;
16-
import org.woehlke.java.simpleworklist.domain.context.Context;
15+
import org.woehlke.java.simpleworklist.domain.AbstractController;
16+
import org.woehlke.java.simpleworklist.domain.meso.breadcrumb.Breadcrumb;
17+
import org.woehlke.java.simpleworklist.domain.db.data.Context;
1718
import org.woehlke.java.simpleworklist.domain.project.Project;
1819
import org.woehlke.java.simpleworklist.domain.project.ProjectControllerService;
19-
import org.woehlke.java.simpleworklist.domain.task.Task;
20-
import org.woehlke.java.simpleworklist.domain.task.TaskEnergy;
21-
import org.woehlke.java.simpleworklist.domain.task.TaskService;
22-
import org.woehlke.java.simpleworklist.domain.task.TaskTime;
23-
import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState;
24-
import org.woehlke.java.simpleworklist.domain.taskworkflow.TransformTaskIntoProjektService;
25-
import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
26-
import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
20+
import org.woehlke.java.simpleworklist.domain.db.data.Task;
21+
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskEnergy;
22+
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskService;
23+
import org.woehlke.java.simpleworklist.domain.db.data.task.TaskTime;
24+
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState;
25+
import org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TransformTaskIntoProjektService;
26+
import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
27+
import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
2728

2829
import javax.validation.Valid;
2930
import java.util.List;
3031
import java.util.Locale;
3132
import java.util.UUID;
3233

33-
import static org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState.PROJECTS;
34+
import static org.woehlke.java.simpleworklist.domain.meso.taskworkflow.TaskState.PROJECTS;
3435

3536
@Slf4j
3637
@Controller

‎src/main/java/org/woehlke/java/simpleworklist/domain/SearchController.java‎ renamed to ‎src/main/java/org/woehlke/java/simpleworklist/domain/db/SearchController.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.java.simpleworklist.domain;
1+
package org.woehlke.java.simpleworklist.domain.db;
22

33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.stereotype.Controller;
@@ -7,11 +7,12 @@
77
import org.springframework.web.bind.annotation.RequestMapping;
88
import org.springframework.web.bind.annotation.RequestMethod;
99
import org.springframework.web.bind.annotation.RequestParam;
10-
import org.woehlke.java.simpleworklist.domain.context.Context;
11-
import org.woehlke.java.simpleworklist.domain.search.SearchService;
12-
import org.woehlke.java.simpleworklist.domain.search.result.SearchResult;
13-
import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb;
14-
import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
10+
import org.woehlke.java.simpleworklist.domain.AbstractController;
11+
import org.woehlke.java.simpleworklist.domain.db.data.Context;
12+
import org.woehlke.java.simpleworklist.domain.db.search.service.SearchService;
13+
import org.woehlke.java.simpleworklist.domain.db.search.SearchResult;
14+
import org.woehlke.java.simpleworklist.domain.meso.breadcrumb.Breadcrumb;
15+
import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
1516

1617
import org.springframework.beans.factory.annotation.Autowired;
1718

‎src/main/java/org/woehlke/java/simpleworklist/domain/ChatMessageController.java‎ renamed to ‎src/main/java/org/woehlke/java/simpleworklist/domain/db/UserChatMessageController.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.java.simpleworklist.domain;
1+
package org.woehlke.java.simpleworklist.domain.db;
22

33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.data.domain.Page;
@@ -13,12 +13,13 @@
1313
import org.springframework.web.bind.annotation.PathVariable;
1414
import org.springframework.web.bind.annotation.RequestMapping;
1515
import org.springframework.web.bind.annotation.RequestMethod;
16-
import org.woehlke.java.simpleworklist.domain.breadcrumb.Breadcrumb;
17-
import org.woehlke.java.simpleworklist.domain.chat.ChatMessage;
18-
import org.woehlke.java.simpleworklist.domain.chat.ChatMessageForm;
19-
import org.woehlke.java.simpleworklist.domain.context.Context;
20-
import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
21-
import org.woehlke.java.simpleworklist.domain.session.UserSessionBean;
16+
import org.woehlke.java.simpleworklist.domain.AbstractController;
17+
import org.woehlke.java.simpleworklist.domain.db.user.UserChatMessage;
18+
import org.woehlke.java.simpleworklist.domain.meso.breadcrumb.Breadcrumb;
19+
import org.woehlke.java.simpleworklist.domain.db.user.chat.ChatMessageForm;
20+
import org.woehlke.java.simpleworklist.domain.db.data.Context;
21+
import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
22+
import org.woehlke.java.simpleworklist.domain.meso.session.UserSessionBean;
2223

2324
import javax.validation.Valid;
2425
import java.util.Locale;
@@ -30,7 +31,7 @@
3031
@Slf4j
3132
@Controller
3233
@RequestMapping(path = "/user2user")
33-
public class ChatMessageController extends AbstractController {
34+
public class UserChatMessageController extends AbstractController {
3435

3536
@RequestMapping(path = "/{userId}/messages/", method = RequestMethod.GET)
3637
public final String getLastMessagesBetweenCurrentAndOtherUser(
@@ -45,7 +46,7 @@ public final String getLastMessagesBetweenCurrentAndOtherUser(
4546
UserAccount thisUser = context.getUserAccount();
4647
model.addAttribute("userSession",userSession);
4748
ChatMessageForm chatMessageForm = new ChatMessageForm();
48-
Page<ChatMessage> user2UserMessagePage = chatMessageService.readAllMessagesBetweenCurrentAndOtherUser(thisUser,otherUser,request);
49+
Page<UserChatMessage> user2UserMessagePage = chatMessageService.readAllMessagesBetweenCurrentAndOtherUser(thisUser,otherUser,request);
4950
model.addAttribute("newUser2UserMessage", chatMessageForm);
5051
model.addAttribute("otherUser", otherUser);
5152
model.addAttribute("user2UserMessagePage", user2UserMessagePage);
@@ -77,7 +78,7 @@ public final String sendNewMessageToOtherUser(
7778
for(ObjectError objectError:result.getAllErrors()){
7879
log.info("result.hasErrors: "+objectError.toString());
7980
}
80-
Page<ChatMessage> user2UserMessagePage = chatMessageService.readAllMessagesBetweenCurrentAndOtherUser(thisUser,otherUser,request);
81+
Page<UserChatMessage> user2UserMessagePage = chatMessageService.readAllMessagesBetweenCurrentAndOtherUser(thisUser,otherUser,request);
8182
model.addAttribute("otherUser", otherUser);
8283
model.addAttribute("user2UserMessagePage", user2UserMessagePage);
8384
model.addAttribute("userSession", userSession);

‎src/main/java/org/woehlke/java/simpleworklist/domain/UserPasswordRecoveryController.java‎ renamed to ‎src/main/java/org/woehlke/java/simpleworklist/domain/db/UserPasswordRecoveryController.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.java.simpleworklist.domain;
1+
package org.woehlke.java.simpleworklist.domain.db;
22

33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.stereotype.Controller;
@@ -8,12 +8,12 @@
88
import org.springframework.web.bind.annotation.PathVariable;
99
import org.springframework.web.bind.annotation.RequestMapping;
1010
import org.springframework.web.bind.annotation.RequestMethod;
11-
import org.woehlke.java.simpleworklist.domain.user.account.UserAccountService;
12-
import org.woehlke.java.simpleworklist.domain.user.account.UserAccountForm;
13-
import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
14-
import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserAccountPasswordRecovery;
15-
import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserAccountPasswordRecoveryService;
16-
import org.woehlke.java.simpleworklist.domain.user.signup.UserAccountRegistrationForm;
11+
import org.woehlke.java.simpleworklist.domain.db.user.account.UserAccountService;
12+
import org.woehlke.java.simpleworklist.domain.db.user.account.UserAccountForm;
13+
import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
14+
import org.woehlke.java.simpleworklist.domain.db.user.UserAccountPasswordRecovery;
15+
import org.woehlke.java.simpleworklist.domain.db.user.passwordrecovery.UserAccountPasswordRecoveryService;
16+
import org.woehlke.java.simpleworklist.domain.db.user.signup.UserAccountRegistrationForm;
1717

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

0 commit comments

Comments
 (0)