Skip to content

Commit 72b583e

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent 1f943cf commit 72b583e

11 files changed

+44
-44
lines changed

‎src/main/java/org/woehlke/simpleworklist/user/chat/User2UserMessageController.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public final String getLastMessagesBetweenCurrentAndOtherUser(
3939
Locale locale,
4040
Model model
4141
) {
42-
log.info("getLastMessagesBetweenCurrentAndOtherUser");
42+
log.debug("getLastMessagesBetweenCurrentAndOtherUser");
4343
Context context = super.getContext(userSession);
4444
UserAccount thisUser = context.getUserAccount();
4545
model.addAttribute("userSession",userSession);
@@ -65,16 +65,16 @@ public final String sendNewMessageToOtherUser(
6565
Locale locale,
6666
Model model
6767
) {
68-
log.info("sendNewMessageToOtherUser");
68+
log.debug("sendNewMessageToOtherUser");
6969
Context context = super.getContext(userSession);
7070
UserAccount thisUser = context.getUserAccount();
7171
model.addAttribute("userSession",userSession);
7272
Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForMessagesBetweenCurrentAndOtherUser(locale);
7373
model.addAttribute("breadcrumb",breadcrumb);
7474
if(result.hasErrors()){
75-
log.info("result.hasErrors");
75+
log.debug("result.hasErrors");
7676
for(ObjectError objectError:result.getAllErrors()){
77-
log.info("result.hasErrors: "+objectError.toString());
77+
log.debug("result.hasErrors: "+objectError.toString());
7878
}
7979
Page<User2UserMessage> user2UserMessagePage = user2UserMessageService.readAllMessagesBetweenCurrentAndOtherUser(thisUser,otherUser,request);
8080
model.addAttribute("otherUser", otherUser);

‎src/main/java/org/woehlke/simpleworklist/user/login/LoginSuccessHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void onAuthenticationSuccess(
4444
HttpServletResponse response,
4545
Authentication authentication
4646
) throws ServletException, IOException {
47-
log.info("onAuthenticationSuccess");
47+
log.debug("onAuthenticationSuccess");
4848
super.onAuthenticationSuccess(request, response, authentication);
4949
UserAccount user = userAccountLoginSuccessService.retrieveCurrentUser();
5050
userAccountLoginSuccessService.updateLastLoginTimestamp(user);
@@ -54,7 +54,7 @@ public void onAuthenticationSuccess(
5454
default: locale = Locale.ENGLISH; break;
5555
}
5656
localeResolver.setLocale(request,response,locale);
57-
log.info("successful logged in "+user.getUserEmail());
57+
log.debug("successful logged in "+user.getUserEmail());
5858
}
5959

6060
}

‎src/main/java/org/woehlke/simpleworklist/user/login/UserLoginController.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public UserLoginController(
4646
*/
4747
@RequestMapping(path = "/login", method = RequestMethod.GET)
4848
public final String loginGet(Model model) {
49-
log.info("loginForm");
49+
log.debug("loginForm");
5050
LoginForm loginForm = new LoginForm();
5151
model.addAttribute("loginForm", loginForm);
5252
return "user/login/loginForm";
@@ -66,12 +66,12 @@ public final String loginPost(
6666
BindingResult result,
6767
Model model
6868
) {
69-
log.info("loginPerform");
69+
log.debug("loginPerform");
7070
boolean authorized = userAccountAccessService.authorize(loginForm);
7171
if (!result.hasErrors() && authorized) {
7272
UserAccount user = userAccountLoginSuccessService.retrieveCurrentUser();
7373
userAccountLoginSuccessService.updateLastLoginTimestamp(user);
74-
log.info("logged in");
74+
log.debug("logged in");
7575
return "redirect:/home";
7676
} else {
7777
String objectName = "loginForm";
@@ -82,7 +82,7 @@ public final String loginPost(
8282
field = "userPassword";
8383
fieldError = new FieldError(objectName, field, defaultMessage);
8484
result.addError(fieldError);
85-
log.info("not logged in");
85+
log.debug("not logged in");
8686
return "user/login/loginForm";
8787
}
8888
}
@@ -93,7 +93,7 @@ public String logoutPage (
9393
HttpServletRequest request,
9494
HttpServletResponse response
9595
) {
96-
log.info("logoutPages");
96+
log.debug("logoutPages");
9797
Authentication auth = SecurityContextHolder.getContext().getAuthentication();
9898
if (auth != null){
9999
new SecurityContextLogoutHandler().logout(request, response, auth);

‎src/main/java/org/woehlke/simpleworklist/user/register/UserRegistrationController.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public UserRegistrationController(UserAccountService userAccountService, UserReg
3838
*/
3939
@RequestMapping(path = "/", method = RequestMethod.GET)
4040
public final String registerGet(Model model) {
41-
log.info("registerGet");
41+
log.debug("registerGet");
4242
UserRegistrationForm userRegistrationForm = new UserRegistrationForm();
4343
model.addAttribute("userRegistrationForm", userRegistrationForm);
4444
return "user/register/registerForm";
@@ -58,7 +58,7 @@ public final String registerPost(
5858
BindingResult result,
5959
Model model
6060
) {
61-
log.info("registerPost");
61+
log.debug("registerPost");
6262
if (result.hasErrors()) {
6363
return "user/register/registerForm";
6464
} else {
@@ -98,8 +98,8 @@ public final String registerConfirmGet(
9898
@PathVariable String confirmId,
9999
Model model
100100
) {
101-
log.info("registerConfirmGet");
102-
log.info("GET /confirm/" + confirmId);
101+
log.debug("registerConfirmGet");
102+
log.debug("GET /confirm/" + confirmId);
103103
UserRegistration o = userRegistrationService.findByToken(confirmId);
104104
if (o != null) {
105105
userRegistrationService.registrationClickedInEmail(o);
@@ -128,8 +128,8 @@ public final String registerConfirmPost(
128128
BindingResult result,
129129
Model model
130130
) {
131-
log.info("registerConfirmPost");
132-
log.info("POST /confirm/" + confirmId + " : " + userAccountForm.toString());
131+
log.debug("registerConfirmPost");
132+
log.debug("POST /confirm/" + confirmId + " : " + userAccountForm.toString());
133133
userRegistrationService.registrationCheckIfResponseIsInTime(userAccountForm.getUserEmail());
134134
UserRegistration oUserRegistration = userRegistrationService.findByToken(confirmId);
135135
if (oUserRegistration != null) {

‎src/main/java/org/woehlke/simpleworklist/user/resetpassword/UserPasswordRecoveryController.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,16 @@ public final String passwordForgottenPost(
6161
Model model
6262
) {
6363
if (result.hasErrors()) {
64-
log.info("----------------------");
65-
log.info(userRegistrationForm.toString());
66-
log.info(result.toString());
67-
log.info(model.toString());
68-
log.info("----------------------");
64+
log.debug("----------------------");
65+
log.debug(userRegistrationForm.toString());
66+
log.debug(result.toString());
67+
log.debug(model.toString());
68+
log.debug("----------------------");
6969
return "user/resetPassword/resetPasswordForm";
7070
} else {
71-
log.info(userRegistrationForm.toString());
72-
log.info(result.toString());
73-
log.info(model.toString());
71+
log.debug(userRegistrationForm.toString());
72+
log.debug(result.toString());
73+
log.debug(model.toString());
7474
if (userAccountService.findByUserEmail(userRegistrationForm.getEmail()) == null) {
7575
String objectName = "userRegistrationForm";
7676
String field = "email";

‎src/main/java/org/woehlke/simpleworklist/user/services/User2UserMessageServiceImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public User2UserMessage sendNewUserMessage(
3838
UserAccount otherUser,
3939
User2UserMessageFormBean user2UserMessageFormBean
4040
) {
41-
log.info("sendNewUserMessage");
41+
log.debug("sendNewUserMessage");
4242
User2UserMessage m = new User2UserMessage();
4343
m.setSender(thisUser);
4444
m.setReceiver(otherUser);
@@ -51,7 +51,7 @@ public User2UserMessage sendNewUserMessage(
5151
public int getNumberOfNewIncomingMessagesForUser(
5252
UserAccount receiver
5353
) {
54-
log.info("getNumberOfNewIncomingMessagesForUser");
54+
log.debug("getNumberOfNewIncomingMessagesForUser");
5555
boolean readByReceiver = false;
5656
//TODO: #246 change List<Project> to Page<Project>
5757
List<User2UserMessage> user2UserMessageList =
@@ -66,7 +66,7 @@ public Page<User2UserMessage> readAllMessagesBetweenCurrentAndOtherUser(
6666
UserAccount sender,
6767
Pageable request
6868
) {
69-
log.info("readAllMessagesBetweenCurrentAndOtherUser");
69+
log.debug("readAllMessagesBetweenCurrentAndOtherUser");
7070
Page<User2UserMessage> user2UserMessagePage = userMessageRepository.findAllMessagesBetweenCurrentAndOtherUser(sender,receiver,request);
7171
for(User2UserMessage user2UserMessage : user2UserMessagePage){
7272
if((!user2UserMessage.getReadByReceiver()) && (receiver.getId().longValue()== user2UserMessage.getReceiver().getId().longValue())){

‎src/main/java/org/woehlke/simpleworklist/user/services/UserAccountAccessServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public boolean confirmUserByLoginAndPassword(
6767
);
6868
Authentication authenticationResult = authenticationManager.authenticate(token);
6969
String oldPwEncoded = this.encoder.encode(oldUserPassword);
70-
log.info(userEmail+", "+oldPwEncoded);
70+
log.debug(userEmail+", "+oldPwEncoded);
7171
return authenticationResult.isAuthenticated();
7272
}
7373

‎src/main/java/org/woehlke/simpleworklist/user/services/UserAccountLoginSuccessServiceImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public UserAccountLoginSuccessServiceImpl(UserAccountRepository userAccountRepos
2929

3030
@Override
3131
public String retrieveUsername() {
32-
log.info("retrieveUsername");
32+
log.debug("retrieveUsername");
3333
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
3434
if(authentication == null) return " ";
3535
Object principal = authentication.getPrincipal();
@@ -42,7 +42,7 @@ public String retrieveUsername() {
4242

4343
@Override
4444
public UserAccount retrieveCurrentUser() throws UsernameNotFoundException {
45-
log.info("retrieveCurrentUser");
45+
log.debug("retrieveCurrentUser");
4646
String username = this.retrieveUsername();
4747
UserAccount account = userAccountRepository.findByUserEmail(username);
4848
if (account == null) throw new UsernameNotFoundException(username);
@@ -52,7 +52,7 @@ public UserAccount retrieveCurrentUser() throws UsernameNotFoundException {
5252
@Override
5353
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
5454
public void updateLastLoginTimestamp(UserAccount user) {
55-
log.info("updateLastLoginTimestamp");
55+
log.debug("updateLastLoginTimestamp");
5656
user.setLastLoginTimestamp(new Date());
5757
userAccountRepository.saveAndFlush(user);
5858
}

‎src/main/java/org/woehlke/simpleworklist/user/services/UserAccountServiceImpl.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,21 +60,21 @@ public void createUser(UserAccountForm userAccount) {
6060
u.setAccountNonLocked(true);
6161
u.setCredentialsNonExpired(true);
6262
u.setEnabled(true);
63-
log.info("About to save " + u.toString());
63+
log.debug("About to save " + u.toString());
6464
u = userAccountRepository.save(u);
6565
Context workContext = new Context("Arbeit","Work");
6666
Context privContext = new Context("Privat","Private");
6767
workContext.setUuid(UUID.randomUUID().toString());
6868
privContext.setUuid(UUID.randomUUID().toString());
6969
workContext.setUserAccount(u);
7070
privContext.setUserAccount(u);
71-
log.info("About to save " + workContext.toString());
71+
log.debug("About to save " + workContext.toString());
7272
contextRepository.save(workContext);
73-
log.info("About to save " + privContext.toString());
73+
log.debug("About to save " + privContext.toString());
7474
contextRepository.save(privContext);
7575
u.setDefaultContext(workContext);
7676
u = userAccountRepository.save(u);
77-
log.info("Saved " + u.toString());
77+
log.debug("Saved " + u.toString());
7878
}
7979

8080
@Override

‎src/main/java/org/woehlke/simpleworklist/user/services/UserPasswordRecoveryServiceImpl.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,17 @@ public void passwordRecoverySendEmailTo(String email) {
7474
o.setEmail(email);
7575
String token = tokenGeneratorService.getToken();
7676
o.setToken(token);
77-
log.info("To be saved: " + o.toString());
77+
log.debug("To be saved: " + o.toString());
7878
o = userPasswordRecoveryRepository.saveAndFlush(o);
79-
log.info("Saved: " + o.toString());
79+
log.debug("Saved: " + o.toString());
8080
this.sendEmailForPasswordReset(o);
8181
}
8282

8383
@Override
8484
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
8585
public void passwordRecoverySentEmail(UserPasswordRecovery o) {
8686
o.setDoubleOptInStatus(UserPasswordRecoveryStatus.PASSWORD_RECOVERY_SENT_EMAIL);
87-
log.info("about to save: " + o.toString());
87+
log.debug("about to save: " + o.toString());
8888
userPasswordRecoveryRepository.saveAndFlush(o);
8989
}
9090

@@ -125,6 +125,6 @@ private void sendEmailForPasswordReset(UserPasswordRecovery o) {
125125
if (success) {
126126
this.passwordRecoverySentEmail(o);
127127
}
128-
log.info("Sent MAIL: " + o.toString());
128+
log.debug("Sent MAIL: " + o.toString());
129129
}
130130
}

0 commit comments

Comments
 (0)