Skip to content

Commit c5f4475

Browse files
thomaswoehlkethomaswoehlke
committed
refactoring of java classes
1 parent 5b05467 commit c5f4475

26 files changed

+34
-46
lines changed

‎src/main/java/org/woehlke/simpleworklist/application/framework/AbstractController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
import org.woehlke.simpleworklist.domain.task.TaskTime;
1616
import org.woehlke.simpleworklist.domain.context.ContextService;
1717
import org.woehlke.simpleworklist.domain.project.ProjectService;
18-
import org.woehlke.simpleworklist.domain.user.chat.ChatMessageService;
18+
import org.woehlke.simpleworklist.domain.chat.ChatMessageService;
1919
import org.woehlke.simpleworklist.domain.user.account.UserAccountService;
2020
import org.woehlke.simpleworklist.application.session.UserSessionBean;
2121

2222
import org.springframework.beans.factory.annotation.Autowired;
23-
import org.woehlke.simpleworklist.application.login.access.UserAccountAccessService;
24-
import org.woehlke.simpleworklist.application.login.login.UserAccountLoginSuccessService;
23+
import org.woehlke.simpleworklist.application.security.access.UserAccountAccessService;
24+
import org.woehlke.simpleworklist.application.security.login.UserAccountLoginSuccessService;
2525

2626
import javax.validation.constraints.NotNull;
2727
import java.util.ArrayList;

‎src/main/java/org/woehlke/simpleworklist/application/login/access/UserAccountAccessService.java renamed to ‎src/main/java/org/woehlke/simpleworklist/application/security/access/UserAccountAccessService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package org.woehlke.simpleworklist.application.login.access;
1+
package org.woehlke.simpleworklist.application.security.access;
22

33
import org.woehlke.simpleworklist.domain.user.accountselfservice.UserChangePasswordForm;
44
import org.woehlke.simpleworklist.domain.user.account.UserAccount;
5-
import org.woehlke.simpleworklist.application.login.login.LoginForm;
5+
import org.woehlke.simpleworklist.application.security.login.LoginForm;
66

