Skip to content

Commit 8ec76b5

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent 7e85b6c commit 8ec76b5

33 files changed

+64
-58
lines changed

‎etc/serialversions/serialversions.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
org.woehlke.simpleworklist.application.language.Language: private static final long serialVersionUID = 0L;
1+
org.woehlke.simpleworklist.common.language.Language: private static final long serialVersionUID = 0L;
22
org.woehlke.simpleworklist.domain.task.TaskEnergy: private static final long serialVersionUID = 0L;
33
org.woehlke.simpleworklist.domain.task.TaskState: private static final long serialVersionUID = 0L;
44
org.woehlke.simpleworklist.domain.task.TaskTime: private static final long serialVersionUID = 0L;
55
org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecoveryStatus: private static final long serialVersionUID = 0L;
66
org.woehlke.simpleworklist.user.register.UserRegistrationStatus: private static final long serialVersionUID = 0L;
77
org.woehlke.simpleworklist.user.account.UserRole: private static final long serialVersionUID = 0L;
8-
org.woehlke.simpleworklist.application.common.AuditModel: private static final long serialVersionUID = 4399373914714726911L;
8+
org.woehlke.simpleworklist.common.domain.AuditModel: private static final long serialVersionUID = 4399373914714726911L;
99
org.woehlke.simpleworklist.domain.context.Context: private static final long serialVersionUID = -5035732370606951871L;
1010
org.woehlke.simpleworklist.domain.project.Project: private static final long serialVersionUID = 4566653175832872422L;
1111
org.woehlke.simpleworklist.domain.task.Task: private static final long serialVersionUID = 5247710652586269801L;
@@ -21,7 +21,7 @@ org.woehlke.simpleworklist.user.chat.User2UserMessageFormBean: private static
2121
org.woehlke.simpleworklist.searchRequest.SearchResult: private static final long serialVersionUID = 1682809351146047764L;
2222
org.woehlke.simpleworklist.user.account.UserAccountForm: private static final long serialVersionUID = 9180383385243540190L;
2323
org.woehlke.simpleworklist.user.account.UserChangeDefaultContextForm: private static final long serialVersionUID = -8592295563275083292L;
24-
org.woehlke.simpleworklist.application.language.UserChangeLanguageForm: private static final long serialVersionUID = 2201123162578113187L;
24+
org.woehlke.simpleworklist.common.language.UserChangeLanguageForm: private static final long serialVersionUID = 2201123162578113187L;
2525
org.woehlke.simpleworklist.user.account.UserChangeNameForm: private static final long serialVersionUID = 5120488382888268418L;
2626
org.woehlke.simpleworklist.user.account.UserChangePasswordForm: private static final long serialVersionUID = 9149342594823222054L;
2727
org.woehlke.simpleworklist.user.register.UserRegistrationForm: private static final long serialVersionUID = 6864871862706880939L;

