migrate spring-boot

thomaswoehlke · thomaswoehlke · commit dbde3cb9dfff · 2020-04-02T19:44:37.000+02:00
diff --git a/etc/serialversions.txt b/etc/serialversions.txt
@@ -7,7 +7,7 @@ org.woehlke.simpleworklist.user.register.UserRegistrationStatus:    private stat
 org.woehlke.simpleworklist.user.UserRole:    private static final long serialVersionUID = 0L;
 org.woehlke.simpleworklist.oodm.entities.impl.AuditModel:    private static final long serialVersionUID = 4399373914714726911L;
 org.woehlke.simpleworklist.oodm.entities.Context:    private static final long serialVersionUID = -5035732370606951871L;
-org.woehlke.simpleworklist.oodm.entities.Project:    private static final long serialVersionUID = 4566653175832872422L;
+org.woehlke.simpleworklist.project.Project:    private static final long serialVersionUID = 4566653175832872422L;
 org.woehlke.simpleworklist.task.Task:    private static final long serialVersionUID = 5247710652586269801L;
 org.woehlke.simpleworklist.user.messages.User2UserMessage:    private static final long serialVersionUID = 4263078228257938175L;
 org.woehlke.simpleworklist.user.account.UserAccount:    private static final long serialVersionUID = 7860692526488291439L;
diff --git a/getserialversionid.cmd b/getserialversionid.cmd
@@ -24,7 +24,7 @@ serialver org.woehlke.simpleworklist.user.register.UserRegistrationStatus >> ..\
 serialver org.woehlke.simpleworklist.user.UserRole >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.oodm.entities.impl.AuditModel >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.oodm.entities.Context  >> ..\..\etc\serialversions.txt
-serialver org.woehlke.simpleworklist.oodm.entities.Project  >> ..\..\etc\serialversions.txt
+serialver org.woehlke.simpleworklist.project.Project  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.task.Task  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.messages.User2UserMessage  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.account.UserAccount  >> ..\..\etc\serialversions.txt
diff --git a/getserialversionid.sh b/getserialversionid.sh
@@ -36,7 +36,7 @@ serialver org.woehlke.simpleworklist.user.register.UserRegistrationStatus >> $SE
 serialver org.woehlke.simpleworklist.user.UserRole >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.oodm.entities.impl.AuditModel >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.oodm.entities.Context  >> $SERIALVERSIONS_FILE
-serialver org.woehlke.simpleworklist.oodm.entities.Project  >> $SERIALVERSIONS_FILE
+serialver org.woehlke.simpleworklist.project.Project  >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.task.Task  >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.messages.User2UserMessage  >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.account.UserAccount  >> $SERIALVERSIONS_FILE
diff --git a/src/main/java/org/woehlke/simpleworklist/breadcrumb/Breadcrumb.java b/src/main/java/org/woehlke/simpleworklist/breadcrumb/Breadcrumb.java
@@ -1,6 +1,6 @@
 package org.woehlke.simpleworklist.breadcrumb;
 
-import org.woehlke.simpleworklist.oodm.entities.Project;
+import org.woehlke.simpleworklist.project.Project;
 import org.woehlke.simpleworklist.task.Task;
 
 import java.io.Serializable;
diff --git a/src/main/java/org/woehlke/simpleworklist/breadcrumb/BreadcrumbService.java b/src/main/java/org/woehlke/simpleworklist/breadcrumb/BreadcrumbService.java
@@ -1,7 +1,7 @@
 package org.woehlke.simpleworklist.breadcrumb;
 
 import org.woehlke.simpleworklist.oodm.entities.Context;
-import org.woehlke.simpleworklist.oodm.entities.Project;
+import org.woehlke.simpleworklist.project.Project;
 import org.woehlke.simpleworklist.task.Task;
 import org.woehlke.simpleworklist.task.TaskState;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/breadcrumb/BreadcrumbServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/breadcrumb/BreadcrumbServiceImpl.java
@@ -6,7 +6,7 @@
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.woehlke.simpleworklist.oodm.entities.Context;
-import org.woehlke.simpleworklist.oodm.entities.Project;
+import org.woehlke.simpleworklist.project.Project;
 import org.woehlke.simpleworklist.task.Task;
 import org.woehlke.simpleworklist.task.TaskState;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/common/AbstractController.java b/src/main/java/org/woehlke/simpleworklist/common/AbstractController.java
@@ -7,7 +7,7 @@
 import org.woehlke.simpleworklist.breadcrumb.BreadcrumbService;
 import org.woehlke.simpleworklist.config.ApplicationProperties;
 import org.woehlke.simpleworklist.oodm.entities.Context;
