Skip to content

Commit 5e2462d

Browse files
committed
migrate spring-boot
1 parent 3d9bec2 commit 5e2462d

File tree

7 files changed

+92
-91
lines changed

7 files changed

+92
-91
lines changed

etc/serialversions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ org.woehlke.simpleworklist.model.beans.UserAccountForm: private static final
2323
org.woehlke.simpleworklist.model.beans.UserChangeDefaultContextForm: private static final long serialVersionUID = -8592295563275083292L;
2424
org.woehlke.simpleworklist.model.beans.UserChangeLanguageForm: private static final long serialVersionUID = 2201123162578113187L;
2525
org.woehlke.simpleworklist.model.beans.UserChangeNameForm: private static final long serialVersionUID = 5120488382888268418L;
26-
org.woehlke.simpleworklist.model.beans.UserChangePasswordForm: private static final long serialVersionUID = 9149342594823222054L;
26+
org.woehlke.simpleworklist.user.resetpassword.UserChangePasswordForm: private static final long serialVersionUID = 9149342594823222054L;
2727
org.woehlke.simpleworklist.user.register.UserRegistrationForm: private static final long serialVersionUID = 6864871862706880939L;
2828
org.woehlke.simpleworklist.model.beans.UserSessionBean: private static final long serialVersionUID = -6649686058228455825L;

getserialversionid.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ serialver org.woehlke.simpleworklist.model.beans.UserAccountForm >> ..\..\etc\s
4040
serialver org.woehlke.simpleworklist.model.beans.UserChangeDefaultContextForm >> ..\..\etc\serialversions.txt
4141
serialver org.woehlke.simpleworklist.model.beans.UserChangeLanguageForm >> ..\..\etc\serialversions.txt
4242
serialver org.woehlke.simpleworklist.model.beans.UserChangeNameForm >> ..\..\etc\serialversions.txt
43-
serialver org.woehlke.simpleworklist.model.beans.UserChangePasswordForm >> ..\..\etc\serialversions.txt
43+
serialver org.woehlke.simpleworklist.user.resetpassword.UserChangePasswordForm >> ..\..\etc\serialversions.txt
4444
@rem serialver org.woehlke.simpleworklist.model.beans.UserDetailsBean >> ..\..\etc\serialversions.txt
4545
serialver org.woehlke.simpleworklist.user.register.UserRegistrationForm >> ..\..\etc\serialversions.txt
4646
serialver org.woehlke.simpleworklist.model.beans.UserSessionBean >> ..\..\etc\serialversions.txt

getserialversionid.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ serialver org.woehlke.simpleworklist.model.beans.UserAccountForm >> $SERIALVERS
5252
serialver org.woehlke.simpleworklist.model.beans.UserChangeDefaultContextForm >> $SERIALVERSIONS_FILE
5353
serialver org.woehlke.simpleworklist.model.beans.UserChangeLanguageForm >> $SERIALVERSIONS_FILE
5454
serialver org.woehlke.simpleworklist.model.beans.UserChangeNameForm >> $SERIALVERSIONS_FILE
55-
serialver org.woehlke.simpleworklist.model.beans.UserChangePasswordForm >> $SERIALVERSIONS_FILE
55+
serialver org.woehlke.simpleworklist.user.resetpassword.UserChangePasswordForm >> $SERIALVERSIONS_FILE
5656
#serialver org.woehlke.simpleworklist.model.beans.UserDetailsBean >> $SERIALVERSIONS_FILE
5757
serialver org.woehlke.simpleworklist.user.register.UserRegistrationForm >> $SERIALVERSIONS_FILE
5858
serialver org.woehlke.simpleworklist.model.beans.UserSessionBean >> $SERIALVERSIONS_FILE

src/main/java/org/woehlke/simpleworklist/user/UserAccountAccessService.java

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

