Skip to content

Commit f3daab1

Browse files
committed
migrate spring-boot
1 parent 5236871 commit f3daab1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+342
-345
lines changed

etc/serialversions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ org.woehlke.simpleworklist.oodm.entities.Context: private static final long s
1010
org.woehlke.simpleworklist.oodm.entities.Project: private static final long serialVersionUID = 4566653175832872422L;
1111
org.woehlke.simpleworklist.task.Task: private static final long serialVersionUID = 5247710652586269801L;
1212
org.woehlke.simpleworklist.oodm.entities.User2UserMessage: private static final long serialVersionUID = 4263078228257938175L;
13-
org.woehlke.simpleworklist.oodm.entities.UserAccount: private static final long serialVersionUID = 7860692526488291439L;
13+
org.woehlke.simpleworklist.user.account.UserAccount: private static final long serialVersionUID = 7860692526488291439L;
1414
org.woehlke.simpleworklist.oodm.entities.UserPasswordRecovery: private static final long serialVersionUID = 6860716425733119940L;
1515
org.woehlke.simpleworklist.oodm.entities.UserRegistration: private static final long serialVersionUID = -1955967514018161878L;
1616
org.woehlke.simpleworklist.breadcrumb.BreadcrumbItem: private static final long serialVersionUID = 8276819198016077167L;

getserialversionid.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ serialver org.woehlke.simpleworklist.oodm.entities.Context >> ..\..\etc\serialv
2727
serialver org.woehlke.simpleworklist.oodm.entities.Project >> ..\..\etc\serialversions.txt
2828
serialver org.woehlke.simpleworklist.task.Task >> ..\..\etc\serialversions.txt
2929
serialver org.woehlke.simpleworklist.oodm.entities.User2UserMessage >> ..\..\etc\serialversions.txt
30-
serialver org.woehlke.simpleworklist.oodm.entities.UserAccount >> ..\..\etc\serialversions.txt
30+
serialver org.woehlke.simpleworklist.user.account.UserAccount >> ..\..\etc\serialversions.txt
3131
serialver org.woehlke.simpleworklist.oodm.entities.UserPasswordRecovery >> ..\..\etc\serialversions.txt
3232
serialver org.woehlke.simpleworklist.oodm.entities.UserRegistration >> ..\..\etc\serialversions.txt
3333
serialver org.woehlke.simpleworklist.breadcrumb.BreadcrumbItem >> ..\..\etc\serialversions.txt

getserialversionid.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ serialver org.woehlke.simpleworklist.oodm.entities.Context >> $SERIALVERSIONS_F
3939
serialver org.woehlke.simpleworklist.oodm.entities.Project >> $SERIALVERSIONS_FILE
4040
serialver org.woehlke.simpleworklist.task.Task >> $SERIALVERSIONS_FILE
4141
serialver org.woehlke.simpleworklist.oodm.entities.User2UserMessage >> $SERIALVERSIONS_FILE
42-
serialver org.woehlke.simpleworklist.oodm.entities.UserAccount >> $SERIALVERSIONS_FILE
42+
serialver org.woehlke.simpleworklist.user.account.UserAccount >> $SERIALVERSIONS_FILE
4343
serialver org.woehlke.simpleworklist.oodm.entities.UserPasswordRecovery >> $SERIALVERSIONS_FILE
4444
serialver org.woehlke.simpleworklist.oodm.entities.UserRegistration >> $SERIALVERSIONS_FILE
4545
serialver org.woehlke.simpleworklist.breadcrumb.BreadcrumbItem >> $SERIALVERSIONS_FILE

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.woehlke.simpleworklist.config.ApplicationProperties;
99
import org.woehlke.simpleworklist.oodm.entities.Context;
1010
import org.woehlke.simpleworklist.oodm.entities.Project;
11-
import org.woehlke.simpleworklist.oodm.entities.UserAccount;
11+
import org.woehlke.simpleworklist.user.account.UserAccount;
1212
import org.woehlke.simpleworklist.task.TaskEnergy;
1313
import org.woehlke.simpleworklist.task.TaskTime;
1414
import org.woehlke.simpleworklist.context.ContextService;

