migrate spring-boot

thomaswoehlke · thomaswoehlke · commit ed6ca8b2f636 · 2020-04-02T19:28:32.000+02:00
diff --git a/etc/serialversions.txt b/etc/serialversions.txt
@@ -1,6 +1,6 @@
 org.woehlke.simpleworklist.oodm.enumerations.Language:    private static final long serialVersionUID = 0L;
 org.woehlke.simpleworklist.oodm.enumerations.TaskEnergy:    private static final long serialVersionUID = 0L;
-org.woehlke.simpleworklist.oodm.enumerations.TaskState:    private static final long serialVersionUID = 0L;
+org.woehlke.simpleworklist.task.TaskState:    private static final long serialVersionUID = 0L;
 org.woehlke.simpleworklist.task.TaskTime:    private static final long serialVersionUID = 0L;
 org.woehlke.simpleworklist.oodm.enumerations.UserPasswordRecoveryStatus:    private static final long serialVersionUID = 0L;
 org.woehlke.simpleworklist.oodm.enumerations.UserRegistrationStatus:    private static final long serialVersionUID = 0L;
diff --git a/getserialversionid.cmd b/getserialversionid.cmd
@@ -17,7 +17,7 @@ echo %CLASSPATH%
 cd target\classes
 serialver org.woehlke.simpleworklist.oodm.enumerations.Language > ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.oodm.enumerations.TaskEnergy >> ..\..\etc\serialversions.txt
-serialver org.woehlke.simpleworklist.oodm.enumerations.TaskState >> ..\..\etc\serialversions.txt
+serialver org.woehlke.simpleworklist.task.TaskState >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.task.TaskTime >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.oodm.enumerations.UserPasswordRecoveryStatus >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.oodm.enumerations.UserRegistrationStatus >> ..\..\etc\serialversions.txt
diff --git a/getserialversionid.sh b/getserialversionid.sh
@@ -29,7 +29,7 @@ echo "CLASSPATH $CLASSPATH"
 cd $CLASSES_PATH
 serialver org.woehlke.simpleworklist.oodm.enumerations.Language > $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.oodm.enumerations.TaskEnergy >> $SERIALVERSIONS_FILE
-serialver org.woehlke.simpleworklist.oodm.enumerations.TaskState >> $SERIALVERSIONS_FILE
+serialver org.woehlke.simpleworklist.task.TaskState >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.task.TaskTime >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.oodm.enumerations.UserPasswordRecoveryStatus >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.oodm.enumerations.UserRegistrationStatus >> $SERIALVERSIONS_FILE
diff --git a/src/main/java/org/woehlke/simpleworklist/breadcrumb/BreadcrumbService.java b/src/main/java/org/woehlke/simpleworklist/breadcrumb/BreadcrumbService.java
@@ -3,7 +3,7 @@
 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.enumerations.TaskState;
+import org.woehlke.simpleworklist.task.TaskState;
 import org.woehlke.simpleworklist.model.beans.Breadcrumb;
 
 import java.util.Locale;
diff --git a/src/main/java/org/woehlke/simpleworklist/breadcrumb/BreadcrumbServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/breadcrumb/BreadcrumbServiceImpl.java
@@ -8,7 +8,7 @@
 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.enumerations.TaskState;
+import org.woehlke.simpleworklist.task.TaskState;
 import org.woehlke.simpleworklist.model.beans.Breadcrumb;
 
 import java.util.Locale;
