Skip to content

Commit 2749819

Browse files
thomaswoehlkethomaswoehlke
committed
migrate spring-boot
1 parent fef064f commit 2749819

19 files changed

+294
-292
lines changed

‎etc/serialversions.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ org.woehlke.simpleworklist.breadcrumb.BreadcrumbItem: private static final lo
1717
org.woehlke.simpleworklist.breadcrumb.Breadcrumb: private static final long serialVersionUID = 7932703111140692689L;
1818
org.woehlke.simpleworklist.user.login.LoginForm: private static final long serialVersionUID = 5936886560348238355L;
1919
org.woehlke.simpleworklist.model.beans.NewContextForm: private static final long serialVersionUID = -937143305653156981L;
20-
org.woehlke.simpleworklist.model.beans.NewUser2UserMessage: private static final long serialVersionUID = 1576610181966480168L;
20+
org.woehlke.simpleworklist.user.messages.NewUser2UserMessage: private static final long serialVersionUID = 1576610181966480168L;
2121
org.woehlke.simpleworklist.search.SearchResult: private static final long serialVersionUID = 1682809351146047764L;
2222
org.woehlke.simpleworklist.model.beans.UserAccountForm: private static final long serialVersionUID = 9180383385243540190L;
23-
org.woehlke.simpleworklist.model.beans.UserChangeDefaultContextForm: private static final long serialVersionUID = -8592295563275083292L;
24-
org.woehlke.simpleworklist.model.beans.UserChangeLanguageForm: private static final long serialVersionUID = 2201123162578113187L;
25-
org.woehlke.simpleworklist.model.beans.UserChangeNameForm: private static final long serialVersionUID = 5120488382888268418L;
23+
org.woehlke.simpleworklist.context.UserChangeDefaultContextForm: private static final long serialVersionUID = -8592295563275083292L;
24+
org.woehlke.simpleworklist.language.UserChangeLanguageForm: private static final long serialVersionUID = 2201123162578113187L;
25+
org.woehlke.simpleworklist.user.selfservice.UserChangeNameForm: private static final long serialVersionUID = 5120488382888268418L;
2626
org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm: private static final long serialVersionUID = 9149342594823222054L;
2727
org.woehlke.simpleworklist.user.register.UserRegistrationForm: private static final long serialVersionUID = 6864871862706880939L;
28-
org.woehlke.simpleworklist.model.beans.UserSessionBean: private static final long serialVersionUID = -6649686058228455825L;
28+
org.woehlke.simpleworklist.user.UserSessionBean: private static final long serialVersionUID = -6649686058228455825L;

‎getserialversionid.cmd‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ serialver org.woehlke.simpleworklist.breadcrumb.BreadcrumbItem >> ..\..\etc\ser
3434
serialver org.woehlke.simpleworklist.breadcrumb.Breadcrumb >> ..\..\etc\serialversions.txt
3535
serialver org.woehlke.simpleworklist.user.login.LoginForm >> ..\..\etc\serialversions.txt
3636
serialver org.woehlke.simpleworklist.model.beans.NewContextForm >> ..\..\etc\serialversions.txt
37-
serialver org.woehlke.simpleworklist.model.beans.NewUser2UserMessage >> ..\..\etc\serialversions.txt
37+
serialver org.woehlke.simpleworklist.user.messages.NewUser2UserMessage >> ..\..\etc\serialversions.txt
3838
serialver org.woehlke.simpleworklist.search.SearchResult >> ..\..\etc\serialversions.txt
3939
serialver org.woehlke.simpleworklist.model.beans.UserAccountForm >> ..\..\etc\serialversions.txt
40-
serialver org.woehlke.simpleworklist.model.beans.UserChangeDefaultContextForm >> ..\..\etc\serialversions.txt
41-
serialver org.woehlke.simpleworklist.model.beans.UserChangeLanguageForm >> ..\..\etc\serialversions.txt
42-
serialver org.woehlke.simpleworklist.model.beans.UserChangeNameForm >> ..\..\etc\serialversions.txt
40+
serialver org.woehlke.simpleworklist.context.UserChangeDefaultContextForm >> ..\..\etc\serialversions.txt
41+
serialver org.woehlke.simpleworklist.language.UserChangeLanguageForm >> ..\..\etc\serialversions.txt
42+
serialver org.woehlke.simpleworklist.user.selfservice.UserChangeNameForm >> ..\..\etc\serialversions.txt
4343
serialver org.woehlke.simpleworklist.user.selfservice.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
46-
serialver org.woehlke.simpleworklist.model.beans.UserSessionBean >> ..\..\etc\serialversions.txt
46+
serialver org.woehlke.simpleworklist.user.UserSessionBean >> ..\..\etc\serialversions.txt
4747
cd ..\..
4848
echo FINISHED