77
public interface UserAccountAccessService {
88

‎src/main/java/org/woehlke/simpleworklist/application/login/access/UserAccountAccessServiceImpl.java renamed to ‎src/main/java/org/woehlke/simpleworklist/application/security/access/UserAccountAccessServiceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.simpleworklist.application.login.access;
1+
package org.woehlke.simpleworklist.application.security.access;
22

33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.beans.factory.annotation.Autowired;
@@ -10,7 +10,7 @@
1010
import org.springframework.stereotype.Service;
1111
import org.springframework.transaction.annotation.Propagation;
1212
import org.springframework.transaction.annotation.Transactional;
13-
import org.woehlke.simpleworklist.application.login.login.LoginForm;
13+
import org.woehlke.simpleworklist.application.security.login.LoginForm;
1414
import org.woehlke.simpleworklist.domain.user.account.UserAccount;
1515
import org.woehlke.simpleworklist.domain.user.account.UserAccountRepository;
1616
import org.woehlke.simpleworklist.domain.user.accountselfservice.UserChangePasswordForm;

‎src/main/java/org/woehlke/simpleworklist/application/login/account/SimpleworklistUserAccountSecurityService.java renamed to ‎src/main/java/org/woehlke/simpleworklist/application/security/account/SimpleworklistUserAccountSecurityService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.simpleworklist.application.login.account;
1+
package org.woehlke.simpleworklist.application.security.account;
22

33
import org.springframework.security.core.userdetails.UserDetailsService;
44

‎src/main/java/org/woehlke/simpleworklist/application/login/account/SimpleworklistUserAccountSecurityServiceImpl.java renamed to ‎src/main/java/org/woehlke/simpleworklist/application/security/account/SimpleworklistUserAccountSecurityServiceImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.simpleworklist.application.login.account;
1+
package org.woehlke.simpleworklist.application.security.account;
22

33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.beans.factory.annotation.Autowired;
@@ -7,7 +7,6 @@
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.application.login.account.SimpleworklistUserAccountSecurityService;
1110
import org.woehlke.simpleworklist.domain.user.account.UserAccount;
1211
import org.woehlke.simpleworklist.domain.user.account.UserAccountRepository;
1312
import org.woehlke.simpleworklist.domain.user.account.UserDetailsBean;

‎src/main/java/org/woehlke/simpleworklist/application/login/login/LoginForm.java renamed to ‎src/main/java/org/woehlke/simpleworklist/application/security/login/LoginForm.java

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

33
import javax.validation.constraints.NotNull;
44

‎src/main/java/org/woehlke/simpleworklist/application/login/login/LoginSuccessHandler.java renamed to ‎src/main/java/org/woehlke/simpleworklist/application/security/login/LoginSuccessHandler.java

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

33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.security.core.Authentication;

‎src/main/java/org/woehlke/simpleworklist/application/login/login/UserAccountLoginSuccessService.java renamed to ‎src/main/java/org/woehlke/simpleworklist/application/security/login/UserAccountLoginSuccessService.java

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

33
import org.springframework.security.core.userdetails.UsernameNotFoundException;
44
import org.woehlke.simpleworklist.domain.user.account.UserAccount;

‎src/main/java/org/woehlke/simpleworklist/application/login/login/UserAccountLoginSuccessServiceImpl.java renamed to ‎src/main/java/org/woehlke/simpleworklist/application/security/login/UserAccountLoginSuccessServiceImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.simpleworklist.application.login.login;
1+
package org.woehlke.simpleworklist.application.security.login;
22

33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.beans.factory.annotation.Autowired;
@@ -9,7 +9,6 @@
99
import org.springframework.stereotype.Service;
1010
import org.springframework.transaction.annotation.Propagation;
1111
import org.springframework.transaction.annotation.Transactional;
12-
import org.woehlke.simpleworklist.application.login.login.UserAccountLoginSuccessService;
1312
import org.woehlke.simpleworklist.domain.user.account.UserAccount;
1413
import org.woehlke.simpleworklist.domain.user.account.UserAccountRepository;
1514

‎src/main/java/org/woehlke/simpleworklist/application/login/login/UserLoginController.java renamed to ‎src/main/java/org/woehlke/simpleworklist/application/security/login/UserLoginController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.simpleworklist.application.login.login;
1+
package org.woehlke.simpleworklist.application.security.login;
22

33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +16,7 @@
1616
import org.springframework.web.bind.annotation.RequestMapping;
1717
import org.springframework.web.bind.annotation.RequestMethod;
1818
import org.springframework.web.bind.support.SessionStatus;
19-
import org.woehlke.simpleworklist.application.login.access.UserAccountAccessService;
19+
import org.woehlke.simpleworklist.application.security.access.UserAccountAccessService;
2020
import org.woehlke.simpleworklist.domain.user.account.UserAccount;
2121

2222
@Slf4j

‎src/main/java/org/woehlke/simpleworklist/application/login/token/TokenGeneratorService.java renamed to ‎src/main/java/org/woehlke/simpleworklist/application/security/token/TokenGeneratorService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.simpleworklist.application.login.token;
1+
package org.woehlke.simpleworklist.application.security.token;
22

33
public interface TokenGeneratorService {
44

‎src/main/java/org/woehlke/simpleworklist/application/login/token/TokenGeneratorServiceImpl.java renamed to ‎src/main/java/org/woehlke/simpleworklist/application/security/token/TokenGeneratorServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.simpleworklist.application.login.token;
1+
package org.woehlke.simpleworklist.application.security.token;
22

33
import org.springframework.stereotype.Service;
44

‎src/main/java/org/woehlke/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.simpleworklist.application.login.account.SimpleworklistUserAccountSecurityService;
23+
import org.woehlke.simpleworklist.application.security.account.SimpleworklistUserAccountSecurityService;
2424

2525

2626
@Configuration

‎src/main/java/org/woehlke/simpleworklist/domain/user/chat/ChatMessage.java renamed to ‎src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessage.java

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

33
import lombok.*;
44
import org.hibernate.validator.constraints.Length;

‎src/main/java/org/woehlke/simpleworklist/domain/user/chat/ChatMessageController.java renamed to ‎src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageController.java

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

33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.data.domain.Page;

‎src/main/java/org/woehlke/simpleworklist/domain/user/chat/ChatMessageForm.java renamed to ‎src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageForm.java

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

33

44
import lombok.*;

‎src/main/java/org/woehlke/simpleworklist/domain/user/chat/ChatMessageRepository.java renamed to ‎src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageRepository.java

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

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

‎src/main/java/org/woehlke/simpleworklist/domain/user/chat/ChatMessageService.java renamed to ‎src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageService.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
package org.woehlke.simpleworklist.domain.user.chat;
1+
package org.woehlke.simpleworklist.domain.chat;
22

33
import org.springframework.data.domain.Page;
44
import org.springframework.data.domain.Pageable;
55
import org.woehlke.simpleworklist.domain.user.account.UserAccount;
6-
import org.woehlke.simpleworklist.domain.user.chat.ChatMessage;
7-
import org.woehlke.simpleworklist.domain.user.chat.ChatMessageForm;
86

97
/**
108
* Created by tw on 16.02.2016.

‎src/main/java/org/woehlke/simpleworklist/domain/user/chat/ChatMessageServiceImpl.java renamed to ‎src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageServiceImpl.java

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

33
import lombok.extern.slf4j.Slf4j;
44
import org.springframework.data.domain.Page;
@@ -9,10 +9,6 @@
99
import org.woehlke.simpleworklist.domain.user.account.UserAccount;
1010

1111
import org.springframework.beans.factory.annotation.Autowired;
12-
import org.woehlke.simpleworklist.domain.user.chat.ChatMessage;
13-
import org.woehlke.simpleworklist.domain.user.chat.ChatMessageForm;
14-
import org.woehlke.simpleworklist.domain.user.chat.ChatMessageRepository;
15-
import org.woehlke.simpleworklist.domain.user.chat.ChatMessageService;
1612

1713
import java.util.List;
1814
import java.util.UUID;

‎src/main/java/org/woehlke/simpleworklist/domain/testdata/TestDataController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.woehlke.simpleworklist.domain.user.account.UserAccount;
88

99
import org.springframework.beans.factory.annotation.Autowired;
10-
import org.woehlke.simpleworklist.application.login.login.UserAccountLoginSuccessService;
10+
import org.woehlke.simpleworklist.application.security.login.UserAccountLoginSuccessService;
1111

1212
@Slf4j
1313
@Controller

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,9 @@
1414
import org.springframework.transaction.annotation.Propagation;
1515
import org.springframework.transaction.annotation.Transactional;
1616
import org.woehlke.simpleworklist.domain.context.Context;
17-
import org.woehlke.simpleworklist.domain.user.account.UserAccount;
18-
import org.woehlke.simpleworklist.domain.user.account.UserAccountForm;
19-
import org.woehlke.simpleworklist.domain.user.account.UserAccountRepository;
20-
import org.woehlke.simpleworklist.domain.user.account.UserAccountService;
21-
import org.woehlke.simpleworklist.domain.user.chat.ChatMessage;
17+
import org.woehlke.simpleworklist.domain.chat.ChatMessage;
2218
import org.woehlke.simpleworklist.domain.context.ContextRepository;
23-
import org.woehlke.simpleworklist.domain.user.chat.ChatMessageRepository;
19+
import org.woehlke.simpleworklist.domain.chat.ChatMessageRepository;
2420

2521
@Slf4j
2622
@Service("userAccountService")

‎src/main/java/org/woehlke/simpleworklist/domain/user/accountselfservice/UserSelfserviceController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.woehlke.simpleworklist.domain.context.Context;
2323
import org.woehlke.simpleworklist.domain.language.Language;
2424
import org.woehlke.simpleworklist.domain.user.account.UserAccount;
25-
import org.woehlke.simpleworklist.application.login.access.UserAccountAccessService;
25+
import org.woehlke.simpleworklist.application.security.access.UserAccountAccessService;
2626
import org.woehlke.simpleworklist.application.session.UserSessionBean;
2727

2828
import javax.validation.Valid;

‎src/main/java/org/woehlke/simpleworklist/domain/user/passwordrecovery/UserPasswordRecoveryServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.springframework.transaction.annotation.Propagation;
1111
import org.springframework.transaction.annotation.Transactional;
1212
import org.woehlke.simpleworklist.config.SimpleworklistProperties;
13-
import org.woehlke.simpleworklist.application.login.token.TokenGeneratorService;
13+
import org.woehlke.simpleworklist.application.security.token.TokenGeneratorService;
1414

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

‎src/main/java/org/woehlke/simpleworklist/domain/user/signup/UserRegistrationServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.springframework.transaction.annotation.Propagation;
1515
import org.springframework.transaction.annotation.Transactional;
1616
import org.woehlke.simpleworklist.config.SimpleworklistProperties;
17-
import org.woehlke.simpleworklist.application.login.token.TokenGeneratorService;
17+
import org.woehlke.simpleworklist.application.security.token.TokenGeneratorService;
1818

1919
@Slf4j
2020
@Service

‎src/test/java/org/woehlke/simpleworklist/application/config/AbstractTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
import org.woehlke.simpleworklist.config.SimpleworklistProperties;
1212
import org.woehlke.simpleworklist.domain.user.account.UserAccount;
1313
import org.woehlke.simpleworklist.domain.user.account.UserAccountService;
14-
import org.woehlke.simpleworklist.application.login.access.UserAccountAccessService;
15-
import org.woehlke.simpleworklist.application.login.account.SimpleworklistUserAccountSecurityService;
16-
import org.woehlke.simpleworklist.application.login.login.UserAccountLoginSuccessService;
14+
import org.woehlke.simpleworklist.application.security.access.UserAccountAccessService;
15+
import org.woehlke.simpleworklist.application.security.account.SimpleworklistUserAccountSecurityService;
16+
import org.woehlke.simpleworklist.application.security.login.UserAccountLoginSuccessService;
1717

1818

1919
import java.net.URL;

‎src/test/java/org/woehlke/simpleworklist/user/domain/account/UserAccountServiceImplTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.woehlke.simpleworklist.domain.user.account.UserAccountForm;
1414
import org.woehlke.simpleworklist.domain.user.passwordrecovery.UserPasswordRecoveryService;
1515
import org.woehlke.simpleworklist.domain.user.signup.UserRegistrationService;
16-
import org.woehlke.simpleworklist.application.login.login.LoginForm;
16+
import org.woehlke.simpleworklist.application.security.login.LoginForm;
1717

1818
import static org.junit.jupiter.api.Assertions.*;
1919

0 commit comments

Comments
 (0)