3-
import org.woehlke.simpleworklist.model.beans.UserChangePasswordForm;
3+
import org.woehlke.simpleworklist.user.resetpassword.UserChangePasswordForm;
44
import org.woehlke.simpleworklist.oodm.entities.UserAccount;
55
import org.woehlke.simpleworklist.user.login.LoginForm;
66

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.springframework.transaction.annotation.Transactional;
1414
import org.woehlke.simpleworklist.oodm.entities.UserAccount;
1515
import org.woehlke.simpleworklist.user.login.LoginForm;
16-
import org.woehlke.simpleworklist.model.beans.UserChangePasswordForm;
16+
import org.woehlke.simpleworklist.user.resetpassword.UserChangePasswordForm;
1717
import org.woehlke.simpleworklist.oodm.repository.UserAccountRepository;
1818

1919
@Service
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,86 @@
1-
package org.woehlke.simpleworklist.model.beans;
2-
3-
import javax.validation.constraints.NotBlank;
4-
import org.hibernate.validator.constraints.SafeHtml;
5-
6-
import javax.persistence.Transient;
7-
import javax.validation.constraints.NotNull;
8-
import java.io.Serializable;
9-
10-
/**
11-
* Created by tw on 15.03.16.
12-
*/
13-
public class UserChangePasswordForm implements Serializable {
14-
15-
private static final long serialVersionUID = 9149342594823222054L;
16-
17-
//TODO: Messages i18n
18-
@SafeHtml(whitelistType= SafeHtml.WhiteListType.NONE)
19-
@NotNull(message = "Password is compulsory")
20-
@NotBlank(message = "Password is compulsory")
21-
private String oldUserPassword;
22-
23-
//TODO: Messages i18n
24-
@SafeHtml(whitelistType= SafeHtml.WhiteListType.NONE)
25-
@NotNull(message = "Password is compulsory")
26-
@NotBlank(message = "Password is compulsory")
27-
private String userPassword;
28-
29-
//TODO: Messages i18n
30-
@SafeHtml(whitelistType= SafeHtml.WhiteListType.NONE)
31-
@NotNull(message = "Password is compulsory")
32-
@NotBlank(message = "Password is compulsory")
33-
private String userPasswordConfirmation;
34-
35-
@Transient
36-
public boolean passwordsAreTheSame() {
37-
return this.userPassword.compareTo(userPasswordConfirmation) == 0;
38-
}
39-
40-
public String getOldUserPassword() {
41-
return oldUserPassword;
42-
}
43-
44-
public void setOldUserPassword(String oldUserPassword) {
45-
this.oldUserPassword = oldUserPassword;
46-
}
47-
48-
public String getUserPassword() {
49-
return userPassword;
50-
}
51-
52-
public void setUserPassword(String userPassword) {
53-
this.userPassword = userPassword;
54-
}
55-
56-
public String getUserPasswordConfirmation() {
57-
return userPasswordConfirmation;
58-
}
59-
60-
public void setUserPasswordConfirmation(String userPasswordConfirmation) {
61-
this.userPasswordConfirmation = userPasswordConfirmation;
62-
}
63-
64-
@Override
65-
public boolean equals(Object o) {
66-
if (this == o) return true;
67-
if (o == null || getClass() != o.getClass()) return false;
68-
69-
UserChangePasswordForm that = (UserChangePasswordForm) o;
70-
71-
if (oldUserPassword != null ? !oldUserPassword.equals(that.oldUserPassword) : that.oldUserPassword != null)
72-
return false;
73-
if (userPassword != null ? !userPassword.equals(that.userPassword) : that.userPassword != null) return false;
74-
return userPasswordConfirmation != null ? userPasswordConfirmation.equals(that.userPasswordConfirmation) : that.userPasswordConfirmation == null;
75-
76-
}
77-
78-
@Override
79-
public int hashCode() {
80-
int result = oldUserPassword != null ? oldUserPassword.hashCode() : 0;
81-
result = 31 * result + (userPassword != null ? userPassword.hashCode() : 0);
82-
result = 31 * result + (userPasswordConfirmation != null ? userPasswordConfirmation.hashCode() : 0);
83-
return result;
84-
}
85-
86-
}
1+
package org.woehlke.simpleworklist.user.resetpassword;
2+
3+
import javax.validation.constraints.NotBlank;
4+
import org.hibernate.validator.constraints.SafeHtml;
5+
6+
import javax.persistence.Transient;
7+
import javax.validation.constraints.NotNull;
8+
import java.io.Serializable;
9+
10+
/**
11+
* Created by tw on 15.03.16.
12+
*/
13+
public class UserChangePasswordForm implements Serializable {
14+
15+
private static final long serialVersionUID = 9149342594823222054L;
16+
17+
//TODO: Messages i18n
18+
@SafeHtml(whitelistType= SafeHtml.WhiteListType.NONE)
19+
@NotNull(message = "Password is compulsory")
20+
@NotBlank(message = "Password is compulsory")
21+
private String oldUserPassword;
22+
23+
//TODO: Messages i18n
24+
@SafeHtml(whitelistType= SafeHtml.WhiteListType.NONE)
25+
@NotNull(message = "Password is compulsory")
26+
@NotBlank(message = "Password is compulsory")
27+
private String userPassword;
28+
29+
//TODO: Messages i18n
30+
@SafeHtml(whitelistType= SafeHtml.WhiteListType.NONE)
31+
@NotNull(message = "Password is compulsory")
32+
@NotBlank(message = "Password is compulsory")
33+
private String userPasswordConfirmation;
34+
35+
@Transient
36+
public boolean passwordsAreTheSame() {
37+
return this.userPassword.compareTo(userPasswordConfirmation) == 0;
38+
}
39+
40+
public String getOldUserPassword() {
41+
return oldUserPassword;
42+
}
43+
44+
public void setOldUserPassword(String oldUserPassword) {
45+
this.oldUserPassword = oldUserPassword;
46+
}
47+
48+
public String getUserPassword() {
49+
return userPassword;
50+
}
51+
52+
public void setUserPassword(String userPassword) {
53+
this.userPassword = userPassword;
54+
}
55+
56+
public String getUserPasswordConfirmation() {
57+
return userPasswordConfirmation;
58+
}
59+
60+
public void setUserPasswordConfirmation(String userPasswordConfirmation) {
61+
this.userPasswordConfirmation = userPasswordConfirmation;
62+
}
63+
64+
@Override
65+
public boolean equals(Object o) {
66+
if (this == o) return true;
67+
if (o == null || getClass() != o.getClass()) return false;
68+
69+
UserChangePasswordForm that = (UserChangePasswordForm) o;
70+
71+
if (oldUserPassword != null ? !oldUserPassword.equals(that.oldUserPassword) : that.oldUserPassword != null)
72+
return false;
73+
if (userPassword != null ? !userPassword.equals(that.userPassword) : that.userPassword != null) return false;
74+
return userPasswordConfirmation != null ? userPasswordConfirmation.equals(that.userPasswordConfirmation) : that.userPasswordConfirmation == null;
75+
76+
}
77+
78+
@Override
79+
public int hashCode() {
80+
int result = oldUserPassword != null ? oldUserPassword.hashCode() : 0;
81+
result = 31 * result + (userPassword != null ? userPassword.hashCode() : 0);
82+
result = 31 * result + (userPasswordConfirmation != null ? userPasswordConfirmation.hashCode() : 0);
83+
return result;
84+
}
85+
86+
}

src/main/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceController.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.woehlke.simpleworklist.oodm.enumerations.Language;
2424
import org.woehlke.simpleworklist.model.beans.*;
2525
import org.woehlke.simpleworklist.user.UserAccountAccessService;
26+
import org.woehlke.simpleworklist.user.resetpassword.UserChangePasswordForm;
2627

2728
import javax.validation.Valid;
2829
import java.util.List;

0 commit comments

Comments
 (0)