diff --git a/src/main/java/org/woehlke/simpleworklist/model/beans/UserSessionBean.java b/src/main/java/org/woehlke/simpleworklist/model/beans/UserSessionBean.java
@@ -1,94 +1,94 @@
-package org.woehlke.simpleworklist.model.beans;
-
-import org.woehlke.simpleworklist.oodm.enumerations.TaskState;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-/**
- * Created by tw on 13.03.16.
- */
-public class UserSessionBean implements Serializable {
-
-    private static final long serialVersionUID = -6649686058228455825L;
-
-    private Long contextId;
-
-    private String lastSearchterm;
-
-    private TaskState lastTaskState;
-
-    private Long lastProjectId;
-
-    public UserSessionBean(){
-        lastSearchterm="";
-        lastTaskState=TaskState.INBOX;
-        lastProjectId=0L;
-        contextId=0L;
-    }
-
-    public UserSessionBean(long contextId){
-        lastSearchterm="";
-        lastTaskState=TaskState.INBOX;
-        lastProjectId=0L;
-        this.contextId = contextId;
-    }
-
-    public Long getContextId() {
-        return contextId;
-    }
-
-    public void setContextId(Long contextId) {
-        this.contextId = contextId;
-    }
-
-    public String getLastSearchterm() {
-        return lastSearchterm;
-    }
-
-    public void setLastSearchterm(String lastSearchterm) {
-        this.lastSearchterm = lastSearchterm;
-    }
-
-    public TaskState getLastTaskState() {
-        return lastTaskState;
-    }
-
-    public void setLastTaskState(TaskState lastTaskState) {
-        this.lastTaskState = lastTaskState;
-    }
-
-    public Long getLastProjectId() {
-        return lastProjectId;
-    }
-
-    public void setLastProjectId(Long lastProjectId) {
-        this.lastProjectId = lastProjectId;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof UserSessionBean)) return false;
-        UserSessionBean that = (UserSessionBean) o;
-        return getContextId().equals(that.getContextId()) &&
-                getLastSearchterm().equals(that.getLastSearchterm()) &&
-                getLastTaskState() == that.getLastTaskState() &&
-                getLastProjectId().equals(that.getLastProjectId());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(getContextId(), getLastSearchterm(), getLastTaskState(), getLastProjectId());
-    }
-
-    @Override
-    public String toString() {
-        return "UserSessionBean{" +
-                "contextId=" + contextId +
-                ", lastSearchterm='" + lastSearchterm + '\'' +
-                ", lastTaskState=" + lastTaskState +
-                ", lastProjectId=" + lastProjectId +
-                '}';
-    }
-}
+package org.woehlke.simpleworklist.model.beans;
+
+import org.woehlke.simpleworklist.task.TaskState;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * Created by tw on 13.03.16.
+ */
+public class UserSessionBean implements Serializable {
+
+    private static final long serialVersionUID = -6649686058228455825L;
+
+    private Long contextId;
+
+    private String lastSearchterm;
+
+    private TaskState lastTaskState;
+
+    private Long lastProjectId;
+
+    public UserSessionBean(){
+        lastSearchterm="";
+        lastTaskState=TaskState.INBOX;
+        lastProjectId=0L;
+        contextId=0L;
+    }
+
+    public UserSessionBean(long contextId){
+        lastSearchterm="";
+        lastTaskState=TaskState.INBOX;
+        lastProjectId=0L;
+        this.contextId = contextId;
+    }
+
+    public Long getContextId() {
+        return contextId;
+    }
+
+    public void setContextId(Long contextId) {
+        this.contextId = contextId;
+    }
+
+    public String getLastSearchterm() {
+        return lastSearchterm;
+    }
+
+    public void setLastSearchterm(String lastSearchterm) {
+        this.lastSearchterm = lastSearchterm;
+    }
+
+    public TaskState getLastTaskState() {
+        return lastTaskState;
+    }
+
+    public void setLastTaskState(TaskState lastTaskState) {
+        this.lastTaskState = lastTaskState;
+    }
+
+    public Long getLastProjectId() {
+        return lastProjectId;
+    }
+
+    public void setLastProjectId(Long lastProjectId) {
+        this.lastProjectId = lastProjectId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof UserSessionBean)) return false;
+        UserSessionBean that = (UserSessionBean) o;
+        return getContextId().equals(that.getContextId()) &&
+                getLastSearchterm().equals(that.getLastSearchterm()) &&
+                getLastTaskState() == that.getLastTaskState() &&
+                getLastProjectId().equals(that.getLastProjectId());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getContextId(), getLastSearchterm(), getLastTaskState(), getLastProjectId());
+    }
+
+    @Override
+    public String toString() {
+        return "UserSessionBean{" +
+                "contextId=" + contextId +
+                ", lastSearchterm='" + lastSearchterm + '\'' +
+                ", lastTaskState=" + lastTaskState +
+                ", lastProjectId=" + lastProjectId +
+                '}';
+    }
+}
diff --git a/src/main/java/org/woehlke/simpleworklist/task/Task.java b/src/main/java/org/woehlke/simpleworklist/task/Task.java
@@ -20,7 +20,6 @@
 import org.woehlke.simpleworklist.oodm.entities.impl.AuditModel;
 import org.woehlke.simpleworklist.oodm.entities.impl.ComparableById;
 import org.woehlke.simpleworklist.oodm.enumerations.TaskEnergy;
-import org.woehlke.simpleworklist.oodm.enumerations.TaskState;
 
 
 @Entity
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskController.java b/src/main/java/org/woehlke/simpleworklist/task/TaskController.java
@@ -17,7 +17,6 @@
 import org.woehlke.simpleworklist.taskstate.TaskMoveService;
 import org.woehlke.simpleworklist.oodm.entities.Context;
 import org.woehlke.simpleworklist.oodm.enumerations.TaskEnergy;
