Skip to content

Commit 3d9bec2

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

File tree

6 files changed

+62
-63
lines changed

6 files changed

+62
-63
lines changed

etc/serialversions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ org.woehlke.simpleworklist.model.beans.UserChangeDefaultContextForm: private
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;
2626
org.woehlke.simpleworklist.model.beans.UserChangePasswordForm: private static final long serialVersionUID = 9149342594823222054L;
27-
org.woehlke.simpleworklist.model.beans.UserRegistrationForm: private static final long serialVersionUID = 6864871862706880939L;
27+
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
@@ -42,7 +42,7 @@ serialver org.woehlke.simpleworklist.model.beans.UserChangeLanguageForm >> ..\.
4242
serialver org.woehlke.simpleworklist.model.beans.UserChangeNameForm >> ..\..\etc\serialversions.txt
4343
serialver org.woehlke.simpleworklist.model.beans.UserChangePasswordForm >> ..\..\etc\serialversions.txt
4444
@rem serialver org.woehlke.simpleworklist.model.beans.UserDetailsBean >> ..\..\etc\serialversions.txt
45-
serialver org.woehlke.simpleworklist.model.beans.UserRegistrationForm >> ..\..\etc\serialversions.txt
45+
serialver org.woehlke.simpleworklist.user.register.UserRegistrationForm >> ..\..\etc\serialversions.txt
4646
serialver org.woehlke.simpleworklist.model.beans.UserSessionBean >> ..\..\etc\serialversions.txt
4747
cd ..\..
4848
echo FINISHED

getserialversionid.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ serialver org.woehlke.simpleworklist.model.beans.UserChangeLanguageForm >> $SER
5454
serialver org.woehlke.simpleworklist.model.beans.UserChangeNameForm >> $SERIALVERSIONS_FILE
5555
serialver org.woehlke.simpleworklist.model.beans.UserChangePasswordForm >> $SERIALVERSIONS_FILE
5656
#serialver org.woehlke.simpleworklist.model.beans.UserDetailsBean >> $SERIALVERSIONS_FILE
57-
serialver org.woehlke.simpleworklist.model.beans.UserRegistrationForm >> $SERIALVERSIONS_FILE
57+
serialver org.woehlke.simpleworklist.user.register.UserRegistrationForm >> $SERIALVERSIONS_FILE
5858
serialver org.woehlke.simpleworklist.model.beans.UserSessionBean >> $SERIALVERSIONS_FILE
5959
cd $PROJECT_PATH
6060
echo FINISHED

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import org.springframework.web.bind.annotation.RequestMapping;
1212
import org.springframework.web.bind.annotation.RequestMethod;
1313
import org.woehlke.simpleworklist.model.beans.UserAccountForm;
14-
import org.woehlke.simpleworklist.model.beans.UserRegistrationForm;
1514
import org.woehlke.simpleworklist.oodm.entities.UserRegistration;
1615
import org.woehlke.simpleworklist.oodm.services.UserRegistrationService;
1716
import org.woehlke.simpleworklist.oodm.services.UserAccountService;
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,58 @@
1-
package org.woehlke.simpleworklist.model.beans;
2-
3-
import javax.validation.constraints.NotNull;
4-
5-
import javax.validation.constraints.Email;
6-
import javax.validation.constraints.NotBlank;
7-
import java.io.Serializable;
8-
9-
public class UserRegistrationForm implements Serializable {
10-
11-
private static final long serialVersionUID = 6864871862706880939L;
12-
13-
//TODO: Messages i18n
14-
@NotNull(message = "Email Address is compulsory")
15-
@NotBlank(message = "Email Address is compulsory")
16-
@Email(message = "Email Address is not a valid format")
17-
private String email;
18-
19-
public String getEmail() {
20-
return email;
21-
}
22-
23-
public void setEmail(String email) {
24-
this.email = email;
25-
}
26-
27-
@Override
28-
public int hashCode() {
29-
final int prime = 31;
30-
int result = 1;
31-
result = prime * result + ((email == null) ? 0 : email.hashCode());
32-
return result;
33-
}
34-
35-
@Override
36-
public boolean equals(Object obj) {
37-
if (this == obj)
38-
return true;
39-
if (obj == null)
40-
return false;
41-
if (getClass() != obj.getClass())
42-
return false;
43-
UserRegistrationForm other = (UserRegistrationForm) obj;
44-
if (email == null) {
45-
if (other.email != null)
46-
return false;
47-
} else if (!email.equals(other.email))
48-
return false;
49-
return true;
50-
}
51-
52-
@Override
53-
public String toString() {
54-
return "UserRegistrationForm [email=" + email + "]";
55-
}
56-
57-
58-
}
1+
package org.woehlke.simpleworklist.user.register;
2+
3+
import javax.validation.constraints.NotNull;
4+
5+
import javax.validation.constraints.Email;
6+
import javax.validation.constraints.NotBlank;
7+
import java.io.Serializable;
8+
9+
public class UserRegistrationForm implements Serializable {
10+
11+
private static final long serialVersionUID = 6864871862706880939L;
12+
13+
//TODO: Messages i18n
14+
@NotNull(message = "Email Address is compulsory")
15+
@NotBlank(message = "Email Address is compulsory")
16+
@Email(message = "Email Address is not a valid format")
17+
private String email;
18+
19+
public String getEmail() {
20+
return email;
21+
}
22+
23+
public void setEmail(String email) {
24+
this.email = email;
25+
}
26+
27+
@Override
28+
public int hashCode() {
29+
final int prime = 31;
30+
int result = 1;
31+
result = prime * result + ((email == null) ? 0 : email.hashCode());
32+
return result;
33+
}
34+
35+
@Override
36+
public boolean equals(Object obj) {
37+
if (this == obj)
38+
return true;
39+
if (obj == null)
40+
return false;
41+
if (getClass() != obj.getClass())
42+
return false;
43+
UserRegistrationForm other = (UserRegistrationForm) obj;
44+
if (email == null) {
45+
if (other.email != null)
46+
return false;
47+
} else if (!email.equals(other.email))
48+
return false;
49+
return true;
50+
}
51+
52+
@Override
53+
public String toString() {
54+
return "UserRegistrationForm [email=" + email + "]";
55+
}
56+
57+
58+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.woehlke.simpleworklist.model.beans.UserAccountForm;
1313
import org.woehlke.simpleworklist.oodm.entities.UserPasswordRecovery;
1414
import org.woehlke.simpleworklist.oodm.entities.UserAccount;
15-
import org.woehlke.simpleworklist.model.beans.UserRegistrationForm;
15+
import org.woehlke.simpleworklist.user.register.UserRegistrationForm;
1616
import org.woehlke.simpleworklist.oodm.services.UserPasswordRecoveryService;
1717
import org.woehlke.simpleworklist.oodm.services.UserAccountService;
1818

0 commit comments

Comments
 (0)