-import org.woehlke.simpleworklist.oodm.entities.Project;
+import org.woehlke.simpleworklist.project.Project;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 import org.woehlke.simpleworklist.task.TaskEnergy;
 import org.woehlke.simpleworklist.task.TaskTime;
diff --git a/src/main/java/org/woehlke/simpleworklist/oodm/repository/ProjectRepository.java b/src/main/java/org/woehlke/simpleworklist/oodm/repository/ProjectRepository.java
@@ -1,25 +1,25 @@
-package org.woehlke.simpleworklist.oodm.repository;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-import org.woehlke.simpleworklist.oodm.entities.Context;
-import org.woehlke.simpleworklist.oodm.entities.Project;
-
-@Repository
-public interface ProjectRepository extends JpaRepository<Project, Long> {
-
-    List<Project> findByParentIsNull();
-
-    //@Deprecated
-    //List<Project> findByParentIsNullAndUserAccount(UserAccount userAccount);
-
-    //@Deprecated
-    //List<Project> findByUserAccount(UserAccount userAccount);
-
-    List<Project> findByContext(Context context);
-
-    List<Project> findByParentIsNullAndContext(Context context);
-
-}
+package org.woehlke.simpleworklist.oodm.repository;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+import org.woehlke.simpleworklist.oodm.entities.Context;
+import org.woehlke.simpleworklist.project.Project;
+
+@Repository
+public interface ProjectRepository extends JpaRepository<Project, Long> {
+
+    List<Project> findByParentIsNull();
+
+    //@Deprecated
+    //List<Project> findByParentIsNullAndUserAccount(UserAccount userAccount);
+
+    //@Deprecated
+    //List<Project> findByUserAccount(UserAccount userAccount);
+
+    List<Project> findByContext(Context context);
+
+    List<Project> findByParentIsNullAndContext(Context context);
+
+}
diff --git a/src/main/java/org/woehlke/simpleworklist/project/Project.java b/src/main/java/org/woehlke/simpleworklist/project/Project.java
@@ -1,4 +1,4 @@
-package org.woehlke.simpleworklist.oodm.entities;
+package org.woehlke.simpleworklist.project;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -13,6 +13,7 @@
 import org.hibernate.validator.constraints.Length;
 import javax.validation.constraints.NotBlank;
 import org.hibernate.validator.constraints.SafeHtml;
+import org.woehlke.simpleworklist.oodm.entities.Context;
 import org.woehlke.simpleworklist.oodm.entities.impl.AuditModel;
 import org.woehlke.simpleworklist.oodm.entities.impl.ComparableById;
 import org.woehlke.simpleworklist.user.account.UserAccount;
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectController.java
@@ -13,7 +13,6 @@
 import org.woehlke.simpleworklist.common.AbstractController;
 import org.woehlke.simpleworklist.taskstate.TaskMoveService;
 import org.woehlke.simpleworklist.oodm.entities.Context;
-import org.woehlke.simpleworklist.oodm.entities.Project;
 import org.woehlke.simpleworklist.task.Task;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 import org.woehlke.simpleworklist.breadcrumb.Breadcrumb;
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectService.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectService.java
@@ -3,7 +3,6 @@
 import java.util.List;
 
 import org.woehlke.simpleworklist.oodm.entities.Context;