src/main/java/org/woehlke/simpleworklist/context/ContextService.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package org.woehlke.simpleworklist.context;
22

33
import org.woehlke.simpleworklist.oodm.entities.Context;
4-
import org.woehlke.simpleworklist.oodm.entities.UserAccount;
5-
import org.woehlke.simpleworklist.context.NewContextForm;
4+
import org.woehlke.simpleworklist.user.account.UserAccount;
65

76
import java.util.List;
87

src/main/java/org/woehlke/simpleworklist/context/ContextServiceImpl.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
import org.springframework.stereotype.Service;
44
import org.springframework.transaction.annotation.Propagation;
55
import org.springframework.transaction.annotation.Transactional;
6-
import org.woehlke.simpleworklist.context.NewContextForm;
76
import org.woehlke.simpleworklist.oodm.entities.Context;
8-
import org.woehlke.simpleworklist.oodm.entities.UserAccount;
7+
import org.woehlke.simpleworklist.user.account.UserAccount;
98
import org.woehlke.simpleworklist.oodm.repository.ContextRepository;
109
import org.woehlke.simpleworklist.oodm.repository.ProjectRepository;
1110
import org.woehlke.simpleworklist.task.TaskRepository;
12-
import org.woehlke.simpleworklist.context.ContextService;
1311

1412
import org.springframework.beans.factory.annotation.Autowired;
1513
import java.util.List;

src/main/java/org/woehlke/simpleworklist/oodm/entities/Context.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.hibernate.validator.constraints.SafeHtml;
66
import org.woehlke.simpleworklist.oodm.entities.impl.AuditModel;
77
import org.woehlke.simpleworklist.oodm.entities.impl.ComparableById;
8+
import org.woehlke.simpleworklist.user.account.UserAccount;
89

910
import javax.persistence.*;
1011
import javax.persistence.Index;

src/main/java/org/woehlke/simpleworklist/oodm/entities/Project.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.hibernate.validator.constraints.SafeHtml;
1616
import org.woehlke.simpleworklist.oodm.entities.impl.AuditModel;
1717
import org.woehlke.simpleworklist.oodm.entities.impl.ComparableById;
18+
import org.woehlke.simpleworklist.user.account.UserAccount;
1819