‎getserialversionid.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ serialver org.woehlke.simpleworklist.breadcrumb.BreadcrumbItem >> $SERIALVERSIO
4646
serialver org.woehlke.simpleworklist.breadcrumb.Breadcrumb >> $SERIALVERSIONS_FILE
4747
serialver org.woehlke.simpleworklist.user.login.LoginForm >> $SERIALVERSIONS_FILE
4848
serialver org.woehlke.simpleworklist.model.beans.NewContextForm >> $SERIALVERSIONS_FILE
49-
serialver org.woehlke.simpleworklist.model.beans.NewUser2UserMessage >> $SERIALVERSIONS_FILE
49+
serialver org.woehlke.simpleworklist.user.messages.NewUser2UserMessage >> $SERIALVERSIONS_FILE
5050
serialver org.woehlke.simpleworklist.search.SearchResult >> $SERIALVERSIONS_FILE
5151
serialver org.woehlke.simpleworklist.model.beans.UserAccountForm >> $SERIALVERSIONS_FILE
52-
serialver org.woehlke.simpleworklist.model.beans.UserChangeDefaultContextForm >> $SERIALVERSIONS_FILE
53-
serialver org.woehlke.simpleworklist.model.beans.UserChangeLanguageForm >> $SERIALVERSIONS_FILE
54-
serialver org.woehlke.simpleworklist.model.beans.UserChangeNameForm >> $SERIALVERSIONS_FILE
52+
serialver org.woehlke.simpleworklist.context.UserChangeDefaultContextForm >> $SERIALVERSIONS_FILE
53+
serialver org.woehlke.simpleworklist.language.UserChangeLanguageForm >> $SERIALVERSIONS_FILE
54+
serialver org.woehlke.simpleworklist.user.selfservice.UserChangeNameForm >> $SERIALVERSIONS_FILE
5555
serialver org.woehlke.simpleworklist.user.selfservice.UserChangePasswordForm >> $SERIALVERSIONS_FILE
5656
#serialver org.woehlke.simpleworklist.model.beans.UserDetailsBean >> $SERIALVERSIONS_FILE
5757
serialver org.woehlke.simpleworklist.user.register.UserRegistrationForm >> $SERIALVERSIONS_FILE
58-
serialver org.woehlke.simpleworklist.model.beans.UserSessionBean >> $SERIALVERSIONS_FILE
58+
serialver org.woehlke.simpleworklist.user.UserSessionBean >> $SERIALVERSIONS_FILE
5959
cd $PROJECT_PATH
6060
echo FINISHED

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import org.woehlke.simpleworklist.oodm.services.ProjectService;
1616
import org.woehlke.simpleworklist.oodm.services.User2UserMessageService;
1717
import org.woehlke.simpleworklist.oodm.services.UserAccountService;
18-
import org.woehlke.simpleworklist.model.beans.UserSessionBean;
18+
import org.woehlke.simpleworklist.user.UserSessionBean;
1919

2020
import org.springframework.beans.factory.annotation.Autowired;
2121
import org.woehlke.simpleworklist.user.UserAccountAccessService;

‎src/main/java/org/woehlke/simpleworklist/context/ContextController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.springframework.web.bind.annotation.RequestMethod;
99
import org.woehlke.simpleworklist.common.AbstractController;
1010
import org.woehlke.simpleworklist.oodm.entities.Context;
11-
import org.woehlke.simpleworklist.model.beans.UserSessionBean;
11+
import org.woehlke.simpleworklist.user.UserSessionBean;
1212
import org.woehlke.simpleworklist.oodm.services.ContextService;
1313

1414
import org.springframework.beans.factory.annotation.Autowired;