-import org.woehlke.simpleworklist.oodm.entities.Project;
 //import org.woehlke.simpleworklist.user.account.UserAccount;
 
 public interface ProjectService {
diff --git a/src/main/java/org/woehlke/simpleworklist/project/ProjectServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/project/ProjectServiceImpl.java
@@ -11,7 +11,6 @@
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.woehlke.simpleworklist.oodm.entities.Context;
-import org.woehlke.simpleworklist.oodm.entities.Project;
 import org.woehlke.simpleworklist.task.Task;
 import org.woehlke.simpleworklist.oodm.repository.ProjectRepository;
 import org.woehlke.simpleworklist.task.TaskRepository;
diff --git a/src/main/java/org/woehlke/simpleworklist/search/SearchResult.java b/src/main/java/org/woehlke/simpleworklist/search/SearchResult.java
@@ -1,7 +1,7 @@
 package org.woehlke.simpleworklist.search;
 
 import org.woehlke.simpleworklist.task.Task;
-import org.woehlke.simpleworklist.oodm.entities.Project;
+import org.woehlke.simpleworklist.project.Project;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/src/main/java/org/woehlke/simpleworklist/task/Task.java b/src/main/java/org/woehlke/simpleworklist/task/Task.java
@@ -15,7 +15,7 @@
 import org.hibernate.validator.constraints.SafeHtml;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.woehlke.simpleworklist.oodm.entities.Context;
-import org.woehlke.simpleworklist.oodm.entities.Project;
+import org.woehlke.simpleworklist.project.Project;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 import org.woehlke.simpleworklist.oodm.entities.impl.AuditModel;
 import org.woehlke.simpleworklist.oodm.entities.impl.ComparableById;
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskController.java b/src/main/java/org/woehlke/simpleworklist/task/TaskController.java
@@ -16,7 +16,7 @@
 import org.woehlke.simpleworklist.common.AbstractController;
 import org.woehlke.simpleworklist.taskstate.TaskMoveService;
 import org.woehlke.simpleworklist.oodm.entities.Context;
-import org.woehlke.simpleworklist.oodm.entities.Project;
+import org.woehlke.simpleworklist.project.Project;
 import org.woehlke.simpleworklist.user.account.UserAccount;
 import org.woehlke.simpleworklist.breadcrumb.Breadcrumb;
 import org.woehlke.simpleworklist.user.UserSessionBean;
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskRepository.java b/src/main/java/org/woehlke/simpleworklist/task/TaskRepository.java
@@ -9,7 +9,7 @@
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import org.woehlke.simpleworklist.oodm.entities.Context;
-import org.woehlke.simpleworklist.oodm.entities.Project;
+import org.woehlke.simpleworklist.project.Project;
 
 @Repository
 public interface TaskRepository extends JpaRepository<Task, Long> {
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskService.java b/src/main/java/org/woehlke/simpleworklist/task/TaskService.java
@@ -3,8 +3,7 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.woehlke.simpleworklist.oodm.entities.Context;
-import org.woehlke.simpleworklist.task.Task;
-import org.woehlke.simpleworklist.oodm.entities.Project;
+import org.woehlke.simpleworklist.project.Project;
 
 public interface TaskService {
 
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/task/TaskServiceImpl.java
@@ -11,7 +11,7 @@
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.woehlke.simpleworklist.oodm.entities.Context;
-import org.woehlke.simpleworklist.oodm.entities.Project;
+import org.woehlke.simpleworklist.project.Project;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/taskstate/TaskMoveController.java b/src/main/java/org/woehlke/simpleworklist/taskstate/TaskMoveController.java
@@ -10,7 +10,7 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.woehlke.simpleworklist.common.AbstractController;
 import org.woehlke.simpleworklist.oodm.entities.Context;
-import org.woehlke.simpleworklist.oodm.entities.Project;
+import org.woehlke.simpleworklist.project.Project;
 import org.woehlke.simpleworklist.task.Task;
 import org.woehlke.simpleworklist.user.UserSessionBean;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/taskstate/TaskMoveService.java b/src/main/java/org/woehlke/simpleworklist/taskstate/TaskMoveService.java
@@ -1,7 +1,7 @@
 package org.woehlke.simpleworklist.taskstate;
 
 import org.woehlke.simpleworklist.oodm.entities.Context;
-import org.woehlke.simpleworklist.oodm.entities.Project;
+import org.woehlke.simpleworklist.project.Project;
 import org.woehlke.simpleworklist.task.Task;
 import org.woehlke.simpleworklist.task.TaskState;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/taskstate/TaskMoveServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/taskstate/TaskMoveServiceImpl.java
@@ -7,7 +7,7 @@
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.woehlke.simpleworklist.oodm.entities.Context;
-import org.woehlke.simpleworklist.oodm.entities.Project;
+import org.woehlke.simpleworklist.project.Project;
 import org.woehlke.simpleworklist.task.Task;
 import org.woehlke.simpleworklist.task.TaskState;
 import org.woehlke.simpleworklist.task.TaskRepository;
diff --git a/src/main/java/org/woehlke/simpleworklist/testdata/TestServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/testdata/TestServiceImpl.java
@@ -6,7 +6,7 @@
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.woehlke.simpleworklist.oodm.entities.Context;
-import org.woehlke.simpleworklist.oodm.entities.Project;
+import org.woehlke.simpleworklist.project.Project;
 import org.woehlke.simpleworklist.task.Task;
 import org.woehlke.simpleworklist.task.TaskEnergy;
 import org.woehlke.simpleworklist.task.TaskState;
diff --git a/src/test/java/org/woehlke/simpleworklist/model/services/impl/TestHelperServiceImpl.java b/src/test/java/org/woehlke/simpleworklist/model/services/impl/TestHelperServiceImpl.java
@@ -3,7 +3,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.woehlke.simpleworklist.oodm.entities.Project;
+import org.woehlke.simpleworklist.project.Project;
 import org.woehlke.simpleworklist.user.resetpassword.UserPasswordRecovery;
 import org.woehlke.simpleworklist.user.register.UserRegistration;
 import org.woehlke.simpleworklist.oodm.repository.*;
diff --git a/src/test/java/org/woehlke/simpleworklist/oodm/IsNotNullObjectOfCategory.java b/src/test/java/org/woehlke/simpleworklist/oodm/IsNotNullObjectOfCategory.java
@@ -1,19 +1,19 @@
-package org.woehlke.simpleworklist.oodm;
-
-import org.hamcrest.Description;
-import org.hamcrest.TypeSafeMatcher;
-import org.woehlke.simpleworklist.oodm.entities.Project;
-
-public class IsNotNullObjectOfCategory extends TypeSafeMatcher<Project> {
-
-    @Override
-    public void describeTo(Description description) {
-        description.appendText("Not Null Project Object");
-    }
-
-    @Override
-    protected boolean matchesSafely(Project item) {
-        return item.getId().longValue() > 0;
-    }
-
-}
+package org.woehlke.simpleworklist.oodm;
+
+import org.hamcrest.Description;
+import org.hamcrest.TypeSafeMatcher;
+import org.woehlke.simpleworklist.project.Project;
+
+public class IsNotNullObjectOfCategory extends TypeSafeMatcher<Project> {
+
+    @Override
+    public void describeTo(Description description) {
+        description.appendText("Not Null Project Object");
+    }
+
+    @Override
+    protected boolean matchesSafely(Project item) {
+        return item.getId().longValue() > 0;
+    }
+
+}
diff --git a/src/test/java/org/woehlke/simpleworklist/oodm/IsNullObjectOfCategory.java b/src/test/java/org/woehlke/simpleworklist/oodm/IsNullObjectOfCategory.java
@@ -1,19 +1,19 @@
-package org.woehlke.simpleworklist.oodm;
-
-import org.hamcrest.Description;
-import org.hamcrest.TypeSafeMatcher;
-import org.woehlke.simpleworklist.oodm.entities.Project;
-
-public class IsNullObjectOfCategory extends TypeSafeMatcher<Project> {
-
-    @Override
-    public void describeTo(Description description) {
-        description.appendText("Null Project Object");
-    }
-
-    @Override
-    protected boolean matchesSafely(Project item) {
-        return item.getId().longValue() == 0;
-    }
-
-}
+package org.woehlke.simpleworklist.oodm;
+
+import org.hamcrest.Description;
+import org.hamcrest.TypeSafeMatcher;
+import org.woehlke.simpleworklist.project.Project;
+
+public class IsNullObjectOfCategory extends TypeSafeMatcher<Project> {
+
+    @Override
+    public void describeTo(Description description) {
+        description.appendText("Null Project Object");
+    }
+
+    @Override
+    protected boolean matchesSafely(Project item) {
+        return item.getId().longValue() == 0;
+    }
+
+}
diff --git a/src/test/java/org/woehlke/simpleworklist/oodm/IsSameObjectOfCategory.java b/src/test/java/org/woehlke/simpleworklist/oodm/IsSameObjectOfCategory.java
@@ -1,26 +1,26 @@
-package org.woehlke.simpleworklist.oodm;
-
-import org.hamcrest.Description;
-import org.hamcrest.TypeSafeMatcher;
-import org.woehlke.simpleworklist.oodm.entities.Project;
-
-public class IsSameObjectOfCategory extends TypeSafeMatcher<Project> {
-
-    private long id;
-
-    public IsSameObjectOfCategory(long id) {
-        super();
-        this.id = id;
-    }
-
-    @Override
-    public void describeTo(Description description) {
-        description.appendText("is Project Object with demanded id");
-    }
-
-    @Override
-    protected boolean matchesSafely(Project item) {
-        return item.getId().longValue() == this.id;
-    }
-
-}
+package org.woehlke.simpleworklist.oodm;
+
+import org.hamcrest.Description;
+import org.hamcrest.TypeSafeMatcher;
+import org.woehlke.simpleworklist.project.Project;
+
+public class IsSameObjectOfCategory extends TypeSafeMatcher<Project> {
+
+    private long id;
+
+    public IsSameObjectOfCategory(long id) {
+        super();
+        this.id = id;
+    }
+
+    @Override
+    public void describeTo(Description description) {
+        description.appendText("is Project Object with demanded id");
+    }
+
+    @Override
+    protected boolean matchesSafely(Project item) {
+        return item.getId().longValue() == this.id;
+    }
+
+}
diff --git a/src/test/java/org/woehlke/simpleworklist/oodm/Matchers.java b/src/test/java/org/woehlke/simpleworklist/oodm/Matchers.java
@@ -2,7 +2,7 @@
 
 //import org.hamcrest.Factory;
 import org.hamcrest.Matcher;
-import org.woehlke.simpleworklist.oodm.entities.Project;
+import org.woehlke.simpleworklist.project.Project;
 import org.woehlke.simpleworklist.task.Task;
 
 public class Matchers {