-import org.woehlke.simpleworklist.oodm.enumerations.TaskState;
 import org.woehlke.simpleworklist.oodm.entities.Project;
 import org.woehlke.simpleworklist.oodm.entities.UserAccount;
 import org.woehlke.simpleworklist.model.beans.Breadcrumb;
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskRepository.java b/src/main/java/org/woehlke/simpleworklist/task/TaskRepository.java
@@ -10,8 +10,6 @@
 import org.springframework.stereotype.Repository;
 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.enumerations.TaskState;
 
 @Repository
 public interface TaskRepository extends JpaRepository<Task, Long> {
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/task/TaskServiceImpl.java
@@ -12,7 +12,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.woehlke.simpleworklist.oodm.entities.Context;
 import org.woehlke.simpleworklist.oodm.entities.Project;
-import org.woehlke.simpleworklist.oodm.enumerations.TaskState;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/org/woehlke/simpleworklist/task/TaskState.java b/src/main/java/org/woehlke/simpleworklist/task/TaskState.java
@@ -1,58 +1,58 @@
-package org.woehlke.simpleworklist.oodm.enumerations;
-
-import javax.persistence.Enumerated;
-import javax.persistence.Transient;
-import java.io.Serializable;
-
-/**
- * Created by tw on 21.02.16.
- */
-public enum TaskState implements Serializable {
-
-    @Enumerated
-    INBOX("fas fa-inbox"),
-
-    @Enumerated
-    TODAY("fas fa-clock"),
-
-    @Enumerated
-    NEXT("fas fa-cogs"),
-
-    @Enumerated
-    WAITING("fas fa-hourglass-half"),
-
-    @Enumerated
-    SCHEDULED("fas fa-calendar-alt"),
-
-    @Enumerated
-    SOMEDAY("fas fa-road"),
-
-    @Enumerated
-    FOCUS("fas fa-star"),
-
-    @Enumerated
-    COMPLETED("fas fa-check-square"),
-
-    @Enumerated
-    TRASH("fas fa-trash-alt");
-
-    TaskState(final String icon) {
-        this.icon=icon;
-    }
-
-    public String getCode() {
-        return "layout.page."+this.name().toLowerCase();
-    }
-
-    public String getUrl() {
-        return "/taskstate/"+this.name().toLowerCase();
-    }
-
-    public String getIcon() {
-        return icon;
-    }
-
-    private String icon;
-
-    private static final long serialVersionUID = 0L;
-}
+package org.woehlke.simpleworklist.task;
+
+import javax.persistence.Enumerated;
+import javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * Created by tw on 21.02.16.
+ */
+public enum TaskState implements Serializable {
+
+    @Enumerated
+    INBOX("fas fa-inbox"),
+
+    @Enumerated
+    TODAY("fas fa-clock"),
+
+    @Enumerated
+    NEXT("fas fa-cogs"),
+
+    @Enumerated
+    WAITING("fas fa-hourglass-half"),
+
+    @Enumerated
+    SCHEDULED("fas fa-calendar-alt"),
+
+    @Enumerated
+    SOMEDAY("fas fa-road"),
+
+    @Enumerated
+    FOCUS("fas fa-star"),
+
+    @Enumerated
+    COMPLETED("fas fa-check-square"),
+
+    @Enumerated
+    TRASH("fas fa-trash-alt");
+
+    TaskState(final String icon) {
+        this.icon=icon;
+    }
+
+    public String getCode() {
+        return "layout.page."+this.name().toLowerCase();
+    }
+
+    public String getUrl() {
+        return "/taskstate/"+this.name().toLowerCase();
+    }
+
+    public String getIcon() {
+        return icon;
+    }
+
+    private String icon;
+
+    private static final long serialVersionUID = 0L;
+}
diff --git a/src/main/java/org/woehlke/simpleworklist/taskstate/TaskMoveService.java b/src/main/java/org/woehlke/simpleworklist/taskstate/TaskMoveService.java
@@ -3,7 +3,7 @@
 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.enumerations.TaskState;
+import org.woehlke.simpleworklist.task.TaskState;
 
 public interface TaskMoveService {
 
diff --git a/src/main/java/org/woehlke/simpleworklist/taskstate/TaskMoveServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/taskstate/TaskMoveServiceImpl.java
diff --git a/src/main/java/org/woehlke/simpleworklist/taskstate/TaskStateController.java b/src/main/java/org/woehlke/simpleworklist/taskstate/TaskStateController.java
diff --git a/src/main/java/org/woehlke/simpleworklist/taskstate/TaskStateServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/taskstate/TaskStateServiceImpl.java
diff --git a/src/main/java/org/woehlke/simpleworklist/testdata/TestServiceImpl.java b/src/main/java/org/woehlke/simpleworklist/testdata/TestServiceImpl.java