‎src/main/java/org/woehlke/simpleworklist/model/beans/UserChangeDefaultContextForm.java‎ renamed to ‎src/main/java/org/woehlke/simpleworklist/context/UserChangeDefaultContextForm.java‎

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,63 @@
1-
package org.woehlke.simpleworklist.model.beans;
2-
3-
import org.woehlke.simpleworklist.oodm.entities.Context;
4-
5-
import javax.validation.constraints.NotNull;
6-
import java.io.Serializable;
7-
8-
/**
9-
* Created by Fert on 16.03.2016.
10-
*/
11-
public class UserChangeDefaultContextForm implements Serializable {
12-
13-
private static final long serialVersionUID = -8592295563275083292L;
14-
15-
@NotNull
16-
private Long id;
17-
18-
@NotNull
19-
private Context defaultContext;
20-
21-
public Long getId() {
22-
return id;
23-
}
24-
25-
public void setId(Long id) {
26-
this.id = id;
27-
}
28-
29-
public Context getDefaultContext() {
30-
return defaultContext;
31-
}
32-
33-
public void setDefaultContext(Context defaultContext) {
34-
this.defaultContext = defaultContext;
35-
}
36-
37-
@Override
38-
public boolean equals(Object o) {
39-
if (this == o) return true;
40-
if (!(o instanceof UserChangeDefaultContextForm)) return false;
41-
42-
UserChangeDefaultContextForm that = (UserChangeDefaultContextForm) o;
43-
44-
if (id != null ? !id.equals(that.id) : that.id != null) return false;
45-
return defaultContext != null ? defaultContext.equals(that.defaultContext) : that.defaultContext == null;
46-
47-
}
48-
49-
@Override
50-
public int hashCode() {
51-
int result = id != null ? id.hashCode() : 0;
52-
result = 31 * result + (defaultContext != null ? defaultContext.hashCode() : 0);
53-
return result;
54-
}
55-
56-
@Override
57-
public String toString() {
58-
return "UserChangeDefaultContextForm{" +
59-
"id=" + id +
60-
", defaultContext=" + defaultContext +
61-
'}';
62-
}
63-
}
1+
package org.woehlke.simpleworklist.context;
2+
3+
import org.woehlke.simpleworklist.oodm.entities.Context;
4+
5+
import javax.validation.constraints.NotNull;
6+
import java.io.Serializable;
7+
8+
/**
9+
* Created by Fert on 16.03.2016.
10+
*/
11+
public class UserChangeDefaultContextForm implements Serializable {
12+
13+
private static final long serialVersionUID = -8592295563275083292L;
14+
15+
@NotNull
16+
private Long id;
17+
18+
@NotNull
19+
private Context defaultContext;
20+
21+
public Long getId() {
22+
return id;
23+
}
24+
25+
public void setId(Long id) {
26+
this.id = id;
27+
}
28+
29+
public Context getDefaultContext() {
30+
return defaultContext;
31+
}
32+
33+
public void setDefaultContext(Context defaultContext) {
34+
this.defaultContext = defaultContext;
35+
}
36+
37+
@Override
38+
public boolean equals(Object o) {
39+
if (this == o) return true;
40+
if (!(o instanceof UserChangeDefaultContextForm)) return false;
41+
42+
UserChangeDefaultContextForm that = (UserChangeDefaultContextForm) o;
43+
44+
if (id != null ? !id.equals(that.id) : that.id != null) return false;
45+
return defaultContext != null ? defaultContext.equals(that.defaultContext) : that.defaultContext == null;
46+
47+
}
48+
49+
@Override
50+
public int hashCode() {
51+
int result = id != null ? id.hashCode() : 0;
52+
result = 31 * result + (defaultContext != null ? defaultContext.hashCode() : 0);
53+
return result;
54+
}
55+
56+
@Override
57+
public String toString() {
58+
return "UserChangeDefaultContextForm{" +
59+
"id=" + id +
60+
", defaultContext=" + defaultContext +
61+
'}';
62+
}
63+
}