1920
@Entity
2021
@Table(
Lines changed: 135 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -1,134 +1,135 @@
1-
package org.woehlke.simpleworklist.oodm.entities;
2-
3-
import org.hibernate.validator.constraints.Length;
4-
import javax.validation.constraints.NotBlank;
5-
import org.hibernate.validator.constraints.SafeHtml;
6-
import org.woehlke.simpleworklist.oodm.entities.impl.AuditModel;
7-
8-
import javax.persistence.*;
9-
import javax.validation.constraints.NotNull;
10-
import java.io.Serializable;
11-
import java.util.Objects;
12-
13-
/**
14-
* Created by Fert on 16.02.2016.
15-
*/
16-
@Entity
17-
@Table(
18-
name="user_message",
19-
uniqueConstraints = {
20-
@UniqueConstraint(
21-
name="ux_user_message",
22-
columnNames = {"row_created_at", "user_account_id_sender", "user_account_id_receiver"}
23-
)
24-
},
25-
indexes = {
26-
@Index(name = "ix_user_message_uuid", columnList = "uuid"),
27-
@Index(name = "ix_user_message_row_created_at", columnList = "row_created_at")
28-
}
29-
)
30-
public class User2UserMessage extends AuditModel implements Serializable {
31-
32-
private static final long serialVersionUID = 4263078228257938175L;
33-
34-
@Id
35-
@GeneratedValue(generator = "user_message_generator")
36-
@SequenceGenerator(
37-
name = "user_message_generator",
38-
sequenceName = "user_message_sequence",
39-
initialValue = 1000
40-
)
41-
private Long id;
42-
43-
@SafeHtml(whitelistType= SafeHtml.WhiteListType.SIMPLE_TEXT)
44-
@NotBlank
45-
@Length(min=1,max=65535)
46-
@Column(name="message_text", nullable = false, length = 65535, columnDefinition="text")
47-
private String messageText;
48-
49-
@NotNull
50-
@Column(name="read_by_receiver", columnDefinition = "boolean default false")
51-
private Boolean readByReceiver;
52-
53-
@NotNull
54-
@ManyToOne
55-
@JoinColumn(name = "user_account_id_sender", nullable = false)
56-
private UserAccount sender;
57-
58-
@NotNull
59-
@ManyToOne
60-
@JoinColumn(name = "user_account_id_receiver", nullable = false)
61-
private UserAccount receiver;
62-
63-
public Long getId() {
64-
return id;
65-
}
66-
67-
public void setId(Long id) {
68-
this.id = id;
69-
}
70-
71-
public String getMessageText() {
72-
return messageText;
73-
}
74-
75-
public void setMessageText(String messageText) {
76-
this.messageText = messageText;
77-
}
78-
79-
public Boolean isReadByReceiver() {
80-
return readByReceiver;
81-
}
82-
83-
public void setReadByReceiver(Boolean readByReceiver) {
84-
this.readByReceiver = readByReceiver;
85-
}
86-
87-
public UserAccount getSender() {
88-
return sender;
89-
}
90-
91-
public void setSender(UserAccount sender) {
92-
this.sender = sender;
93-
}
94-
95-
public UserAccount getReceiver() {
96-
return receiver;
97-
}
98-
99-
public void setReceiver(UserAccount receiver) {
100-
this.receiver = receiver;
101-
}
102-
103-
@Override
104-
public boolean equals(Object o) {
105-
if (this == o) return true;
106-
if (!(o instanceof User2UserMessage)) return false;
107-
if (!super.equals(o)) return false;
108-
User2UserMessage that = (User2UserMessage) o;
109-
return Objects.equals(getId(), that.getId()) &&
110-
getMessageText().equals(that.getMessageText()) &&
111-
isReadByReceiver().equals(that.isReadByReceiver()) &&
112-
getSender().equals(that.getSender()) &&
113-
getReceiver().equals(that.getReceiver());
114-
}
115-
116-
@Override
117-
public int hashCode() {
118-
return Objects.hash(super.hashCode(), getId(), getMessageText(), isReadByReceiver(), getSender(), getReceiver());
119-
}
120-
121-
@Override
122-
public String toString() {
123-
return "User2UserMessage{" +
124-
"id=" + id +
125-
", messageText='" + messageText + '\'' +
126-
", readByReceiver=" + readByReceiver +
127-
", sender=" + sender +
128-
", receiver=" + receiver +
129-
", uuid='" + uuid + '\'' +
130-
", rowCreatedAt=" + rowCreatedAt +
131-
", rowUpdatedAt=" + rowUpdatedAt +
132-
'}';
133-
}
134-
}
1+
package org.woehlke.simpleworklist.oodm.entities;
2+
3+
import org.hibernate.validator.constraints.Length;
4+
import javax.validation.constraints.NotBlank;
5+
import org.hibernate.validator.constraints.SafeHtml;
6+
import org.woehlke.simpleworklist.oodm.entities.impl.AuditModel;
7+
import org.woehlke.simpleworklist.user.account.UserAccount;
8+
9+
import javax.persistence.*;
10+
import javax.validation.constraints.NotNull;
11+
import java.io.Serializable;
12+
import java.util.Objects;
13+
14+
/**
15+
* Created by Fert on 16.02.2016.
16+
*/
17+
@Entity
18+
@Table(
19+
name="user_message",
20+
uniqueConstraints = {
21+
@UniqueConstraint(
22+
name="ux_user_message",
23+
columnNames = {"row_created_at", "user_account_id_sender", "user_account_id_receiver"}
24+
)
25+
},
26+
indexes = {
27+
@Index(name = "ix_user_message_uuid", columnList = "uuid"),
28+
@Index(name = "ix_user_message_row_created_at", columnList = "row_created_at")
29+
}
30+
)
31+
public class User2UserMessage extends AuditModel implements Serializable {
32+
33+
private static final long serialVersionUID = 4263078228257938175L;
34+
35+
@Id
36+
@GeneratedValue(generator = "user_message_generator")
37+
@SequenceGenerator(
38+
name = "user_message_generator",
39+
sequenceName = "user_message_sequence",
40+
initialValue = 1000
41+
)
42+
private Long id;
43+
44+
@SafeHtml(whitelistType= SafeHtml.WhiteListType.SIMPLE_TEXT)
45+
@NotBlank
46+
@Length(min=1,max=65535)
47+
@Column(name="message_text", nullable = false, length = 65535, columnDefinition="text")
48+
private String messageText;
49+
50+
@NotNull
51+
@Column(name="read_by_receiver", columnDefinition = "boolean default false")
52+
private Boolean readByReceiver;
53+
54+
@NotNull
55+
@ManyToOne
56+
@JoinColumn(name = "user_account_id_sender", nullable = false)
57+
private UserAccount sender;
58+
59+
@NotNull
60+
@ManyToOne
61+
@JoinColumn(name = "user_account_id_receiver", nullable = false)
62+
private UserAccount receiver;
63+
64+
public Long getId() {
65+
return id;
66+
}
67+
68+
public void setId(Long id) {
69+
this.id = id;
70+
}
71+
72+
public String getMessageText() {
73+
return messageText;
74+
}
75+
76+
public void setMessageText(String messageText) {
77+
this.messageText = messageText;
78+
}
79+
80+
public Boolean isReadByReceiver() {
81+
return readByReceiver;
82+
}
83+
84+
public void setReadByReceiver(Boolean readByReceiver) {
85+
this.readByReceiver = readByReceiver;
86+
}
87+
88+
public UserAccount getSender() {
89+
return sender;
90+
}
91+
92+
public void setSender(UserAccount sender) {
93+
this.sender = sender;
94+
}
95+
96+
public UserAccount getReceiver() {
97+
return receiver;
98+
}
99+
100+
public void setReceiver(UserAccount receiver) {
101+
this.receiver = receiver;
102+
}
103+
104+
@Override
105+
public boolean equals(Object o) {
106+
if (this == o) return true;
107+
if (!(o instanceof User2UserMessage)) return false;
108+
if (!super.equals(o)) return false;
109+
User2UserMessage that = (User2UserMessage) o;
110+
return Objects.equals(getId(), that.getId()) &&
111+
getMessageText().equals(that.getMessageText()) &&
112+
isReadByReceiver().equals(that.isReadByReceiver()) &&
113+
getSender().equals(that.getSender()) &&
114+
getReceiver().equals(that.getReceiver());
115+
}
116+
117+
@Override
118+
public int hashCode() {
119+
return Objects.hash(super.hashCode(), getId(), getMessageText(), isReadByReceiver(), getSender(), getReceiver());
120+
}
121+
122+
@Override
123+
public String toString() {
124+
return "User2UserMessage{" +
125+
"id=" + id +
126+
", messageText='" + messageText + '\'' +
127+
", readByReceiver=" + readByReceiver +
128+
", sender=" + sender +
129+
", receiver=" + receiver +
130+
", uuid='" + uuid + '\'' +
131+
", rowCreatedAt=" + rowCreatedAt +
132+
", rowUpdatedAt=" + rowUpdatedAt +
133+
'}';
134+
}
135+
}

0 commit comments

Comments
 (0)