src/main/java/org/woehlke/simpleworklist/application/error/MyErrorController.java renamed to src/main/java/org/woehlke/simpleworklist/application/error/ApplicationErrorController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
@Slf4j
1818
@Controller
1919
@RequestMapping(path="/fehler")
20-
public class MyErrorController implements ErrorController {
20+
public class ApplicationErrorController implements ErrorController {
2121

2222
@ExceptionHandler
2323
@RequestMapping(path="/", method={ GET, POST, PUT, HEAD, PATCH, DELETE, OPTIONS, TRACE })

src/main/java/org/woehlke/simpleworklist/domain/context/listener/ContextRefreshedListener.java renamed to src/main/java/org/woehlke/simpleworklist/application/listener/ApplicationContextRefreshedListener.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.simpleworklist.domain.context.listener;
1+
package org.woehlke.simpleworklist.application.listener;
22

33
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;
@@ -13,21 +13,23 @@
1313
* Created by tw on 14.02.16.
1414
*/
1515
@Component
16-
public class ContextRefreshedListener implements ApplicationListener<ContextRefreshedEvent> {
16+
public class ApplicationContextRefreshedListener implements ApplicationListener<ContextRefreshedEvent> {
1717

18-
private static final Logger LOGGER = LoggerFactory.getLogger(ContextRefreshedListener.class);
18+
private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationContextRefreshedListener.class);
1919

2020
private final SearchService searchService;
2121

2222
@Autowired
23-
public ContextRefreshedListener(SearchService searchService) {
23+
public ApplicationContextRefreshedListener(SearchService searchService) {
2424
this.searchService = searchService;
2525
}
2626

2727
@Override
2828
public void onApplicationEvent(ContextRefreshedEvent event) {
2929
LOGGER.info("----------------------------------------------------");
30-
LOGGER.info("onApplicationEvent: "+event.toString());
30+
LOGGER.info(" Spring Context Refreshed Listener ");
31+
LOGGER.info("----------------------------------------------------");
32+
LOGGER.info(" onApplicationEvent: "+event.toString());
3133
LOGGER.info("----------------------------------------------------");
3234
searchService.resetSearchIndex();
3335
LOGGER.info("----------------------------------------------------");

src/main/java/org/woehlke/simpleworklist/domain/context/listener/ContextStartedListener.java renamed to src/main/java/org/woehlke/simpleworklist/application/listener/ApplicationContextStartedListener.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.simpleworklist.domain.context.listener;
1+
package org.woehlke.simpleworklist.application.listener;
22

33
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;
@@ -13,21 +13,23 @@
1313
* Created by tw on 14.02.16.
1414
*/
1515
@Component
16-
public class ContextStartedListener implements ApplicationListener<ContextStartedEvent> {
16+
public class ApplicationContextStartedListener implements ApplicationListener<ContextStartedEvent> {
1717

18-
private static final Logger LOGGER = LoggerFactory.getLogger(ContextStartedListener.class);
18+
private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationContextStartedListener.class);
1919

2020
private final SearchService searchService;
2121

2222
@Autowired
23-
public ContextStartedListener(SearchService searchService) {
23+
public ApplicationContextStartedListener(SearchService searchService) {
2424
this.searchService = searchService;
2525
}
2626

2727
@Override
2828
public void onApplicationEvent(ContextStartedEvent event) {
2929
LOGGER.info("----------------------------------------------------");
30-
LOGGER.info("onApplicationEvent and resetSearchIndex "+event.toString());
30+
LOGGER.info(" Spring Context Started Listener ");
31+
LOGGER.info("----------------------------------------------------");
32+
LOGGER.info(" onApplicationEvent: "+event.toString());
3133
LOGGER.info("----------------------------------------------------");
3234
searchService.resetSearchIndex();
3335
LOGGER.info("----------------------------------------------------");

src/main/java/org/woehlke/simpleworklist/application/common/AbstractController.java renamed to src/main/java/org/woehlke/simpleworklist/common/domain/AbstractController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.simpleworklist.application.common;
1+
package org.woehlke.simpleworklist.common.domain;
22

33
import org.springframework.ui.Model;
44
import org.springframework.validation.BindingResult;

src/main/java/org/woehlke/simpleworklist/application/common/AuditModel.java renamed to src/main/java/org/woehlke/simpleworklist/common/domain/AuditModel.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
package org.woehlke.simpleworklist.application.common;
1+
package org.woehlke.simpleworklist.common.domain;
22

33
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4-
import lombok.EqualsAndHashCode;
54
import lombok.Getter;
65
import lombok.Setter;
7-
import lombok.ToString;
86
import org.springframework.data.annotation.CreatedDate;
97
import org.springframework.data.annotation.LastModifiedDate;
108
import org.springframework.data.jpa.domain.support.AuditingEntityListener;

src/main/java/org/woehlke/simpleworklist/application/common/ComparableById.java renamed to src/main/java/org/woehlke/simpleworklist/common/domain/ComparableById.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.simpleworklist.application.common;
1+
package org.woehlke.simpleworklist.common.domain;
22

33
public interface ComparableById<T extends AuditModel> {
44
boolean equalsById(T otherObject);

src/main/java/org/woehlke/simpleworklist/application/language/Language.java renamed to src/main/java/org/woehlke/simpleworklist/common/language/Language.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.simpleworklist.application.language;
1+
package org.woehlke.simpleworklist.common.language;
22

33
import javax.persistence.Enumerated;
44
import java.io.Serializable;

src/main/java/org/woehlke/simpleworklist/application/language/UserChangeLanguageForm.java renamed to src/main/java/org/woehlke/simpleworklist/common/language/UserChangeLanguageForm.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.woehlke.simpleworklist.application.language;
1+
package org.woehlke.simpleworklist.common.language;
22

33
import lombok.*;
44

‎src/main/java/org/woehlke/simpleworklist/domain/context/Context.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import org.hibernate.validator.constraints.Length;
66

77
//import org.hibernate.validator.constraints.SafeHtml;
8-
import org.woehlke.simpleworklist.application.common.AuditModel;
9-
import org.woehlke.simpleworklist.application.common.ComparableById;
8+
import org.woehlke.simpleworklist.common.domain.AuditModel;
9+
import org.woehlke.simpleworklist.common.domain.ComparableById;
1010
import org.woehlke.simpleworklist.user.account.UserAccount;
1111

1212
import javax.persistence.*;
@@ -50,6 +50,9 @@ public class Context extends AuditModel implements Serializable, ComparableById<
5050
)
5151
private Long id;
5252

53+
@Version
54+
private Long version;
55+
5356
@ManyToOne(
5457
fetch = FetchType.LAZY,
5558
optional = false,

0 commit comments

Comments
 (0)