‎src/main/java/org/woehlke/simpleworklist/model/beans/UserChangeLanguageForm.java‎ renamed to ‎src/main/java/org/woehlke/simpleworklist/language/UserChangeLanguageForm.java‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
1-
package org.woehlke.simpleworklist.model.beans;
2-
3-
import org.woehlke.simpleworklist.oodm.enumerations.Language;
4-
5-
import javax.validation.constraints.NotNull;
6-
import java.io.Serializable;
7-
8-
/**
9-
* Created by Fert on 15.03.2016.
10-
*/
11-
public class UserChangeLanguageForm implements Serializable {
12-
13-
private static final long serialVersionUID = 2201123162578113187L;
14-
15-
@NotNull
16-
private Language defaultLanguage;
17-
18-
public UserChangeLanguageForm(){}
19-
20-
public UserChangeLanguageForm(Language defaultLanguage){
21-
this.defaultLanguage=defaultLanguage;
22-
}
23-
24-
public Language getDefaultLanguage() {
25-
return defaultLanguage;
26-
}
27-
28-
public void setDefaultLanguage(Language defaultLanguage) {
29-
this.defaultLanguage = defaultLanguage;
30-
}
31-
32-
@Override
33-
public boolean equals(Object o) {
34-
if (this == o) return true;
35-
if (!(o instanceof UserChangeLanguageForm)) return false;
36-
37-
UserChangeLanguageForm that = (UserChangeLanguageForm) o;
38-
39-
return defaultLanguage == that.defaultLanguage;
40-
41-
}
42-
43-
@Override
44-
public int hashCode() {
45-
return defaultLanguage != null ? defaultLanguage.hashCode() : 0;
46-
}
47-
48-
@Override
49-
public String toString() {
50-
return "UserChangeLanguageForm{" +
51-
"defaultLanguage=" + defaultLanguage +
52-
'}';
53-
}
54-
}
1+
package org.woehlke.simpleworklist.language;
2+
3+
import org.woehlke.simpleworklist.oodm.enumerations.Language;
4+
5+
import javax.validation.constraints.NotNull;
6+
import java.io.Serializable;
7+
8+
/**
9+
* Created by Fert on 15.03.2016.
10+
*/
11+
public class UserChangeLanguageForm implements Serializable {
12+
13+
private static final long serialVersionUID = 2201123162578113187L;
14+
15+
@NotNull
16+
private Language defaultLanguage;
17+
18+
public UserChangeLanguageForm(){}
19+
20+
public UserChangeLanguageForm(Language defaultLanguage){
21+
this.defaultLanguage=defaultLanguage;
22+
}
23+
24+
public Language getDefaultLanguage() {
25+
return defaultLanguage;
26+
}
27+
28+
public void setDefaultLanguage(Language defaultLanguage) {
29+
this.defaultLanguage = defaultLanguage;
30+
}
31+
32+
@Override
33+
public boolean equals(Object o) {
34+
if (this == o) return true;
35+
if (!(o instanceof UserChangeLanguageForm)) return false;
36+
37+
UserChangeLanguageForm that = (UserChangeLanguageForm) o;
38+
39+
return defaultLanguage == that.defaultLanguage;
40+
41+
}
42+
43+
@Override
44+
public int hashCode() {
45+
return defaultLanguage != null ? defaultLanguage.hashCode() : 0;
46+
}
47+
48+
@Override
49+
public String toString() {
50+
return "UserChangeLanguageForm{" +
51+
"defaultLanguage=" + defaultLanguage +
52+
'}';
53+
}
54+
}

‎src/main/java/org/woehlke/simpleworklist/oodm/services/User2UserMessageService.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
package org.woehlke.simpleworklist.oodm.services;
2-
3-
import org.springframework.data.domain.Page;
4-
import org.springframework.data.domain.Pageable;
5-
import org.woehlke.simpleworklist.model.beans.NewUser2UserMessage;
6-
import org.woehlke.simpleworklist.oodm.entities.User2UserMessage;
7-
import org.woehlke.simpleworklist.oodm.entities.UserAccount;
8-
9-
/**
10-
* Created by tw on 16.02.2016.
11-
*/
12-
public interface User2UserMessageService {
13-
14-
void sendNewUserMessage(UserAccount thisUser, UserAccount otherUser, NewUser2UserMessage newUser2UserMessage);
15-
16-
int getNumberOfNewIncomingMessagesForUser(UserAccount user);
17-
18-
Page<User2UserMessage> readAllMessagesBetweenCurrentAndOtherUser(UserAccount receiver, UserAccount sender, Pageable request);
19-
20-
}
1+
package org.woehlke.simpleworklist.oodm.services;
2+
3+
import org.springframework.data.domain.Page;
4+
import org.springframework.data.domain.Pageable;
5+
import org.woehlke.simpleworklist.user.messages.NewUser2UserMessage;
6+
import org.woehlke.simpleworklist.oodm.entities.User2UserMessage;
7+
import org.woehlke.simpleworklist.oodm.entities.UserAccount;
8+
9+
/**
10+
* Created by tw on 16.02.2016.
11+
*/
12+
public interface User2UserMessageService {
13+
14+
void sendNewUserMessage(UserAccount thisUser, UserAccount otherUser, NewUser2UserMessage newUser2UserMessage);
15+
16+
int getNumberOfNewIncomingMessagesForUser(UserAccount user);
17+
18+
Page<User2UserMessage> readAllMessagesBetweenCurrentAndOtherUser(UserAccount receiver, UserAccount sender, Pageable request);
19+
20+
}

0 commit comments

Comments
 (0)