Fixed #129, Fixed #126, working on 168

Author: thomaswoehlke

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

@@ -1,17 +1,17 @@
 package org.woehlke.simpleworklist.common;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import org.hibernate.id.UUIDGenerator;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Objects;
-import java.util.UUID;
 
+;
 @MappedSuperclass
 @EntityListeners(AuditingEntityListener.class)
 @JsonIgnoreProperties(
@@ -22,9 +22,8 @@ public class AuditModel implements Serializable {
 
     private static final long serialVersionUID = 4399373914714726911L;
 
-    @NotNull
     @Column(name="uuid", nullable = false)
-    protected String uuid = UUID.randomUUID().toString();
+    protected String uuid;
 
     @Temporal(TemporalType.TIMESTAMP)
     @Column(name = "row_created_at", nullable = false, updatable = false)

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

@@ -1,7 +1,10 @@
 package org.woehlke.simpleworklist.context;
 
 import lombok.*;
+import org.hibernate.annotations.LazyToOne;
 import org.hibernate.validator.constraints.Length;
+
+import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import org.hibernate.validator.constraints.SafeHtml;
 import org.woehlke.simpleworklist.common.AuditModel;
@@ -13,6 +16,8 @@
 import java.io.Serializable;
 import java.util.Objects;
 
+import static org.hibernate.annotations.LazyToOneOption.PROXY;
+
 /**
  * Created by tw on 13.03.16.
  */
@@ -56,16 +61,17 @@ public class Context extends AuditModel implements Serializable, ComparableById<
             CascadeType.REFRESH
         })
     @JoinColumn(name = "user_account_id")
+    @LazyToOne(PROXY)
     private UserAccount userAccount;
 
     @SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE)
-    @NotBlank
+    //@NotBlank
     @Length(min = 1, max = 255)
     @Column(name = "name_de", nullable = false)
     private String nameDe;
 
     @SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE)
-    @NotBlank
+    //@NotBlank
     @Length(min = 1, max = 255)
     @Column(name = "name_en", nullable = false)
     private String nameEn;

src/main/java/org/woehlke/simpleworklist/task/Task.java

@@ -10,10 +10,15 @@
 
 import lombok.Getter;
 import lombok.Setter;
+import org.hibernate.annotations.LazyToOne;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
 import org.hibernate.validator.constraints.Length;
+
+import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 import org.hibernate.validator.constraints.SafeHtml;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.woehlke.simpleworklist.context.Context;
@@ -23,6 +28,8 @@
 import org.woehlke.simpleworklist.common.AuditModel;
 import org.woehlke.simpleworklist.common.ComparableById;
 
+import static org.hibernate.annotations.LazyToOneOption.PROXY;
+
 @Entity
 @Table(
     name="task",
@@ -83,10 +90,10 @@ public class Task extends AuditModel implements Serializable, ComparableById<Tas
     )
     @JoinColumn(name = "context_id")
     @OnDelete(action = OnDeleteAction.NO_ACTION)
+    @LazyToOne(PROXY)
     private Context context;
 
     @Deprecated
-
     @SafeHtml(whitelistType= SafeHtml.WhiteListType.NONE)
     @NotBlank
     @Length(min=1,max=255)

src/main/java/org/woehlke/simpleworklist/taskstate/TaskStateMoveController.java

@@ -111,9 +111,11 @@ public final String editTaskGet(
             } else {
                 thisProject = task.getProject();
             }
-            model.addAttribute("thisProject", thisProject);
+            Context thisContext = task.getContext();
             Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForShowOneProject(thisProject,locale);
             model.addAttribute("breadcrumb", breadcrumb);
+            model.addAttribute("thisProject", thisProject);
+            model.addAttribute("thisContext", thisContext);
             model.addAttribute("task", task);
             model.addAttribute("areas", contexts);
             return "taskstate/task/edit";

src/main/java/org/woehlke/simpleworklist/user/account/UserAccount.java

@@ -40,7 +40,6 @@ public class UserAccount extends AuditModel implements Serializable, ComparableB
         initialValue = 1000
     )
     private Long id;
-
     @Email
     @Column(name="user_email", nullable = false)
     private String userEmail;
@@ -61,31 +60,30 @@ public class UserAccount extends AuditModel implements Serializable, ComparableB
             fetch = FetchType.LAZY,
             optional = true,
             cascade = {
-                    CascadeType.MERGE,
-                    CascadeType.REFRESH
+                CascadeType.REFRESH
             }
     )
     @JoinColumn(name = "default_context_id",nullable=true)
     private Context defaultContext;
 
-    @NotNull
+    //@NotNull
     @Temporal(value = TemporalType.TIMESTAMP)
     @Column(name="last_login_timestamp", nullable = false)
     private Date lastLoginTimestamp;
 
-    @NotNull
+    //@NotNull
     @Column(name="account_non_expired", nullable = false)
     private Boolean accountNonExpired=true;
 
-    @NotNull
+    //@NotNull
     @Column(name="account_non_locked", nullable = false)
     private Boolean accountNonLocked=true;
 
-    @NotNull
+    //@NotNull
     @Column(name="credentials_non_expired", nullable = false)
     private Boolean credentialsNonExpired=true;
 
-    @NotNull
+    //@NotNull
     @Column(name="enabled", nullable = false)
     private Boolean enabled=true;
 

src/main/java/org/woehlke/simpleworklist/user/account/UserAccountServiceImpl.java

@@ -1,12 +1,10 @@
 package org.woehlke.simpleworklist.user.account;
 
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import lombok.extern.slf4j.Slf4j;
+import org.hibernate.id.UUIDGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.data.domain.Page;
@@ -49,6 +47,7 @@ public boolean isEmailAvailable(String email) {
     @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public void createUser(UserAccountForm userAccount) {
         UserAccount u = new UserAccount();
+        u.setUuid(UUID.randomUUID().toString());
         u.setUserEmail(userAccount.getUserEmail());
         u.setUserFullname(userAccount.getUserFullname());
         u.setUserPassword(encoder.encode(userAccount.getUserPassword()));
@@ -63,6 +62,8 @@ public void createUser(UserAccountForm userAccount) {
         u = userAccountRepository.save(u);
         Context workContext = new Context("Arbeit","Work");
         Context privContext = new Context("Privat","Private");
+        workContext.setUuid(UUID.randomUUID().toString());
+        privContext.setUuid(UUID.randomUUID().toString());
         workContext.setUserAccount(u);
         privContext.setUserAccount(u);
         log.info("About to save " + workContext.toString());

src/main/resources/templates/taskstate/task/edit.html

@@ -21,8 +21,6 @@ <h1>
 	<div>
 		<form id="formId" th:action="@{/taskstate/task/{taskId}/edit(taskId=${task.id})}" th:object="${task}" method="post">
 			<input type="hidden" th:field="*{id}" />
-			<input type="hidden" th:field="*{taskState}" />
-			<input type="hidden" th:field="*{context.id}" />
 			<input type="hidden" th:field="*{rowCreatedAt.time}" />
 			<div class="form-group">
 				<label th:for="${#ids.next('title')}" class="control-label">